Removes unused containers included in headers.

This was SVN commit r25004.
2021-03-03 23:01:08 +00:00 · 2021-03-03 23:01:08 +00:00 · 2e4639e6dc
commit 2e4639e6dc
parent c29423c723
17 changed files with 23 additions and 37 deletions
--- 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 <map>
-
 struct UnifontGlyphData;

 /**
--- 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 <vector>
-#include <list>
 #include "MapIO.h"
 #include "ps/CStr.h"
 #include "ps/FileIo.h"

+#include <vector>
+

 class CLightEnv;
 class CTerrain;
--- 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 <unordered_map>
-
 ///////////////////////////////////////////////////////////////////////////////
 // CSkeletonAnimManager constructor
 CSkeletonAnimManager::CSkeletonAnimManager(CColladaManager& colladaManager)
--- 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 <map>
-#include <set>
 #include <unordered_map>

 class CColladaManager;
--- a/source/graphics/TerrainTextureEntry.h
+++ b/source/graphics/TerrainTextureEntry.h
@ -18,8 +18,6 @@
 #ifndef INCLUDED_TERRAINTEXTUREENTRY
 #define INCLUDED_TERRAINTEXTUREENTRY

-#include <map>
-
 #include "TerrainTextureManager.h"
 #include "TextureManager.h"
 #include "Material.h"
@ -29,6 +27,8 @@
 #include "maths/Matrix3D.h"
 #include "ps/CStr.h"

+#include <vector>
+
 class XMBElement;
 class CXeromyces;

--- a/source/gui/CGUI.h
+++ b/source/gui/CGUI.h
@ -33,7 +33,6 @@
 #include "scriptinterface/ScriptInterface.h"

 #include <map>
-#include <set>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
--- 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 <set>
 #include <string>
 #include <unordered_set>

--- 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 <map>
-#include <string>
 #include <vector>

 class CGUI;
--- 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 <cfloat>
 #include <list>
-#include <map>
 #include <queue> // std::priority_queue
 #include <unordered_map>

--- a/source/network/NetClient.h
+++ b/source/network/NetClient.h
@ -25,7 +25,6 @@

 #include "ps/CStr.h"

-#include <atomic>
 #include <ctime>
 #include <deque>
 #include <thread>
--- a/source/ps/CConsole.h
+++ b/source/ps/CConsole.h
@ -23,7 +23,6 @@
 #define INCLUDED_CCONSOLE

 #include <deque>
-#include <map>
 #include <mutex>
 #include <stdarg.h>
 #include <string>
--- a/source/ps/Profiler2.h
+++ b/source/ps/Profiler2.h
@ -81,11 +81,10 @@
 #include "lib/timer.h"
 #include "ps/ThreadUtil.h"

-#include <cstring>
-#include <map>
 #include <mutex>
-#include <vector>
+#include <string>
 #include <thread>
+#include <vector>

 struct mg_context;

--- 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 <list>
-#include <sstream>

 // 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;
--- 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 <unordered_map>
-#include <map>
+#include <ostream>
+#include <string>
+#include <vector>

 class CFrustum;
 class CMessage;
--- 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 <map>
-#include <vector>

 class IObstructionTestFilter;
 class PathGoal;
--- 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 <map>
 #include <vector>

 class CStdDeserializer : public IDeserializer
--- 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 <map>
-#include <set>
+#include <string>

 class XMBFile;
 class XMBElement;