From 2e4639e6dc0ff1372aae3edacbebdfbb896655e0 Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Wed, 3 Mar 2021 23:01:08 +0000 Subject: [PATCH] Removes unused containers included in headers. This was SVN commit r25004. --- source/graphics/Font.h | 4 +--- source/graphics/MapWriter.h | 6 +++--- source/graphics/SkeletonAnimManager.cpp | 4 +--- source/graphics/SkeletonAnimManager.h | 4 +--- source/graphics/TerrainTextureEntry.h | 4 ++-- source/gui/CGUI.h | 1 - source/gui/GUIManager.h | 3 +-- source/gui/ObjectBases/IGUIObject.h | 3 +-- source/lib/adts/cache_adt.h | 3 +-- source/network/NetClient.h | 1 - source/ps/CConsole.h | 1 - source/ps/Profiler2.h | 5 ++--- source/scriptinterface/ScriptContext.h | 3 +-- source/simulation2/Simulation2.h | 7 ++++--- source/simulation2/components/ICmpPathfinder.h | 3 +-- source/simulation2/serialization/StdDeserializer.h | 3 +-- source/simulation2/system/ParamNode.h | 5 +++-- 17 files changed, 23 insertions(+), 37 deletions(-) diff --git a/source/graphics/Font.h b/source/graphics/Font.h index 81de4dd286..677cdee77f 100644 --- a/source/graphics/Font.h +++ b/source/graphics/Font.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 @@ -21,8 +21,6 @@ #include "graphics/Texture.h" #include "lib/res/handle.h" -#include - struct UnifontGlyphData; /** diff --git a/source/graphics/MapWriter.h b/source/graphics/MapWriter.h index 42d103e504..8c83238e39 100644 --- a/source/graphics/MapWriter.h +++ b/source/graphics/MapWriter.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 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 @@ -18,12 +18,12 @@ #ifndef INCLUDED_MAPWRITER #define INCLUDED_MAPWRITER -#include -#include #include "MapIO.h" #include "ps/CStr.h" #include "ps/FileIo.h" +#include + class CLightEnv; class CTerrain; diff --git a/source/graphics/SkeletonAnimManager.cpp b/source/graphics/SkeletonAnimManager.cpp index 095676954a..cd0524ef83 100644 --- a/source/graphics/SkeletonAnimManager.cpp +++ b/source/graphics/SkeletonAnimManager.cpp @@ -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 @@ -29,8 +29,6 @@ #include "ps/CLogger.h" #include "ps/FileIo.h" -#include - /////////////////////////////////////////////////////////////////////////////// // CSkeletonAnimManager constructor CSkeletonAnimManager::CSkeletonAnimManager(CColladaManager& colladaManager) diff --git a/source/graphics/SkeletonAnimManager.h b/source/graphics/SkeletonAnimManager.h index 373a5eba99..9b427837e1 100644 --- a/source/graphics/SkeletonAnimManager.h +++ b/source/graphics/SkeletonAnimManager.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 "lib/file/vfs/vfs_path.h" -#include -#include #include class CColladaManager; diff --git a/source/graphics/TerrainTextureEntry.h b/source/graphics/TerrainTextureEntry.h index dfe90e479d..3fa2f12f5d 100644 --- a/source/graphics/TerrainTextureEntry.h +++ b/source/graphics/TerrainTextureEntry.h @@ -18,8 +18,6 @@ #ifndef INCLUDED_TERRAINTEXTUREENTRY #define INCLUDED_TERRAINTEXTUREENTRY -#include - #include "TerrainTextureManager.h" #include "TextureManager.h" #include "Material.h" @@ -29,6 +27,8 @@ #include "maths/Matrix3D.h" #include "ps/CStr.h" +#include + class XMBElement; class CXeromyces; diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h index f5ff188c41..87a6682d0f 100644 --- a/source/gui/CGUI.h +++ b/source/gui/CGUI.h @@ -33,7 +33,6 @@ #include "scriptinterface/ScriptInterface.h" #include -#include #include #include #include diff --git a/source/gui/GUIManager.h b/source/gui/GUIManager.h index 4399c279ed..69892c913f 100644 --- a/source/gui/GUIManager.h +++ b/source/gui/GUIManager.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 @@ -24,7 +24,6 @@ #include "ps/TemplateLoader.h" #include "scriptinterface/ScriptInterface.h" -#include #include #include diff --git a/source/gui/ObjectBases/IGUIObject.h b/source/gui/ObjectBases/IGUIObject.h index 063c82226e..c37600c683 100644 --- a/source/gui/ObjectBases/IGUIObject.h +++ b/source/gui/ObjectBases/IGUIObject.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 @@ -32,7 +32,6 @@ #include "scriptinterface/ScriptTypes.h" #include -#include #include class CGUI; diff --git a/source/lib/adts/cache_adt.h b/source/lib/adts/cache_adt.h index f64030db8f..622bb035df 100644 --- a/source/lib/adts/cache_adt.h +++ b/source/lib/adts/cache_adt.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -29,7 +29,6 @@ #include #include -#include #include // std::priority_queue #include diff --git a/source/network/NetClient.h b/source/network/NetClient.h index 152d078baa..dbd36dd0e3 100644 --- a/source/network/NetClient.h +++ b/source/network/NetClient.h @@ -25,7 +25,6 @@ #include "ps/CStr.h" -#include #include #include #include diff --git a/source/ps/CConsole.h b/source/ps/CConsole.h index ae53b0791d..9d640c2573 100644 --- a/source/ps/CConsole.h +++ b/source/ps/CConsole.h @@ -23,7 +23,6 @@ #define INCLUDED_CCONSOLE #include -#include #include #include #include diff --git a/source/ps/Profiler2.h b/source/ps/Profiler2.h index c3d09423ff..08351223dd 100644 --- a/source/ps/Profiler2.h +++ b/source/ps/Profiler2.h @@ -81,11 +81,10 @@ #include "lib/timer.h" #include "ps/ThreadUtil.h" -#include -#include #include -#include +#include #include +#include struct mg_context; diff --git a/source/scriptinterface/ScriptContext.h b/source/scriptinterface/ScriptContext.h index a567b344c1..69609d1053 100644 --- a/source/scriptinterface/ScriptContext.h +++ b/source/scriptinterface/ScriptContext.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 @@ -22,7 +22,6 @@ #include "ScriptExtraHeaders.h" #include -#include // Those are minimal defaults. The runtime for the main game is larger and GCs upon a larger growth. constexpr int DEFAULT_CONTEXT_SIZE = 16 * 1024 * 1024; diff --git a/source/simulation2/Simulation2.h b/source/simulation2/Simulation2.h index 9540329cfd..dbdcb527fe 100644 --- a/source/simulation2/Simulation2.h +++ b/source/simulation2/Simulation2.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 @@ -23,8 +23,9 @@ #include "simulation2/system/CmpPtr.h" #include "simulation2/system/Components.h" -#include -#include +#include +#include +#include class CFrustum; class CMessage; diff --git a/source/simulation2/components/ICmpPathfinder.h b/source/simulation2/components/ICmpPathfinder.h index cc07011832..52dc7ef6a5 100644 --- a/source/simulation2/components/ICmpPathfinder.h +++ b/source/simulation2/components/ICmpPathfinder.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 @@ -26,7 +26,6 @@ #include "maths/FixedVector2D.h" #include -#include class IObstructionTestFilter; class PathGoal; diff --git a/source/simulation2/serialization/StdDeserializer.h b/source/simulation2/serialization/StdDeserializer.h index f52a76e2f0..e92f8bb6b2 100644 --- a/source/simulation2/serialization/StdDeserializer.h +++ b/source/simulation2/serialization/StdDeserializer.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 @@ -22,7 +22,6 @@ #include "ps/utf16string.h" -#include #include class CStdDeserializer : public IDeserializer diff --git a/source/simulation2/system/ParamNode.h b/source/simulation2/system/ParamNode.h index c86302a96f..a9d0b8317a 100644 --- a/source/simulation2/system/ParamNode.h +++ b/source/simulation2/system/ParamNode.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 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 @@ -23,8 +23,9 @@ #include "ps/CStrIntern.h" #include "ps/Errors.h" #include "scriptinterface/ScriptTypes.h" + #include -#include +#include class XMBFile; class XMBElement;