Remove some forward declarations that are already in C4Prototypes.h

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;
 

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

src/control/C4Control.h

@@ -31,8 +31,6 @@
 #include "C4KeyboardInput.h"
 #include "C4ObjectList.h"
 
-class C4Record;
-
 // *** control base classes
 
 class C4ControlPacket : public C4PacketBase

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
 {

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;
 

src/game/C4Application.h

@@ -30,7 +30,6 @@
 #include <C4App.h>
 
 class C4ApplicationGameTimer;
-class C4GamePadControl;
 
 /* Main class to initialize configuration and execute the game */
 

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
 {

src/gamescript/C4Script.h

@@ -26,9 +26,6 @@
 
 #include <C4Value.h>
 
-class C4AulScriptEngine;
-class StdMeshMatrix;
-
 const int C4SCR_Access_Public     = 0,
           C4SCR_Access_Protected  = 1,
           C4SCR_Access_Private    = 2;

src/gamescript/C4TransferZone.h

@@ -23,8 +23,6 @@
 #ifndef INC_C4TransferZone
 #define INC_C4TransferZone
 
-class C4Object;
-class C4TargetFacet;
 class C4TransferZones;
 
 class C4TransferZone

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:

src/gui/C4Folder.h

@@ -21,9 +21,6 @@
 #ifndef INC_C4Folder
 #define INC_C4Folder
 
-class StdCompiler;
-class C4Group;
-
 const int C4MaxFolderSort = 4096;
 
 class C4FolderHead

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;

src/gui/C4Menu.h

@@ -30,8 +30,6 @@
 #include "C4Gui.h"
 #include "C4IDList.h"
 
-class C4Viewport;
-
 enum
 {
 	C4MN_SymbolSize   = 16,

src/gui/C4MessageBoard.h

@@ -28,8 +28,6 @@ const int C4MSGB_MaxMsgFading   = 6;
 #include <C4Facet.h>
 #include <C4LogBuf.h>
 
-class C4Player;
-
 class C4MessageBoard
 {
 public:

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;

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:

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:

src/landscape/C4Map.h

@@ -24,9 +24,6 @@
 
 #include <C4Scenario.h>
 
-class CSurface8;
-class C4TextureMap;
-
 class C4MapCreator
 {
 public:

src/landscape/C4MapCreatorS2.h

@@ -25,11 +25,6 @@
 #include <C4Scenario.h>
 #include <C4Surface.h>
 
-class C4AulFunc;
-class C4TextureMap;
-class C4MaterialMap;
-class CSurface8;
-
 #define C4MC_SizeRes        100         // positions in percent
 #define C4MC_ZoomRes        100         // zoom resolution (-100 to +99)
 

src/landscape/C4MassMover.h

@@ -25,9 +25,6 @@
 
 const int32_t C4MassMoverChunk = 10000;
 
-class C4Group;
-class C4MassMoverSet;
-
 class C4MassMover
 {
 	friend class C4MassMoverSet;

src/landscape/C4Material.h

@@ -32,8 +32,6 @@
 #include <C4Facet.h>
 #include <vector>
 
-class C4AulFunc;
-
 #define C4MatOv_Default     0
 #define C4MatOv_Exact       1
 #define C4MatOv_None        2

src/landscape/C4Particles.h

@@ -35,8 +35,6 @@
 #include <C4Group.h>
 #include <C4Shape.h>
 
-class C4Object;
-
 // class predefs
 class C4ParticleDefCore;
 class C4ParticleDef;

src/landscape/C4Scenario.h

@@ -28,8 +28,6 @@
 #include <C4NameList.h>
 #include <C4IDList.h>
 
-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

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:

src/lib/C4Rect.h

@@ -28,10 +28,7 @@
 
 #include <vector>
 
-class StdCompiler;
-
 struct FLOAT_RECT { float left,right,top,bottom; };
-class C4TargetFacet;
 
 class C4Rect
 {

src/lib/StdMesh.h

@@ -25,8 +25,6 @@
 #include <StdMeshMath.h>
 #include <StdMeshMaterial.h>
 
-class StdCompiler;
-
 class StdMeshBone
 {
 	friend class StdMesh;

src/lib/StdMeshLoader.h

@@ -22,9 +22,6 @@
 #define INC_StdMeshLoader
 #include <stdexcept>
 
-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

src/object/C4DefGraphics.h

@@ -31,8 +31,6 @@
 #include "C4Id.h"
 #include "StdMeshUpdate.h"
 
-class C4Def;
-
 // defintion graphics
 class C4AdditionalDefGraphics;
 class C4DefGraphicsPtrBackup;

src/object/C4IDList.h

@@ -25,9 +25,6 @@
 
 #include <C4Id.h>
 
-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!)

src/object/C4Id.h

@@ -34,7 +34,6 @@
 
 //#include <boost/operators.hpp>
 
-class StdCompiler;
 class C4ID //: boost::totally_ordered<C4ID, boost::equivalent<C4ID> >
 {
 public:

src/object/C4MeshAnimation.h

@@ -25,10 +25,6 @@
 #include "StdMesh.h"
 #include "C4ObjectPtr.h"
 
-class C4Action;
-class C4Object;
-class C4ValueArray;
-
 enum C4AnimationValueProviderID
 {
 	C4AVP_Const,

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
 {

src/object/C4ObjectCom.h

@@ -27,9 +27,6 @@
 #include "C4Real.h"
 #include <C4Id.h>
 
-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);

src/object/C4ObjectInfoList.h

@@ -24,10 +24,6 @@
 
 #include <C4Id.h>
 
-class C4Group;
-class C4DefList;
-class C4ObjectInfo;
-
 class C4ObjectInfoList
 {
 public:

src/object/C4ObjectList.h

@@ -27,11 +27,6 @@
 
 #include <C4Id.h>
 
-class C4Object;
-class C4ObjectList;
-class C4ObjectInfo;
-class C4TargetFacet;
-
 class C4ObjectLink
 {
 public:

src/player/C4PlayerList.h

@@ -26,10 +26,6 @@
 
 #include "C4PlayerInfo.h"
 
-class C4Player;
-class C4Object;
-class C4PlayerInfoList;
-
 class C4PlayerList
 {
 public:

src/player/C4RankSystem.h

@@ -24,10 +24,6 @@
 
 #include "C4InputValidation.h"
 
-class C4Group;
-class C4Facet;
-class C4FacetSurface;
-
 class C4RankSystem
 {
 public:

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
 {