From 6a6190564fb59b70933e858bc443abe8cb7e44d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Tue, 13 Mar 2012 17:06:49 +0100 Subject: [PATCH] Remove some forward declarations that are already in C4Prototypes.h --- src/C4Prototypes.h | 32 ++++++++++++++++++-------------- src/c4group/C4GroupSet.h | 9 ++------- src/control/C4Control.h | 2 -- src/control/C4RoundResults.h | 2 -- src/control/C4Teams.h | 6 ------ src/game/C4Application.h | 1 - src/gamescript/C4FindObject.h | 3 --- src/gamescript/C4Script.h | 3 --- src/gamescript/C4TransferZone.h | 2 -- src/graphics/C4FacetEx.h | 4 ---- src/gui/C4Folder.h | 3 --- src/gui/C4GameLobby.h | 7 ------- src/gui/C4Menu.h | 2 -- src/gui/C4MessageBoard.h | 2 -- src/gui/C4MouseControl.h | 4 ---- src/gui/C4PlayerInfoListBox.h | 2 -- src/landscape/C4Landscape.h | 4 ---- src/landscape/C4Map.h | 3 --- src/landscape/C4MapCreatorS2.h | 5 ----- src/landscape/C4MassMover.h | 3 --- src/landscape/C4Material.h | 2 -- src/landscape/C4Particles.h | 2 -- src/landscape/C4Scenario.h | 5 ----- src/landscape/C4Sky.h | 3 --- src/lib/C4Rect.h | 3 --- src/lib/StdMesh.h | 2 -- src/lib/StdMeshLoader.h | 3 --- src/object/C4DefGraphics.h | 2 -- src/object/C4IDList.h | 3 --- src/object/C4Id.h | 1 - src/object/C4MeshAnimation.h | 4 ---- src/object/C4Object.h | 5 ----- src/object/C4ObjectCom.h | 3 --- src/object/C4ObjectInfoList.h | 4 ---- src/object/C4ObjectList.h | 5 ----- src/player/C4PlayerList.h | 4 ---- src/player/C4RankSystem.h | 4 ---- src/script/C4Aul.h | 2 -- 38 files changed, 20 insertions(+), 136 deletions(-) diff --git a/src/C4Prototypes.h b/src/C4Prototypes.h index dc86a7ca7..5878910fb 100644 --- a/src/C4Prototypes.h +++ b/src/C4Prototypes.h @@ -25,25 +25,26 @@ #define INC_C4Prototypes // class declarations +class C4AbstractApp; class C4Action; struct C4AulContext; class C4AulDefFunc; class C4AulFunc; +struct C4AulParSet; class C4AulScript; class C4AulScriptEngine; class C4AulScriptFunc; -struct C4AulParSet; class C4BltTransform; class C4ClientList; class C4ClientPlayerInfos; class C4Command; class C4Config; -class C4ConfigGraphics; class C4Console; class C4Control; class C4Def; -class C4DefList; class C4DefGraphics; +class C4DefList; +class C4Draw; class C4Effect; class C4Facet; class C4FacetSurface; @@ -51,17 +52,16 @@ class C4FileMonitor; class C4Game; class C4GameMessage; class C4GameMessageList; +class C4GameOptionButtons; class C4GameOptionsList; class C4GamePadControl; class C4GamePadOpener; -class C4GamePadOpener; class C4GameParameters; class C4GameResList; class C4GameSec1Timer; class C4Graph; class C4GraphicsSystem; class C4Group; -class C4Group; class C4GroupSet; class C4IDList; class C4KeyboardInput; @@ -71,6 +71,8 @@ class C4League; class C4LoaderScreen; class C4LSector; class C4LSectors; +class C4MapCreatorS2; +class C4Markup; class C4MassMover; class C4MassMoverSet; class C4Material; @@ -84,8 +86,9 @@ class C4Network; class C4NetworkClient; class C4NetworkClientList; class C4Network2IRCClient; -class C4Network2Stats; class C4Network2Reference; +class C4Network2ResDlg; +class C4Network2Stats; class C4Object; class C4ObjectInfo; class C4ObjectInfoCore; @@ -99,6 +102,7 @@ class C4Player; class C4PlayerInfo; class C4PlayerInfoCore; class C4PlayerInfoList; +class C4PlayerInfoListBox; class C4PlayerList; class C4PropList; class C4PXS; @@ -110,12 +114,15 @@ class C4RoundResult; class C4RoundResults; class C4Scenario; class C4ScriptHost; +class C4SolidMask; class C4SoundSystem; class C4Stream; class C4String; class C4Surface; class C4SVal; class C4TargetFacet; +class C4TargetRect; +class C4Team; class C4TeamList; class C4TexMapEntry; class C4TexMgr; @@ -127,8 +134,9 @@ class C4ValueNumbers; class C4Viewport; class C4ViewportList; class C4ViewportWindow; -class C4Markup; +class C4Window; class CStdFont; +class CStdGLCtx; struct CStdPalette; class CStdStream; class CStdVectorFont; @@ -138,19 +146,15 @@ class StdMesh; class StdMeshBone; class StdMeshInstance; class StdMeshMaterial; +class StdMeshMatManager; class StdMeshMatrix; class StdMeshSkeletonLoader; -class C4Draw; -class C4AbstractApp; -class C4Window; -class C4Surface; -class CStdStream; -class CStdGLCtx; namespace C4GUI { - class Screen; + class ComboBox_FillCB; class Dialog; + class Screen; } typedef C4GUI::Screen C4GUIScreen; diff --git a/src/c4group/C4GroupSet.h b/src/c4group/C4GroupSet.h index afe8de1ef..90e42eeda 100644 --- a/src/c4group/C4GroupSet.h +++ b/src/c4group/C4GroupSet.h @@ -53,16 +53,11 @@ #define C4GSCnt_All ~0 -// class predefs -class C4Group; -class C4GroupSet; -class C4GroupSetNode; - // one node in the group set holds one group class C4GroupSetNode { protected: - C4GroupSet *pParent; // owning set + class C4GroupSet *pParent; // owning set C4GroupSetNode *pPrev, *pNext; // linked list - always valid C4Group *pGroup; // ptr to group owned by this node @@ -71,7 +66,7 @@ protected: int32_t id; // group node ID public: - C4GroupSetNode(C4GroupSet &rParent, C4GroupSetNode *pPrev, C4Group &rGroup, bool fGrpOwned, int32_t id); // ctor + C4GroupSetNode(class C4GroupSet &rParent, C4GroupSetNode *pPrev, C4Group &rGroup, bool fGrpOwned, int32_t id); // ctor ~C4GroupSetNode(); // dtor int32_t Priority; // group priority diff --git a/src/control/C4Control.h b/src/control/C4Control.h index b3f970539..1431f534b 100644 --- a/src/control/C4Control.h +++ b/src/control/C4Control.h @@ -31,8 +31,6 @@ #include "C4KeyboardInput.h" #include "C4ObjectList.h" -class C4Record; - // *** control base classes class C4ControlPacket : public C4PacketBase diff --git a/src/control/C4RoundResults.h b/src/control/C4RoundResults.h index 0f6347f8b..002a23905 100644 --- a/src/control/C4RoundResults.h +++ b/src/control/C4RoundResults.h @@ -32,8 +32,6 @@ #include "C4PacketBase.h" #include "C4FacetEx.h" -class C4Player; - // Contains additional data not present in C4PlayerInfo class C4RoundResultsPlayer { diff --git a/src/control/C4Teams.h b/src/control/C4Teams.h index 915ceb90b..ef4aa1117 100644 --- a/src/control/C4Teams.h +++ b/src/control/C4Teams.h @@ -23,12 +23,6 @@ #include "C4InputValidation.h" -class C4Group; - -// class predec -class C4TeamList; -namespace C4GUI { class ComboBox_FillCB; } - // constant used by lobby to indicate invisible, random team const int32_t TEAMID_Unknown = -1; diff --git a/src/game/C4Application.h b/src/game/C4Application.h index 768cea404..a0529886b 100644 --- a/src/game/C4Application.h +++ b/src/game/C4Application.h @@ -30,7 +30,6 @@ #include class C4ApplicationGameTimer; -class C4GamePadControl; /* Main class to initialize configuration and execute the game */ diff --git a/src/gamescript/C4FindObject.h b/src/gamescript/C4FindObject.h index a56f48f6e..5a02f10f8 100644 --- a/src/gamescript/C4FindObject.h +++ b/src/gamescript/C4FindObject.h @@ -67,9 +67,6 @@ enum C4SortObjectCondID C4SO_Last = 200 // no sort condition larger than this }; -class C4LSectors; -class C4ObjectList; - // Base class class C4FindObject { diff --git a/src/gamescript/C4Script.h b/src/gamescript/C4Script.h index f00e0ed6d..6e55aea55 100644 --- a/src/gamescript/C4Script.h +++ b/src/gamescript/C4Script.h @@ -26,9 +26,6 @@ #include -class C4AulScriptEngine; -class StdMeshMatrix; - const int C4SCR_Access_Public = 0, C4SCR_Access_Protected = 1, C4SCR_Access_Private = 2; diff --git a/src/gamescript/C4TransferZone.h b/src/gamescript/C4TransferZone.h index c22677d52..58c3a420d 100644 --- a/src/gamescript/C4TransferZone.h +++ b/src/gamescript/C4TransferZone.h @@ -23,8 +23,6 @@ #ifndef INC_C4TransferZone #define INC_C4TransferZone -class C4Object; -class C4TargetFacet; class C4TransferZones; class C4TransferZone diff --git a/src/graphics/C4FacetEx.h b/src/graphics/C4FacetEx.h index 9cf82b8cc..021b46726 100644 --- a/src/graphics/C4FacetEx.h +++ b/src/graphics/C4FacetEx.h @@ -30,10 +30,6 @@ const int C4FCT_Full = -1, C4FCT_Height = -2, C4FCT_Width = -3; -class C4TargetRect; -class C4Surface; -class C4Rect; - class C4TargetFacet: public C4Facet { public: diff --git a/src/gui/C4Folder.h b/src/gui/C4Folder.h index 528b8d448..6f06c32bf 100644 --- a/src/gui/C4Folder.h +++ b/src/gui/C4Folder.h @@ -21,9 +21,6 @@ #ifndef INC_C4Folder #define INC_C4Folder -class StdCompiler; -class C4Group; - const int C4MaxFolderSort = 4096; class C4FolderHead diff --git a/src/gui/C4GameLobby.h b/src/gui/C4GameLobby.h index f9f97c076..2ca2c8625 100644 --- a/src/gui/C4GameLobby.h +++ b/src/gui/C4GameLobby.h @@ -28,13 +28,6 @@ #include "C4Client.h" #include "C4PlayerInfo.h" -class C4PlayerInfo; -class C4PlayerInfoListBox; -class C4ClientPlayerInfos; -class C4Network2ResDlg; -class C4GameOptionsList; -class C4GameOptionButtons; - namespace C4GameLobby { class MainDlg; diff --git a/src/gui/C4Menu.h b/src/gui/C4Menu.h index f0461cbc6..58d7deec8 100644 --- a/src/gui/C4Menu.h +++ b/src/gui/C4Menu.h @@ -30,8 +30,6 @@ #include "C4Gui.h" #include "C4IDList.h" -class C4Viewport; - enum { C4MN_SymbolSize = 16, diff --git a/src/gui/C4MessageBoard.h b/src/gui/C4MessageBoard.h index 172560a05..33ccc575a 100644 --- a/src/gui/C4MessageBoard.h +++ b/src/gui/C4MessageBoard.h @@ -28,8 +28,6 @@ const int C4MSGB_MaxMsgFading = 6; #include #include -class C4Player; - class C4MessageBoard { public: diff --git a/src/gui/C4MouseControl.h b/src/gui/C4MouseControl.h index 47d8ed2e5..28155e64e 100644 --- a/src/gui/C4MouseControl.h +++ b/src/gui/C4MouseControl.h @@ -43,10 +43,6 @@ const int32_t C4MC_MD_DragSource = 1, C4MC_MD_DropTarget = 2, C4MC_MD_NoClick = 4; -class C4Viewport; -class C4Menu; -class C4Player; - class C4MouseControl { friend class C4Viewport; diff --git a/src/gui/C4PlayerInfoListBox.h b/src/gui/C4PlayerInfoListBox.h index 7b7397d7d..688448610 100644 --- a/src/gui/C4PlayerInfoListBox.h +++ b/src/gui/C4PlayerInfoListBox.h @@ -31,8 +31,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "C4Network2Res.h" #include "C4GameLobby.h" -class C4Team; - class C4PlayerInfoListBox : public C4GUI::ListBox { public: diff --git a/src/landscape/C4Landscape.h b/src/landscape/C4Landscape.h index 9780a6087..ea361459d 100644 --- a/src/landscape/C4Landscape.h +++ b/src/landscape/C4Landscape.h @@ -46,10 +46,6 @@ const int32_t C4LSC_Undefined = 0, const int32_t C4LS_MaxRelights = 50; -class C4MapCreatorS2; -class C4Object; -class C4PropList; - class C4Landscape { public: diff --git a/src/landscape/C4Map.h b/src/landscape/C4Map.h index c47d7d64f..2c3214b4e 100644 --- a/src/landscape/C4Map.h +++ b/src/landscape/C4Map.h @@ -24,9 +24,6 @@ #include -class CSurface8; -class C4TextureMap; - class C4MapCreator { public: diff --git a/src/landscape/C4MapCreatorS2.h b/src/landscape/C4MapCreatorS2.h index 10167628e..3a2e8614c 100644 --- a/src/landscape/C4MapCreatorS2.h +++ b/src/landscape/C4MapCreatorS2.h @@ -25,11 +25,6 @@ #include #include -class C4AulFunc; -class C4TextureMap; -class C4MaterialMap; -class CSurface8; - #define C4MC_SizeRes 100 // positions in percent #define C4MC_ZoomRes 100 // zoom resolution (-100 to +99) diff --git a/src/landscape/C4MassMover.h b/src/landscape/C4MassMover.h index a2158dd32..1a59872d1 100644 --- a/src/landscape/C4MassMover.h +++ b/src/landscape/C4MassMover.h @@ -25,9 +25,6 @@ const int32_t C4MassMoverChunk = 10000; -class C4Group; -class C4MassMoverSet; - class C4MassMover { friend class C4MassMoverSet; diff --git a/src/landscape/C4Material.h b/src/landscape/C4Material.h index e5bf9d291..9c03b7534 100644 --- a/src/landscape/C4Material.h +++ b/src/landscape/C4Material.h @@ -32,8 +32,6 @@ #include #include -class C4AulFunc; - #define C4MatOv_Default 0 #define C4MatOv_Exact 1 #define C4MatOv_None 2 diff --git a/src/landscape/C4Particles.h b/src/landscape/C4Particles.h index 021c519f2..30ba43f52 100644 --- a/src/landscape/C4Particles.h +++ b/src/landscape/C4Particles.h @@ -35,8 +35,6 @@ #include #include -class C4Object; - // class predefs class C4ParticleDefCore; class C4ParticleDef; diff --git a/src/landscape/C4Scenario.h b/src/landscape/C4Scenario.h index 38420f8c0..52ee12607 100644 --- a/src/landscape/C4Scenario.h +++ b/src/landscape/C4Scenario.h @@ -28,8 +28,6 @@ #include #include -class C4Group; - class C4SVal { public: @@ -252,9 +250,6 @@ public: int32_t GetMinPlayer(); // will try to determine the minimum player count for this scenario }; -class C4ScenarioSection; - - extern const char *C4ScenSect_Main; // ref to one scenario section diff --git a/src/landscape/C4Sky.h b/src/landscape/C4Sky.h index 7b5e25c77..4744affbb 100644 --- a/src/landscape/C4Sky.h +++ b/src/landscape/C4Sky.h @@ -28,9 +28,6 @@ #define C4SkyPM_Fixed 0 // sky parallax mode: fixed #define C4SkyPM_Wind 1 // sky parallax mode: blown by the wind -class C4Group; -class C4TargetFacet; - class C4Sky { public: diff --git a/src/lib/C4Rect.h b/src/lib/C4Rect.h index 54a40e3de..1627580ed 100644 --- a/src/lib/C4Rect.h +++ b/src/lib/C4Rect.h @@ -28,10 +28,7 @@ #include -class StdCompiler; - struct FLOAT_RECT { float left,right,top,bottom; }; -class C4TargetFacet; class C4Rect { diff --git a/src/lib/StdMesh.h b/src/lib/StdMesh.h index 9de6b382e..ef55a6d26 100644 --- a/src/lib/StdMesh.h +++ b/src/lib/StdMesh.h @@ -25,8 +25,6 @@ #include #include -class StdCompiler; - class StdMeshBone { friend class StdMesh; diff --git a/src/lib/StdMeshLoader.h b/src/lib/StdMeshLoader.h index 6385f3b51..a59163775 100644 --- a/src/lib/StdMeshLoader.h +++ b/src/lib/StdMeshLoader.h @@ -22,9 +22,6 @@ #define INC_StdMeshLoader #include -class StdMesh; -class StdMeshMatManager; - // Interface to load skeleton files. Given a filename occuring in the // mesh file, this should load the skeleton file from wherever the mesh file // was loaded from, for example from a C4Group. Return default-construted diff --git a/src/object/C4DefGraphics.h b/src/object/C4DefGraphics.h index 1b592a7b0..f3a67e2fd 100644 --- a/src/object/C4DefGraphics.h +++ b/src/object/C4DefGraphics.h @@ -31,8 +31,6 @@ #include "C4Id.h" #include "StdMeshUpdate.h" -class C4Def; - // defintion graphics class C4AdditionalDefGraphics; class C4DefGraphicsPtrBackup; diff --git a/src/object/C4IDList.h b/src/object/C4IDList.h index eb4eac891..8c371f345 100644 --- a/src/object/C4IDList.h +++ b/src/object/C4IDList.h @@ -25,9 +25,6 @@ #include -class C4DefList; -class C4Facet; - // note that setting the chunk size for ID-Lists so low looks like an enormous waste // at first glance - however, due there's an incredibly large number of small ID-Lists // (99% of the lists have only one to three items!) diff --git a/src/object/C4Id.h b/src/object/C4Id.h index 8d37958ac..32912a1e1 100644 --- a/src/object/C4Id.h +++ b/src/object/C4Id.h @@ -34,7 +34,6 @@ //#include -class StdCompiler; class C4ID //: boost::totally_ordered > { public: diff --git a/src/object/C4MeshAnimation.h b/src/object/C4MeshAnimation.h index 4ac8a3620..1f7f31cf0 100644 --- a/src/object/C4MeshAnimation.h +++ b/src/object/C4MeshAnimation.h @@ -25,10 +25,6 @@ #include "StdMesh.h" #include "C4ObjectPtr.h" -class C4Action; -class C4Object; -class C4ValueArray; - enum C4AnimationValueProviderID { C4AVP_Const, diff --git a/src/object/C4Object.h b/src/object/C4Object.h index b108cb3c2..6e3941d7b 100644 --- a/src/object/C4Object.h +++ b/src/object/C4Object.h @@ -76,11 +76,6 @@ #define VIS_LayerToggle 64 #define VIS_OverlayOnly 128 -class C4SolidMask; -class C4Command; -class C4MaterialList; -class C4Player; - // Helper struct to serialize an object's mesh instance with other object's mesh instances attached class C4MeshDenumerator: public StdMeshInstance::AttachedMesh::Denumerator { diff --git a/src/object/C4ObjectCom.h b/src/object/C4ObjectCom.h index f18a6a4ff..44493de6b 100644 --- a/src/object/C4ObjectCom.h +++ b/src/object/C4ObjectCom.h @@ -27,9 +27,6 @@ #include "C4Real.h" #include -class C4Facet; -class C4Object; - bool ComDirLike(int32_t iComDir, int32_t iSample); bool PlayerObjectCommand(int32_t plr, int32_t cmdf, C4Object *pTarget=NULL, int32_t tx=0, int32_t ty=0); diff --git a/src/object/C4ObjectInfoList.h b/src/object/C4ObjectInfoList.h index 5be9f1e6a..41292a5b2 100644 --- a/src/object/C4ObjectInfoList.h +++ b/src/object/C4ObjectInfoList.h @@ -24,10 +24,6 @@ #include -class C4Group; -class C4DefList; -class C4ObjectInfo; - class C4ObjectInfoList { public: diff --git a/src/object/C4ObjectList.h b/src/object/C4ObjectList.h index 2c2c01b6e..aab027905 100644 --- a/src/object/C4ObjectList.h +++ b/src/object/C4ObjectList.h @@ -27,11 +27,6 @@ #include -class C4Object; -class C4ObjectList; -class C4ObjectInfo; -class C4TargetFacet; - class C4ObjectLink { public: diff --git a/src/player/C4PlayerList.h b/src/player/C4PlayerList.h index 7170c1b65..96748369b 100644 --- a/src/player/C4PlayerList.h +++ b/src/player/C4PlayerList.h @@ -26,10 +26,6 @@ #include "C4PlayerInfo.h" -class C4Player; -class C4Object; -class C4PlayerInfoList; - class C4PlayerList { public: diff --git a/src/player/C4RankSystem.h b/src/player/C4RankSystem.h index 1bafdbece..3fea35ed8 100644 --- a/src/player/C4RankSystem.h +++ b/src/player/C4RankSystem.h @@ -24,10 +24,6 @@ #include "C4InputValidation.h" -class C4Group; -class C4Facet; -class C4FacetSurface; - class C4RankSystem { public: diff --git a/src/script/C4Aul.h b/src/script/C4Aul.h index 646551c2b..ed38b77ce 100644 --- a/src/script/C4Aul.h +++ b/src/script/C4Aul.h @@ -36,8 +36,6 @@ // consts #define C4AUL_MAX_Identifier 100 // max length of function identifiers -class C4ScriptHost; - // generic C4Aul error class class C4AulError {