More class/struct mixup fixes.

Spotted by Clang.
This commit is contained in:
Augustin Cavalier 2018-06-18 22:06:26 -04:00
parent fe17f0df1f
commit 9216fc0178
22 changed files with 36 additions and 35 deletions

View File

@ -15,7 +15,7 @@
#include "Types.h" #include "Types.h"
class entry_ref; struct entry_ref;
class CpuState; class CpuState;
class ExpressionInfo; class ExpressionInfo;

View File

@ -27,7 +27,8 @@
#define OP_SMALL_ARC_TO_CCW 0x08000000 #define OP_SMALL_ARC_TO_CCW 0x08000000
struct shape_data : public BReferenceable { class shape_data : public BReferenceable {
public:
uint32* opList; uint32* opList;
BPoint* ptList; BPoint* ptList;
int32 opCount; int32 opCount;

View File

@ -450,7 +450,7 @@ HashMap<Key, Value>::Size() const
// GetIterator // GetIterator
template<typename Key, typename Value> template<typename Key, typename Value>
struct HashMap<Key, Value>::Iterator class HashMap<Key, Value>::Iterator
HashMap<Key, Value>::GetIterator() const HashMap<Key, Value>::GetIterator() const
{ {
return Iterator(this); return Iterator(this);

View File

@ -9,8 +9,8 @@
#include "virtio_blk.h" #include "virtio_blk.h"
struct DMAResource; class DMAResource;
struct IOScheduler; class IOScheduler;
static const uint8 kDriveIcon[] = { static const uint8 kDriveIcon[] = {

View File

@ -13,8 +13,8 @@
#include "RPCServer.h" #include "RPCServer.h"
class OpenStateCookie; struct OpenStateCookie;
class OpenState; struct OpenState;
class NFS4Object { class NFS4Object {
public: public:

View File

@ -17,7 +17,7 @@
class FileSystem; class FileSystem;
class OpenFileCookie; struct OpenFileCookie;
class NFS4Server : public RPC::ProgramData { class NFS4Server : public RPC::ProgramData {
public: public:

View File

@ -57,7 +57,7 @@ struct DirEntry {
~DirEntry(); ~DirEntry();
}; };
class LockInfo; struct LockInfo;
class ReplyInterpreter { class ReplyInterpreter {
public: public:

View File

@ -14,7 +14,7 @@
#include "RPCServer.h" #include "RPCServer.h"
class Cookie; struct Cookie;
class FileSystem; class FileSystem;
class Request { class Request {

View File

@ -19,9 +19,9 @@
#include "XDR.h" #include "XDR.h"
class OpenState; struct OpenState;
class LockInfo; struct LockInfo;
class LockOwner; struct LockOwner;
class RequestBuilder { class RequestBuilder {
public: public:

View File

@ -16,7 +16,7 @@
class Gravity; class Gravity;
class GravitySource; struct GravitySource;
class GravityView : public BGLView { class GravityView : public BGLView {

View File

@ -37,7 +37,7 @@ class BMenuItem;
class BMessage; class BMessage;
class BMessageRunner; class BMessageRunner;
class BPopUpMenu; class BPopUpMenu;
class CalcOptions; struct CalcOptions;
class CalcOptionsWindow; class CalcOptionsWindow;
class ExpressionTextView; class ExpressionTextView;

View File

@ -16,7 +16,7 @@
#include <Query.h> #include <Query.h>
struct QueryList; class QueryList;
class QueryListener { class QueryListener {

View File

@ -18,7 +18,7 @@ enum {
}; };
class UTF8Char; struct UTF8Char;
class TerminalCharClassifier { class TerminalCharClassifier {
public: public:

View File

@ -14,7 +14,7 @@
#include "ValueNodeContainer.h" #include "ValueNodeContainer.h"
class entry_ref; struct entry_ref;
class Architecture; class Architecture;
class AreaInfo; class AreaInfo;
class BFile; class BFile;

View File

@ -50,8 +50,8 @@
namespace { namespace {
struct Directory; class Directory;
struct Node; class Node;
struct WatcherHashDefinition; struct WatcherHashDefinition;
typedef BOpenHashTable<WatcherHashDefinition> WatcherMap; typedef BOpenHashTable<WatcherHashDefinition> WatcherMap;

View File

@ -2,7 +2,7 @@
// //
// Copyright (c) 2003, OpenBeOS // 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. // by the MIT License.
// //
// //
@ -10,7 +10,7 @@
// Author: Sikosis, Jérôme Duval // Author: Sikosis, Jérôme Duval
// Description: Media Preferences // Description: Media Preferences
// Created : June 25, 2003 // Created : June 25, 2003
// //
// ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ // ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~
#ifndef __MEDIALISTITEM_H__ #ifndef __MEDIALISTITEM_H__
#define __MEDIALISTITEM_H__ #define __MEDIALISTITEM_H__
@ -22,7 +22,7 @@
struct dormant_node_info; struct dormant_node_info;
class MediaIcons; struct MediaIcons;
class MediaWindow; class MediaWindow;
class AudioMixerListItem; class AudioMixerListItem;
@ -45,10 +45,10 @@ public:
virtual void Update(BView* owner, const BFont* font); virtual void Update(BView* owner, const BFont* font);
virtual void DrawItem(BView* owner, BRect frame, virtual void DrawItem(BView* owner, BRect frame,
bool complete = false); bool complete = false);
virtual const char* Label() = 0; virtual const char* Label() = 0;
static MediaIcons* Icons() {return sIcons;} static MediaIcons* Icons() {return sIcons;}
static void SetIcons(MediaIcons* icons) {sIcons = icons;} static void SetIcons(MediaIcons* icons) {sIcons = icons;}

View File

@ -14,7 +14,7 @@
Used to discriminate between different targets in order to filter Used to discriminate between different targets in order to filter
multi-clicks. A click on a different target resets the click count. multi-clicks. A click on a different target resets the click count.
*/ */
struct ClickTarget { class ClickTarget {
public: public:
enum Type { enum Type {
TYPE_INVALID, TYPE_INVALID,

View File

@ -33,7 +33,7 @@ class RemotePainter;
class ServerBitmap; class ServerBitmap;
class ServerCursor; class ServerCursor;
class ServerFont; class ServerFont;
class ViewLineArrayInfo; struct ViewLineArrayInfo;
enum { enum {
RP_INIT_CONNECTION = 1, RP_INIT_CONNECTION = 1,

View File

@ -17,8 +17,8 @@
class BMessageRunner; class BMessageRunner;
class dhcp_message; struct dhcp_message;
class socket_timeout; struct socket_timeout;
enum dhcp_state { enum dhcp_state {

View File

@ -30,9 +30,9 @@
#include <List.h> #include <List.h>
#include <OS.h> #include <OS.h>
class entry_ref; struct entry_ref;
class RosterAppInfo; struct RosterAppInfo;
// AppInfoList // AppInfoList
class AppInfoList { class AppInfoList {

View File

@ -12,7 +12,7 @@
#include "AppInfoList.h" #include "AppInfoList.h"
#include "MessageDeliverer.h" #include "MessageDeliverer.h"
class RosterAppInfo; struct RosterAppInfo;
class AppInfoListMessagingTargetSet : public MessagingTargetSet { class AppInfoListMessagingTargetSet : public MessagingTargetSet {
public: public:

View File

@ -29,9 +29,9 @@ class DebugDumper;
struct ThreadData; struct ThreadData;
class ThreadProcessing; class ThreadProcessing;
struct CPUEntry; class CPUEntry;
struct CoreEntry; class CoreEntry;
struct PackageEntry; class PackageEntry;
// The run queues. Holds the threads ready to run ordered by priority. // The run queues. Holds the threads ready to run ordered by priority.
// One queue per schedulable target per core. Additionally, each // One queue per schedulable target per core. Additionally, each