From a5c82a4ef6a39ea5409ae839d2fdb266fa56c7d0 Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Wed, 8 Sep 2021 19:43:01 +0000 Subject: [PATCH] Removes unused forward declarations of class and struct. This was SVN commit r25903. --- source/collada/CommonConvert.h | 3 +-- source/graphics/ColladaManager.h | 4 +--- source/graphics/Font.h | 2 -- source/graphics/MapReader.h | 1 - source/graphics/MapWriter.h | 3 --- source/graphics/ObjectBase.h | 2 -- source/graphics/ObjectEntry.h | 1 - source/graphics/Overlay.h | 1 - source/graphics/SkeletonAnimManager.h | 1 - source/graphics/TerrainTextureEntry.h | 5 +---- source/graphics/TerrainTextureManager.h | 2 -- source/graphics/Unit.h | 1 - source/graphics/UnitManager.h | 2 -- source/gui/ObjectTypes/CHotkeyPicker.h | 2 -- source/gui/ObjectTypes/CMiniMap.h | 2 -- source/network/NetClient.h | 1 - source/network/NetFileTransfer.h | 2 -- source/network/StunClient.h | 1 - source/ps/ProfileViewer.h | 4 +--- source/ps/SavedGame.h | 1 - source/ps/VisualReplay.h | 4 +--- source/ps/XMB/XMBData.h | 1 - source/ps/XML/RelaxNG.h | 2 -- source/renderer/MikktspaceWrap.h | 4 +--- source/renderer/RenderModifiers.h | 3 +-- source/renderer/RenderingOptions.h | 1 - source/renderer/ShadowMap.h | 1 - source/renderer/TerrainRenderer.h | 1 - source/renderer/WaterManager.h | 2 -- source/simulation2/components/ICmpGuiInterface.h | 4 +--- source/simulation2/components/ICmpRallyPointRenderer.cpp | 2 -- source/soundmanager/scripting/SoundGroup.h | 1 - 32 files changed, 8 insertions(+), 59 deletions(-) diff --git a/source/collada/CommonConvert.h b/source/collada/CommonConvert.h index e19dd483e9..1c685f86be 100644 --- a/source/collada/CommonConvert.h +++ b/source/collada/CommonConvert.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2015 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -27,7 +27,6 @@ class FCDEntityInstance; class FCDSceneNode; class FCDSkinController; class FMMatrix44; -class FUStatus; class Skeleton; diff --git a/source/graphics/ColladaManager.h b/source/graphics/ColladaManager.h index 9995ddb044..45d87f9782 100644 --- a/source/graphics/ColladaManager.h +++ b/source/graphics/ColladaManager.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -20,9 +20,7 @@ #include "lib/file/vfs/vfs.h" -class CStr8; class CColladaManagerImpl; -class MD5; class CColladaManager { diff --git a/source/graphics/Font.h b/source/graphics/Font.h index 677cdee77f..bfc3915d90 100644 --- a/source/graphics/Font.h +++ b/source/graphics/Font.h @@ -21,8 +21,6 @@ #include "graphics/Texture.h" #include "lib/res/handle.h" -struct UnifontGlyphData; - /** * Storage for a bitmap font. Loaded by CFontManager. */ diff --git a/source/graphics/MapReader.h b/source/graphics/MapReader.h index a3c0ba0765..a87cb90503 100644 --- a/source/graphics/MapReader.h +++ b/source/graphics/MapReader.h @@ -27,7 +27,6 @@ #include "scriptinterface/ScriptTypes.h" #include "simulation2/system/Entity.h" -class CObjectEntry; class CTerrain; class WaterManager; class SkyManager; diff --git a/source/graphics/MapWriter.h b/source/graphics/MapWriter.h index 8c83238e39..ef3ad229a0 100644 --- a/source/graphics/MapWriter.h +++ b/source/graphics/MapWriter.h @@ -30,13 +30,10 @@ class CTerrain; class CCamera; class CCinemaManager; class CPostprocManager; -class CTriggerManager; class WaterManager; class SkyManager; class CSimulation2; struct MapTrigger; -struct MapTriggerGroup; -class XMLWriter_File; class CMapWriter : public CMapIO { diff --git a/source/graphics/ObjectBase.h b/source/graphics/ObjectBase.h index 9535eb6481..fecda0cfd0 100644 --- a/source/graphics/ObjectBase.h +++ b/source/graphics/ObjectBase.h @@ -23,10 +23,8 @@ #include "ps/CStrIntern.h" class CActorDef; -class CModel; class CObjectEntry; class CObjectManager; -class CSkeletonAnim; class CXeromyces; class XMBElement; diff --git a/source/graphics/ObjectEntry.h b/source/graphics/ObjectEntry.h index bd683fdcdd..0299c46611 100644 --- a/source/graphics/ObjectEntry.h +++ b/source/graphics/ObjectEntry.h @@ -23,7 +23,6 @@ class CSkeletonAnim; class CObjectBase; class CObjectManager; class CSimulation2; -struct SPropPoint; #include #include diff --git a/source/graphics/Overlay.h b/source/graphics/Overlay.h index b091fe58d9..3cd915f96e 100644 --- a/source/graphics/Overlay.h +++ b/source/graphics/Overlay.h @@ -27,7 +27,6 @@ #include class CFrustum; -class CTerrain; class CSimContext; class CTexturedLineRData; struct SOverlayDescriptor; diff --git a/source/graphics/SkeletonAnimManager.h b/source/graphics/SkeletonAnimManager.h index d5e53b9b11..26bbb18232 100644 --- a/source/graphics/SkeletonAnimManager.h +++ b/source/graphics/SkeletonAnimManager.h @@ -29,7 +29,6 @@ class CColladaManager; class CSkeletonAnimDef; -class CStr8; /////////////////////////////////////////////////////////////////////////////// // CSkeletonAnimManager : owner class of all skeleton anims - manages creation, diff --git a/source/graphics/TerrainTextureEntry.h b/source/graphics/TerrainTextureEntry.h index 3fa2f12f5d..f9949834b8 100644 --- a/source/graphics/TerrainTextureEntry.h +++ b/source/graphics/TerrainTextureEntry.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -29,9 +29,6 @@ #include -class XMBElement; -class CXeromyces; - ////////////////////////////////////////////////////////////////////////////////////////////////////////// // CTerrainTextureEntry: class wrapping a terrain texture object; contains various other required // elements - color of minimap, terrain "group" it belongs to, etc diff --git a/source/graphics/TerrainTextureManager.h b/source/graphics/TerrainTextureManager.h index 71cb776583..405ced7d5f 100644 --- a/source/graphics/TerrainTextureManager.h +++ b/source/graphics/TerrainTextureManager.h @@ -33,8 +33,6 @@ #define NUM_ALPHA_MAPS 14 -class XMBElement; -class CXeromyces; class CTerrainTextureEntry; class CTerrainProperties; diff --git a/source/graphics/Unit.h b/source/graphics/Unit.h index 8a310df1b5..b647c4240b 100644 --- a/source/graphics/Unit.h +++ b/source/graphics/Unit.h @@ -28,7 +28,6 @@ class CActorDef; class CModelAbstract; class CObjectEntry; class CObjectManager; -class CSkeletonAnim; class CUnitAnimation; diff --git a/source/graphics/UnitManager.h b/source/graphics/UnitManager.h index 4dac265ef7..51d918772c 100644 --- a/source/graphics/UnitManager.h +++ b/source/graphics/UnitManager.h @@ -26,9 +26,7 @@ #include class CUnit; -class CVector3D; class CObjectManager; -class CStr8; class CStrW; /////////////////////////////////////////////////////////////////////////////// diff --git a/source/gui/ObjectTypes/CHotkeyPicker.h b/source/gui/ObjectTypes/CHotkeyPicker.h index 401c98db95..fc70097f15 100644 --- a/source/gui/ObjectTypes/CHotkeyPicker.h +++ b/source/gui/ObjectTypes/CHotkeyPicker.h @@ -25,8 +25,6 @@ #include -class ScriptInterface; - /** * When in focus, returns all currently pressed keys. * After a set time without changes, it will trigger a "combination" event. diff --git a/source/gui/ObjectTypes/CMiniMap.h b/source/gui/ObjectTypes/CMiniMap.h index f3e4ba38e8..3295e5fed0 100644 --- a/source/gui/ObjectTypes/CMiniMap.h +++ b/source/gui/ObjectTypes/CMiniMap.h @@ -27,9 +27,7 @@ #include #include -class CCamera; class CMatrix3D; -class CTerrain; class CMiniMap : public IGUIObject { diff --git a/source/network/NetClient.h b/source/network/NetClient.h index 4af25b8614..b9048ed279 100644 --- a/source/network/NetClient.h +++ b/source/network/NetClient.h @@ -32,7 +32,6 @@ class CGame; class CNetClientSession; class CNetClientTurnManager; -class CNetServer; class ScriptInterface; typedef struct _ENetHost ENetHost; diff --git a/source/network/NetFileTransfer.h b/source/network/NetFileTransfer.h index 24e3525da8..ec1fa038d7 100644 --- a/source/network/NetFileTransfer.h +++ b/source/network/NetFileTransfer.h @@ -25,8 +25,6 @@ class CNetMessage; class CFileTransferResponseMessage; class CFileTransferDataMessage; class CFileTransferAckMessage; -class CNetClientSession; -class CNetServerSession; class INetSession; // Assume this is sufficiently less than MTU that packets won't get diff --git a/source/network/StunClient.h b/source/network/StunClient.h index b8823876e0..c1a82a232f 100644 --- a/source/network/StunClient.h +++ b/source/network/StunClient.h @@ -22,7 +22,6 @@ #include typedef struct _ENetHost ENetHost; -class ScriptInterface; class CStr8; namespace StunClient diff --git a/source/ps/ProfileViewer.h b/source/ps/ProfileViewer.h index 8b64209ba6..9e9f2dd43a 100644 --- a/source/ps/ProfileViewer.h +++ b/source/ps/ProfileViewer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -28,8 +28,6 @@ #include -class ScriptInterface; - /** * Struct ProfileColumn: Describes one column of an AbstractProfileTable. */ diff --git a/source/ps/SavedGame.h b/source/ps/SavedGame.h index 8c2f0bbdb7..63360ccc37 100644 --- a/source/ps/SavedGame.h +++ b/source/ps/SavedGame.h @@ -22,7 +22,6 @@ #include "scriptinterface/StructuredClone.h" class CSimulation2; -class CGUIManager; /** * @file diff --git a/source/ps/VisualReplay.h b/source/ps/VisualReplay.h index c7da994c7d..21bb16f822 100644 --- a/source/ps/VisualReplay.h +++ b/source/ps/VisualReplay.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -21,8 +21,6 @@ #include "lib/os_path.h" #include "scriptinterface/ScriptTypes.h" -class CSimulation2; -class CGUIManager; class CStrW; class ScriptInterface; diff --git a/source/ps/XMB/XMBData.h b/source/ps/XMB/XMBData.h index 8dffc8e278..06185ecca2 100644 --- a/source/ps/XMB/XMBData.h +++ b/source/ps/XMB/XMBData.h @@ -85,7 +85,6 @@ XMB_Text { #include #include -class CXeromyces; class XMBStorage; class XMBElement; diff --git a/source/ps/XML/RelaxNG.h b/source/ps/XML/RelaxNG.h index a794c1e163..467d2a0ae1 100644 --- a/source/ps/XML/RelaxNG.h +++ b/source/ps/XML/RelaxNG.h @@ -26,8 +26,6 @@ typedef xmlRelaxNG *xmlRelaxNGPtr; typedef struct _xmlDoc xmlDoc; typedef xmlDoc *xmlDocPtr; -class IRelaxNGGrammar; - class RelaxNGValidator { public: diff --git a/source/renderer/MikktspaceWrap.h b/source/renderer/MikktspaceWrap.h index c9c0317e28..4503b679fc 100644 --- a/source/renderer/MikktspaceWrap.h +++ b/source/renderer/MikktspaceWrap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -24,8 +24,6 @@ #include -class CVector3D; - class MikkTSpace { diff --git a/source/renderer/RenderModifiers.h b/source/renderer/RenderModifiers.h index 33dff73388..efeade4f49 100644 --- a/source/renderer/RenderModifiers.h +++ b/source/renderer/RenderModifiers.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -34,7 +34,6 @@ #include "graphics/Texture.h" class CLightEnv; -class CMatrix3D; class CModel; class ShadowMap; diff --git a/source/renderer/RenderingOptions.h b/source/renderer/RenderingOptions.h index 8ce84bf08b..f05618ae1d 100755 --- a/source/renderer/RenderingOptions.h +++ b/source/renderer/RenderingOptions.h @@ -27,7 +27,6 @@ #ifndef INCLUDED_RENDERINGOPTIONS #define INCLUDED_RENDERINGOPTIONS -class CConfigDB; class CStr8; class CRenderer; diff --git a/source/renderer/ShadowMap.h b/source/renderer/ShadowMap.h index 9362a952ba..4509737b4d 100644 --- a/source/renderer/ShadowMap.h +++ b/source/renderer/ShadowMap.h @@ -24,7 +24,6 @@ class CBoundingBoxAligned; class CCamera; class CFrustum; -class CMatrix3D; class CVector3D; struct ShadowMapInternals; diff --git a/source/renderer/TerrainRenderer.h b/source/renderer/TerrainRenderer.h index e185d0dbe6..7ef1ddaa65 100644 --- a/source/renderer/TerrainRenderer.h +++ b/source/renderer/TerrainRenderer.h @@ -34,7 +34,6 @@ class CShaderDefines; class CSimulation2; class ShadowMap; -class WaterManager; struct TerrainRendererInternals; diff --git a/source/renderer/WaterManager.h b/source/renderer/WaterManager.h index c6daa859cd..7ff6b9ef25 100644 --- a/source/renderer/WaterManager.h +++ b/source/renderer/WaterManager.h @@ -29,10 +29,8 @@ #include "maths/Vector2D.h" #include "renderer/VertexBufferManager.h" -class CSimulation2; class CFrustum; -struct CoastalPoint; struct WaveObject; /** diff --git a/source/simulation2/components/ICmpGuiInterface.h b/source/simulation2/components/ICmpGuiInterface.h index 18a2d7a4e3..cc214cc601 100644 --- a/source/simulation2/components/ICmpGuiInterface.h +++ b/source/simulation2/components/ICmpGuiInterface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -20,8 +20,6 @@ #include "simulation2/system/Interface.h" -struct CColor; - class ICmpGuiInterface : public IComponent { public: diff --git a/source/simulation2/components/ICmpRallyPointRenderer.cpp b/source/simulation2/components/ICmpRallyPointRenderer.cpp index 4b487f3aca..800566e265 100644 --- a/source/simulation2/components/ICmpRallyPointRenderer.cpp +++ b/source/simulation2/components/ICmpRallyPointRenderer.cpp @@ -20,8 +20,6 @@ #include "ICmpRallyPointRenderer.h" #include "simulation2/system/InterfaceScripted.h" -class CFixedVector2D; - BEGIN_INTERFACE_WRAPPER(RallyPointRenderer) DEFINE_INTERFACE_METHOD("SetDisplayed", ICmpRallyPointRenderer, SetDisplayed) DEFINE_INTERFACE_METHOD("SetPosition", ICmpRallyPointRenderer, SetPosition) diff --git a/source/soundmanager/scripting/SoundGroup.h b/source/soundmanager/scripting/SoundGroup.h index 2f0c8cb08c..d274f080dd 100644 --- a/source/soundmanager/scripting/SoundGroup.h +++ b/source/soundmanager/scripting/SoundGroup.h @@ -27,7 +27,6 @@ #include class CVector3D; -class ISoundItem; enum eSndGrpFlags {