From 9216fc01782e67a039b918399d45c8c0c9199d71 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 18 Jun 2018 22:06:26 -0400 Subject: [PATCH] More class/struct mixup fixes. Spotted by Clang. --- .../private/debugger/user_interface/UserInterface.h | 2 +- headers/private/interface/ShapePrivate.h | 3 ++- headers/private/shared/HashMap.h | 2 +- .../drivers/disk/virtual/virtio_block/virtio_block.cpp | 4 ++-- src/add-ons/kernel/file_systems/nfs4/NFS4Object.h | 4 ++-- src/add-ons/kernel/file_systems/nfs4/NFS4Server.h | 2 +- .../kernel/file_systems/nfs4/ReplyInterpreter.h | 2 +- src/add-ons/kernel/file_systems/nfs4/Request.h | 2 +- src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h | 6 +++--- src/add-ons/screen_savers/gravity/GravityView.h | 2 +- src/apps/deskcalc/CalcView.h | 2 +- src/apps/mail/QueryList.h | 2 +- src/apps/terminal/TerminalCharClassifier.h | 2 +- src/kits/debugger/controllers/DebugReportGenerator.h | 2 +- src/kits/storage/PathMonitor.cpp | 4 ++-- src/preferences/media/MediaListItem.h | 10 +++++----- src/servers/app/ClickTarget.h | 2 +- .../app/drawing/interface/remote/RemoteMessage.h | 2 +- src/servers/net/DHCPClient.h | 4 ++-- src/servers/registrar/AppInfoList.h | 4 ++-- src/servers/registrar/AppInfoListMessagingTargetSet.h | 2 +- src/system/kernel/scheduler/scheduler_cpu.h | 6 +++--- 22 files changed, 36 insertions(+), 35 deletions(-) diff --git a/headers/private/debugger/user_interface/UserInterface.h b/headers/private/debugger/user_interface/UserInterface.h index 17a7a16332..52a4e80e2a 100644 --- a/headers/private/debugger/user_interface/UserInterface.h +++ b/headers/private/debugger/user_interface/UserInterface.h @@ -15,7 +15,7 @@ #include "Types.h" -class entry_ref; +struct entry_ref; class CpuState; class ExpressionInfo; diff --git a/headers/private/interface/ShapePrivate.h b/headers/private/interface/ShapePrivate.h index 31e201e2d5..e4c2832cfe 100644 --- a/headers/private/interface/ShapePrivate.h +++ b/headers/private/interface/ShapePrivate.h @@ -27,7 +27,8 @@ #define OP_SMALL_ARC_TO_CCW 0x08000000 -struct shape_data : public BReferenceable { +class shape_data : public BReferenceable { +public: uint32* opList; BPoint* ptList; int32 opCount; diff --git a/headers/private/shared/HashMap.h b/headers/private/shared/HashMap.h index 4acc38b6ff..ffd86436a6 100644 --- a/headers/private/shared/HashMap.h +++ b/headers/private/shared/HashMap.h @@ -450,7 +450,7 @@ HashMap::Size() const // GetIterator template -struct HashMap::Iterator +class HashMap::Iterator HashMap::GetIterator() const { return Iterator(this); diff --git a/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp b/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp index cc092d0709..65149d1886 100644 --- a/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp +++ b/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp @@ -9,8 +9,8 @@ #include "virtio_blk.h" -struct DMAResource; -struct IOScheduler; +class DMAResource; +class IOScheduler; static const uint8 kDriveIcon[] = { diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Object.h b/src/add-ons/kernel/file_systems/nfs4/NFS4Object.h index 2ec041e20a..5d6fed2215 100644 --- a/src/add-ons/kernel/file_systems/nfs4/NFS4Object.h +++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Object.h @@ -13,8 +13,8 @@ #include "RPCServer.h" -class OpenStateCookie; -class OpenState; +struct OpenStateCookie; +struct OpenState; class NFS4Object { public: diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h index 7c2c8a5d52..bd18639972 100644 --- a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h +++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.h @@ -17,7 +17,7 @@ class FileSystem; -class OpenFileCookie; +struct OpenFileCookie; class NFS4Server : public RPC::ProgramData { public: diff --git a/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.h b/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.h index 819cce4955..5660df88f7 100644 --- a/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.h +++ b/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.h @@ -57,7 +57,7 @@ struct DirEntry { ~DirEntry(); }; -class LockInfo; +struct LockInfo; class ReplyInterpreter { public: diff --git a/src/add-ons/kernel/file_systems/nfs4/Request.h b/src/add-ons/kernel/file_systems/nfs4/Request.h index f740bb4619..3a439cbe99 100644 --- a/src/add-ons/kernel/file_systems/nfs4/Request.h +++ b/src/add-ons/kernel/file_systems/nfs4/Request.h @@ -14,7 +14,7 @@ #include "RPCServer.h" -class Cookie; +struct Cookie; class FileSystem; class Request { diff --git a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h index 00b0d07f75..acaff6f6fd 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h +++ b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h @@ -19,9 +19,9 @@ #include "XDR.h" -class OpenState; -class LockInfo; -class LockOwner; +struct OpenState; +struct LockInfo; +struct LockOwner; class RequestBuilder { public: diff --git a/src/add-ons/screen_savers/gravity/GravityView.h b/src/add-ons/screen_savers/gravity/GravityView.h index b8072bcb40..7b69ae94aa 100644 --- a/src/add-ons/screen_savers/gravity/GravityView.h +++ b/src/add-ons/screen_savers/gravity/GravityView.h @@ -16,7 +16,7 @@ class Gravity; -class GravitySource; +struct GravitySource; class GravityView : public BGLView { diff --git a/src/apps/deskcalc/CalcView.h b/src/apps/deskcalc/CalcView.h index bf126917d1..323d8cb130 100644 --- a/src/apps/deskcalc/CalcView.h +++ b/src/apps/deskcalc/CalcView.h @@ -37,7 +37,7 @@ class BMenuItem; class BMessage; class BMessageRunner; class BPopUpMenu; -class CalcOptions; +struct CalcOptions; class CalcOptionsWindow; class ExpressionTextView; diff --git a/src/apps/mail/QueryList.h b/src/apps/mail/QueryList.h index 47205eaef5..104791976a 100644 --- a/src/apps/mail/QueryList.h +++ b/src/apps/mail/QueryList.h @@ -16,7 +16,7 @@ #include -struct QueryList; +class QueryList; class QueryListener { diff --git a/src/apps/terminal/TerminalCharClassifier.h b/src/apps/terminal/TerminalCharClassifier.h index de0d36411f..3346a5c36d 100644 --- a/src/apps/terminal/TerminalCharClassifier.h +++ b/src/apps/terminal/TerminalCharClassifier.h @@ -18,7 +18,7 @@ enum { }; -class UTF8Char; +struct UTF8Char; class TerminalCharClassifier { public: diff --git a/src/kits/debugger/controllers/DebugReportGenerator.h b/src/kits/debugger/controllers/DebugReportGenerator.h index 9eebca4059..73d940bde8 100644 --- a/src/kits/debugger/controllers/DebugReportGenerator.h +++ b/src/kits/debugger/controllers/DebugReportGenerator.h @@ -14,7 +14,7 @@ #include "ValueNodeContainer.h" -class entry_ref; +struct entry_ref; class Architecture; class AreaInfo; class BFile; diff --git a/src/kits/storage/PathMonitor.cpp b/src/kits/storage/PathMonitor.cpp index 2462437313..1a8d475b6d 100644 --- a/src/kits/storage/PathMonitor.cpp +++ b/src/kits/storage/PathMonitor.cpp @@ -50,8 +50,8 @@ namespace { -struct Directory; -struct Node; +class Directory; +class Node; struct WatcherHashDefinition; typedef BOpenHashTable WatcherMap; diff --git a/src/preferences/media/MediaListItem.h b/src/preferences/media/MediaListItem.h index 5aa050bee9..895efbd106 100644 --- a/src/preferences/media/MediaListItem.h +++ b/src/preferences/media/MediaListItem.h @@ -2,7 +2,7 @@ // // Copyright (c) 2003, OpenBeOS // -// This software is part of the OpenBeOS distribution and is covered +// This software is part of the OpenBeOS distribution and is covered // by the MIT License. // // @@ -10,7 +10,7 @@ // Author: Sikosis, Jérôme Duval // Description: Media Preferences // Created : June 25, 2003 -// +// // ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ #ifndef __MEDIALISTITEM_H__ #define __MEDIALISTITEM_H__ @@ -22,7 +22,7 @@ struct dormant_node_info; -class MediaIcons; +struct MediaIcons; class MediaWindow; class AudioMixerListItem; @@ -45,10 +45,10 @@ public: virtual void Update(BView* owner, const BFont* font); virtual void DrawItem(BView* owner, BRect frame, bool complete = false); - + virtual const char* Label() = 0; - + static MediaIcons* Icons() {return sIcons;} static void SetIcons(MediaIcons* icons) {sIcons = icons;} diff --git a/src/servers/app/ClickTarget.h b/src/servers/app/ClickTarget.h index ead8ee9f68..7264dbf9d2 100644 --- a/src/servers/app/ClickTarget.h +++ b/src/servers/app/ClickTarget.h @@ -14,7 +14,7 @@ Used to discriminate between different targets in order to filter multi-clicks. A click on a different target resets the click count. */ -struct ClickTarget { +class ClickTarget { public: enum Type { TYPE_INVALID, diff --git a/src/servers/app/drawing/interface/remote/RemoteMessage.h b/src/servers/app/drawing/interface/remote/RemoteMessage.h index 37123433cf..f161e39e0b 100644 --- a/src/servers/app/drawing/interface/remote/RemoteMessage.h +++ b/src/servers/app/drawing/interface/remote/RemoteMessage.h @@ -33,7 +33,7 @@ class RemotePainter; class ServerBitmap; class ServerCursor; class ServerFont; -class ViewLineArrayInfo; +struct ViewLineArrayInfo; enum { RP_INIT_CONNECTION = 1, diff --git a/src/servers/net/DHCPClient.h b/src/servers/net/DHCPClient.h index 63b3bf0df4..4383d38a5f 100644 --- a/src/servers/net/DHCPClient.h +++ b/src/servers/net/DHCPClient.h @@ -17,8 +17,8 @@ class BMessageRunner; -class dhcp_message; -class socket_timeout; +struct dhcp_message; +struct socket_timeout; enum dhcp_state { diff --git a/src/servers/registrar/AppInfoList.h b/src/servers/registrar/AppInfoList.h index 61fa5015f8..d0eae58c44 100644 --- a/src/servers/registrar/AppInfoList.h +++ b/src/servers/registrar/AppInfoList.h @@ -30,9 +30,9 @@ #include #include -class entry_ref; +struct entry_ref; -class RosterAppInfo; +struct RosterAppInfo; // AppInfoList class AppInfoList { diff --git a/src/servers/registrar/AppInfoListMessagingTargetSet.h b/src/servers/registrar/AppInfoListMessagingTargetSet.h index da56dc3d26..db4a3a01a1 100644 --- a/src/servers/registrar/AppInfoListMessagingTargetSet.h +++ b/src/servers/registrar/AppInfoListMessagingTargetSet.h @@ -12,7 +12,7 @@ #include "AppInfoList.h" #include "MessageDeliverer.h" -class RosterAppInfo; +struct RosterAppInfo; class AppInfoListMessagingTargetSet : public MessagingTargetSet { public: diff --git a/src/system/kernel/scheduler/scheduler_cpu.h b/src/system/kernel/scheduler/scheduler_cpu.h index 11a681b707..9b5ef79027 100644 --- a/src/system/kernel/scheduler/scheduler_cpu.h +++ b/src/system/kernel/scheduler/scheduler_cpu.h @@ -29,9 +29,9 @@ class DebugDumper; struct ThreadData; class ThreadProcessing; -struct CPUEntry; -struct CoreEntry; -struct PackageEntry; +class CPUEntry; +class CoreEntry; +class PackageEntry; // The run queues. Holds the threads ready to run ordered by priority. // One queue per schedulable target per core. Additionally, each