Clean up unused Forward Declarations (#16324)

irr/include/IFileSystem.h

@@ -7,10 +7,6 @@
 #include "IReferenceCounted.h"
 #include "IFileArchive.h"
 
-namespace video
-{
-class IVideoDriver;
-} // end namespace video
 namespace io
 {
 

irr/include/IGPUProgrammingServices.h

@@ -8,15 +8,9 @@
 #include "EPrimitiveTypes.h"
 #include "path.h"
 
-namespace io
-{
-class IReadFile;
-} // end namespace io
-
 namespace video
 {
 
-class IVideoDriver;
 class IShaderConstantSetCallBack;
 
 //! Interface making it possible to create and use programs running on the GPU.

irr/include/IGUIEnvironment.h

@@ -16,8 +16,6 @@ class IEventReceiver;
 
 namespace io
 {
-class IReadFile;
-class IWriteFile;
 class IFileSystem;
 } // end namespace io
 namespace video
@@ -44,7 +42,6 @@ class IGUITabControl;
 class IGUITab;
 class IGUIComboBox;
 class IGUIButton;
-class IGUIWindow;
 
 //! GUI Environment. Used as factory and manager of all other GUI elements.
 /** \par This element can create the following events of type EGUI_EVENT_TYPE (which are passed on to focused sub-elements):

irr/include/IMeshCache.h

@@ -11,8 +11,6 @@ namespace scene
 {
 class IMesh;
 class IAnimatedMesh;
-class IAnimatedMeshSceneNode;
-class IMeshLoader;
 
 //! The mesh cache stores already loaded meshes and provides an interface to them.
 /** You can access it using ISceneManager::getMeshCache(). All existing

irr/include/ISceneManager.h

@@ -11,28 +11,16 @@
 #include "SColor.h"
 #include "ESceneNodeTypes.h"
 
-struct SKeyMap;
 struct SEvent;
 
 namespace io
 {
 class IReadFile;
-class IWriteFile;
-class IFileSystem;
 } // end namespace io
 
-namespace gui
-{
-class IGUIFont;
-class IGUIEnvironment;
-} // end namespace gui
-
 namespace video
 {
 class IVideoDriver;
-class SMaterial;
-class IImage;
-class ITexture;
 } // end namespace video
 
 namespace scene
@@ -89,14 +77,12 @@ class ICameraSceneNode;
 class IDummyTransformationSceneNode;
 class IMesh;
 class SkinnedMesh;
-class IMeshBuffer;
 class IMeshCache;
 class ISceneCollisionManager;
 class IMeshLoader;
 class IMeshManipulator;
 class IMeshSceneNode;
 class ISceneNode;
-class ISceneNodeFactory;
 
 //! The Scene Manager manages scene nodes, mesh resources, cameras and all the other stuff.
 /** All Scene nodes can be created only here.

irr/include/IrrlichtDevice.h

@@ -40,7 +40,6 @@ namespace video
 {
 class IContextManager;
 class IImage;
-class ITexture;
 class IVideoDriver;
 extern "C" bool isDriverSupported(E_DRIVER_TYPE driver);
 } // end namespace video

irr/include/SVertexManipulator.h

@@ -9,9 +9,6 @@
 namespace scene
 {
 
-class IMesh;
-class IMeshBuffer;
-struct SMesh;
 
 //! Interface for vertex manipulators.
 /** You should derive your manipulator from this class if it shall be called for every vertex, getting as parameter just the vertex.

irr/src/CAnimatedMeshSceneNode.h

@@ -14,7 +14,6 @@
 
 namespace scene
 {
-class IDummyTransformationSceneNode;
 
 class CAnimatedMeshSceneNode : public IAnimatedMeshSceneNode
 {

irr/src/CFileSystem.h

@@ -10,7 +10,6 @@
 namespace io
 {
 
-class CZipReader;
 
 /*!
 	FileSystem which uses normal files and one zipfile

irr/src/CLimitReadFile.h

@@ -7,7 +7,6 @@
 #include "IReadFile.h"
 #include "irrString.h"
 
-class CUnicodeConverter;
 
 namespace io
 {

irr/src/COpenGLDriver.h

@@ -6,10 +6,6 @@
 
 #include "SIrrCreationParameters.h"
 
-class CIrrDeviceWin32;
-class CIrrDeviceLinux;
-class CIrrDeviceSDL;
-class CIrrDeviceMacOSX;
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 

irr/src/CSceneManager.h

@@ -12,10 +12,6 @@
 #include "irrArray.h"
 #include "IMeshLoader.h"
 
-namespace io
-{
-class IFileSystem;
-}
 namespace scene
 {
 class IMeshCache;

irr/src/CXMeshFileLoader.h

@@ -14,7 +14,6 @@ class IReadFile;
 } // end namespace io
 namespace scene
 {
-class IMeshManipulator;
 
 //! Meshloader capable of loading x meshes.
 class CXMeshFileLoader : public IMeshLoader

irr/src/OpenGL/Common.h

@@ -22,7 +22,6 @@ namespace video
 
 // Forward declarations.
 
-class COpenGLCoreFeature;
 
 template <class TOpenGLDriver>
 class COpenGLCoreTexture;
@@ -38,7 +37,6 @@ typedef COpenGLCoreTexture<COpenGL3DriverBase> COpenGL3Texture;
 typedef COpenGLCoreRenderTarget<COpenGL3DriverBase, COpenGL3Texture> COpenGL3RenderTarget;
 typedef COpenGLCoreCacheHandler<COpenGL3DriverBase, COpenGL3Texture> COpenGL3CacheHandler;
 
-class OpenGLVBO;
 
 enum OpenGLSpec : u8
 {

irr/src/OpenGL/Driver.h

@@ -20,7 +20,6 @@ namespace video
 {
 struct VertexType;
 
-class COpenGL3FixedPipelineRenderer;
 class COpenGL3Renderer2D;
 
 class COpenGL3DriverBase : public CNullDriver, public IMaterialRendererServices, public COpenGL3ExtensionHandler

src/activeobjectmgr.h

@@ -9,7 +9,6 @@
 #include "irrlichttypes.h"
 #include "util/basic_macros.h"
 
-class TestClientActiveObjectMgr;
 class TestServerActiveObjectMgr;
 
 template <typename T>

src/client/client.h

@@ -35,7 +35,6 @@ class ISoundManager;
 class IWritableItemDefManager;
 class IWritableShaderSource;
 class IWritableTextureSource;
-class MapBlockMesh;
 class MapDatabase;
 class MeshUpdateManager;
 class Minimap;
@@ -51,12 +50,14 @@ struct ClientDynamicInfo;
 struct ClientEvent;
 struct MapDrawControl;
 struct MapNode;
-struct MeshMakeData;
-struct MinimapMapblock;
 struct PlayerControl;
 struct PointedThing;
 struct ItemVisualsManager;
 
+namespace scene {
+class IAnimatedMesh;
+}
+
 namespace con {
 class IConnection;
 }

src/client/clientmap.h

@@ -23,8 +23,6 @@ struct MapDrawControl
 };
 
 class Client;
-class ITextureSource;
-class PartialMeshBuffer;
 
 namespace scene
 {

src/client/clientobject.h

@@ -14,10 +14,7 @@
 class ClientEnvironment;
 class ITextureSource;
 class Client;
-class IGameDef;
-class LocalPlayer;
 struct ItemStack;
-class WieldMeshSceneNode;
 
 namespace scene
 {

src/client/clientsimpleobject.h

@@ -5,7 +5,6 @@
 #pragma once
 
 #include "irrlichttypes_bloated.h"
-class ClientEnvironment;
 
 class ClientSimpleObject
 {

src/client/content_cao.cpp

@@ -40,7 +40,6 @@
 #include <IMeshBuffer.h>
 #include <CMeshBuffer.h>
 
-class Settings;
 struct ToolCapabilities;
 
 std::unordered_map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types;

src/client/content_cao.h

@@ -22,10 +22,10 @@ namespace scene {
 	class IBillboardSceneNode;
 }
 
-class Camera;
 class Client;
 struct Nametag;
 struct MinimapMarker;
+class WieldMeshSceneNode;
 
 /*
 	SmoothTranslator and other helpers

src/client/content_cso.h

@@ -12,5 +12,7 @@ namespace scene
 	class ISceneManager;
 }
 
+class ClientEnvironment;
+
 ClientSimpleObject* createSmokePuff(scene::ISceneManager *smgr,
 		ClientEnvironment *env, v3f pos, v2f size);

src/client/game.h

@@ -16,7 +16,6 @@
 class InputHandler;
 class ChatBackend;
 class RenderingEngine;
-struct SubgameSpec;
 struct GameStartData;
 
 struct Jitter {

src/client/game_formspec.h

@@ -12,7 +12,6 @@
 class Client;
 class RenderingEngine;
 class InputHandler;
-class ISoundManager;
 class GUIFormSpecMenu;
 
 /*

src/client/imagefilters.h

@@ -10,7 +10,6 @@
 
 namespace video
 {
-	class IVideoDriver;
 	class IImage;
 }
 

src/client/localplayer.h

@@ -14,8 +14,6 @@ class Client;
 class Environment;
 class GenericCAO;
 class ClientActiveObject;
-class ClientEnvironment;
-class IGameDef;
 struct CollisionInfo;
 struct collisionMoveResult;
 

src/client/mapblock_mesh.h

@@ -30,7 +30,6 @@ class ITextureSource;
 */
 
 
-class MapBlock;
 struct MinimapMapblock;
 
 struct MeshMakeData

src/client/mesh_generator_thread.h

@@ -15,6 +15,8 @@
 #include <memory>
 #include <unordered_map>
 
+class MapBlock;
+
 struct QueuedMeshUpdate
 {
 	v3s16 p = v3s16(-1337, -1337, -1337);

src/client/render/core.h

@@ -11,12 +11,9 @@
 class IrrlichtDevice;
 
 class ShadowRenderer;
-class Camera;
 class Client;
 class Hud;
-class Minimap;
 class RenderPipeline;
-class RenderTarget;
 
 class RenderingCore
 {

src/client/renderingengine.h

@@ -27,11 +27,8 @@ struct VideoDriverInfo {
 };
 
 class ITextureSource;
-class Camera;
 class Client;
-class LocalPlayer;
 class Hud;
-class Minimap;
 
 class RenderingCore;
 

src/client/wieldmesh.h

@@ -22,11 +22,9 @@ namespace scene
 }
 
 
-
 struct ItemStack;
 class Client;
 class ITextureSource;
-struct ContentFeatures;
 class ShadowRenderer;
 
 /*

src/collision.h

@@ -7,7 +7,6 @@
 #include "irrlichttypes_bloated.h"
 #include <vector>
 
-class Map;
 class IGameDef;
 class Environment;
 class ActiveObject;

src/content/subgames.h

@@ -9,7 +9,6 @@
 #include <unordered_map>
 #include <vector>
 
-class Settings;
 
 struct SubgameSpec
 {

src/defaultsettings.h

@@ -4,7 +4,6 @@
 
 #pragma once
 
-class Settings;
 
 /**
  * initialize basic default settings

src/emerge.h

@@ -20,9 +20,9 @@
 		infostream << "EmergeThread: " x << std::endl; \
 }
 
+class EmergeManager;
 class EmergeThread;
 class NodeDefManager;
-class Settings;
 class MapSettingsManager;
 class BiomeManager;
 class OreManager;

src/gamedef.h

@@ -11,23 +11,13 @@
 class IItemDefManager;
 class NodeDefManager;
 class ICraftDefManager;
-class ITextureSource;
-class IShaderSource;
 class IRollbackManager;
-class EmergeManager;
-class Camera;
 class ModChannel;
-class ModStorage;
 class ModStorageDatabase;
 struct SubgameSpec;
 struct ModSpec;
 struct ModIPCStore;
 
-namespace scene {
-	class IAnimatedMesh;
-	class ISceneManager;
-}
-
 /*
 	An interface for fetching game-global definitions like tool and
 	mapnode properties

src/gui/guiAnimatedImage.h

@@ -5,7 +5,6 @@
 #include <IGUIEnvironment.h>
 
 
-class ISimpleTextureSource;
 
 class GUIAnimatedImage : public gui::IGUIElement {
 public:

src/gui/guiEngine.h

@@ -40,7 +40,6 @@ struct image_definition {
 class GUIEngine;
 class RenderingEngine;
 class MainMenuScripting;
-class IWritableShaderSource;
 struct MainMenuData;
 
 /******************************************************************************/

src/gui/guiOpenURL.h

@@ -20,7 +20,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "modalMenu.h"
 #include <string>
 
-class Client;
 class ISimpleTextureSource;
 
 class GUIOpenURLMenu : public GUIModalMenu

src/gui/touchcontrols.h

@@ -25,10 +25,6 @@ namespace gui
 	class IGUIImage;
 	class IGUIStaticText;
 }
-namespace video
-{
-	class IVideoDriver;
-}
 
 class ISimpleTextureSource;
 

src/itemdef.h

@@ -18,6 +18,7 @@
 #include "util/pointedthing.h"
 
 struct ToolCapabilities;
+struct ItemDefinition;
 
 /*
 	Base item definition

src/itemstackmetadata.h

@@ -9,8 +9,6 @@
 
 #include <optional>
 
-class Inventory;
-class IItemDefManager;
 
 class ItemStackMetadata : public SimpleMetadata
 {

src/map.h

@@ -21,7 +21,6 @@
 class MapSector;
 class NodeMetadata;
 class IGameDef;
-class IRollbackManager;
 
 /*
 	MapEditEvent

src/mapgen/mapgen.h

@@ -32,17 +32,12 @@ class NodeDefManager;
 extern const FlagDesc flagdesc_mapgen[];
 extern const FlagDesc flagdesc_gennotify[];
 
-class Biome;
 class BiomeGen;
 struct BiomeParams;
 class BiomeManager;
 class EmergeParams;
-class EmergeManager;
-class MapBlock;
-class VoxelManipulator;
 struct BlockMakeData;
 class VoxelArea;
-class Map;
 
 enum MapgenObject {
 	MGOBJ_VMANIP,

src/mapgen/mapgen_carpathian.h

@@ -10,7 +10,6 @@
 #define MGCARPATHIAN_CAVERNS 0x01
 #define MGCARPATHIAN_RIVERS  0x02
 
-class BiomeManager;
 
 extern const FlagDesc flagdesc_mapgen_carpathian[];
 

src/mapgen/mapgen_flat.h

@@ -12,7 +12,6 @@
 #define MGFLAT_HILLS 0x02
 #define MGFLAT_CAVERNS 0x04
 
-class BiomeManager;
 
 extern const FlagDesc flagdesc_mapgen_flat[];
 

src/mapgen/mapgen_fractal.h

@@ -10,7 +10,6 @@
 ///////////// Mapgen Fractal flags
 #define MGFRACTAL_TERRAIN     0x01
 
-class BiomeManager;
 
 extern const FlagDesc flagdesc_mapgen_fractal[];
 

src/mapgen/mapgen_v5.h

@@ -10,7 +10,6 @@
 ///////// Mapgen V5 flags
 #define MGV5_CAVERNS 0x01
 
-class BiomeManager;
 
 extern const FlagDesc flagdesc_mapgen_v5[];
 

src/mapgen/mapgen_v7.h

@@ -14,7 +14,6 @@
 #define MGV7_CAVERNS     0x08
 #define MGV7_BIOMEREPEAT 0x10 // Now unused
 
-class BiomeManager;
 
 extern const FlagDesc flagdesc_mapgen_v7[];
 

src/mapgen/mapgen_valleys.h

@@ -21,7 +21,6 @@ Licensing changed by permission of Gael de Sailly.
 #define MGVALLEYS_VARY_RIVER_DEPTH 0x04
 #define MGVALLEYS_ALT_DRY          0x08
 
-class BiomeManager;
 class BiomeGenOriginal;
 
 extern const FlagDesc flagdesc_mapgen_valleys[];

src/mapgen/mg_schematic.h

@@ -11,9 +11,7 @@
 
 class Map;
 class ServerMap;
-class Mapgen;
 class MMVManip;
-class PseudoRandom;
 class NodeResolver;
 class Server;
 

src/nodedef.h

@@ -147,7 +147,6 @@ private:
 };
 
 struct MapNode;
-class NodeMetadata;
 
 enum LeavesStyle {
 	LEAVES_FANCY,

src/player.h

@@ -137,9 +137,7 @@ enum CameraMode {
 
 extern const struct EnumString es_CameraMode[];
 
-class Map;
 struct HudElement;
-class Environment;
 
 class Player
 {

src/rollback_interface.h

@@ -13,7 +13,6 @@
 
 class Map;
 class IGameDef;
-struct MapNode;
 class InventoryManager;
 
 struct RollbackNode

src/script/common/c_content.h

@@ -51,7 +51,6 @@ struct DigParams;
 struct HitParams;
 struct EnumString;
 struct NoiseParams;
-class Schematic;
 class ServerActiveObject;
 struct collisionMoveResult;
 namespace treegen { struct TreeDef; }

src/script/cpp_api/s_item.h

@@ -11,7 +11,6 @@
 struct PointedThing;
 struct ItemStack;
 class ServerActiveObject;
-struct ItemDefinition;
 class LuaItemStack;
 class ModApiItem;
 class InventoryList;

src/script/lua_api/l_inventory.h

@@ -9,7 +9,6 @@
 #include "inventory.h"
 #include "inventorymanager.h"
 
-class RemotePlayer;
 
 /*
 	InvRef

src/script/lua_api/l_mainmenu.h

@@ -6,7 +6,6 @@
 
 #include "lua_api/l_base.h"
 
-class AsyncEngine;
 
 /** Implementation of lua api support for mainmenu */
 class ModApiMainMenu: public ModApiBase

src/script/lua_api/l_mapgen.h

@@ -10,9 +10,9 @@
 typedef u16 biome_t;  // copy from mg_biome.h to avoid an unnecessary include
 
 class MMVManip;
-class BiomeManager;
 class BiomeGen;
 class Mapgen;
+class EmergeManager;
 
 class ModApiMapgen : public ModApiBase
 {

src/script/lua_api/l_util.h

@@ -6,7 +6,6 @@
 
 #include "lua_api/l_base.h"
 
-class AsyncEngine;
 
 class ModApiUtil : public ModApiBase
 {

src/script/lua_api/l_vmanip.h

@@ -8,7 +8,6 @@
 #include "lua_api/l_base.h"
 
 class Map;
-class MapBlock;
 class MMVManip;
 
 /*

src/serverenvironment.h

@@ -18,7 +18,6 @@
 #include "util/numeric.h"
 #include "util/metricsbackend.h"
 
-class IGameDef;
 struct GameParams;
 class RemotePlayer;
 class PlayerDatabase;

src/servermap.h

@@ -14,7 +14,6 @@
 
 class Settings;
 class MapDatabase;
-class IRollbackManager;
 class EmergeManager;
 class ServerEnvironment;
 struct BlockMakeData;

src/tool.h

@@ -16,7 +16,6 @@
 #include <map>
 #include <optional>
 
-struct ItemDefinition;
 class IItemDefManager;
 
 /*

src/unittest/mock_inventorymanager.h

@@ -8,7 +8,6 @@
 #include "inventory.h"
 #include "server/serverinventorymgr.h"
 
-class ServerEnvironment;
 
 class MockInventoryManager : public ServerInventoryManager
 {

src/util/guid.h

@@ -10,7 +10,6 @@
 #include <string>
 #include <array>
 
-class ServerEnvironment;
 
 /**
  * A global unique identifier.