From de050ef7e2018ad7e953db3df7fed8304a08a5de Mon Sep 17 00:00:00 2001 From: elexis Date: Sat, 7 Sep 2019 13:35:45 +0000 Subject: [PATCH] Remove some unused Profiler.h and CLogger.h includes. NativeWrapperDefns.h from 4e87fef3da, found in audit of 7c21a0cf8e. Differential Revision: https://code.wildfiregames.com/D2268 Tested on: clang 8.0.1, Jenkins This was SVN commit r22863. --- source/graphics/scripting/JSInterface_GameView.cpp | 1 - source/gui/CChart.cpp | 1 + source/gui/CCheckBox.cpp | 1 - source/gui/CDropDown.cpp | 2 +- source/gui/CInput.cpp | 1 - source/gui/CList.cpp | 3 +-- source/gui/CSlider.cpp | 1 - source/gui/GUIManager.h | 1 - source/gui/IGUIButtonBehavior.cpp | 2 -- source/gui/scripting/JSInterface_IGUIObject.cpp | 1 - source/i18n/scripting/JSInterface_L10n.cpp | 1 - source/network/NetClientTurnManager.cpp | 1 + source/ps/scripting/JSInterface_Console.cpp | 1 - source/ps/scripting/JSInterface_VisualReplay.cpp | 1 - source/scriptinterface/NativeWrapperDefns.h | 1 - source/simulation2/components/CCmpTest.cpp | 2 -- source/simulation2/system/ComponentManager.cpp | 1 + source/simulation2/system/ReplayTurnManager.cpp | 1 + source/simulation2/system/TurnManager.cpp | 2 ++ source/soundmanager/scripting/JSInterface_Sound.cpp | 1 - 20 files changed, 8 insertions(+), 18 deletions(-) diff --git a/source/graphics/scripting/JSInterface_GameView.cpp b/source/graphics/scripting/JSInterface_GameView.cpp index 00f27db14f..32bd5cacb7 100644 --- a/source/graphics/scripting/JSInterface_GameView.cpp +++ b/source/graphics/scripting/JSInterface_GameView.cpp @@ -25,7 +25,6 @@ #include "ps/Game.h" #include "ps/World.h" #include "ps/CLogger.h" -#include "ps/Profile.h" #include "scriptinterface/ScriptInterface.h" #define IMPLEMENT_BOOLEAN_SCRIPT_SETTING(NAME) \ diff --git a/source/gui/CChart.cpp b/source/gui/CChart.cpp index 6cacb2d344..bdfa0e0655 100644 --- a/source/gui/CChart.cpp +++ b/source/gui/CChart.cpp @@ -26,6 +26,7 @@ #include "i18n/L10n.h" #include "lib/ogl.h" #include "ps/CLogger.h" +#include "ps/Profile.h" #include "renderer/Renderer.h" #include "third_party/cppformat/format.h" diff --git a/source/gui/CCheckBox.cpp b/source/gui/CCheckBox.cpp index c127cbc1c2..d05b8f3ab0 100644 --- a/source/gui/CCheckBox.cpp +++ b/source/gui/CCheckBox.cpp @@ -21,7 +21,6 @@ #include "gui/CGUIColor.h" #include "graphics/FontMetrics.h" -#include "ps/CLogger.h" #include "ps/CStrIntern.h" /** diff --git a/source/gui/CDropDown.cpp b/source/gui/CDropDown.cpp index fc4e8f1577..fc0e7fd5cc 100644 --- a/source/gui/CDropDown.cpp +++ b/source/gui/CDropDown.cpp @@ -23,7 +23,7 @@ #include "lib/external_libraries/libsdl.h" #include "lib/ogl.h" #include "lib/timer.h" -#include "ps/CLogger.h" +#include "ps/Profile.h" CDropDown::CDropDown(CGUI& pGUI) : CList(pGUI), IGUIObject(pGUI), diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp index 7e882c5c2d..0f6ded2719 100644 --- a/source/gui/CInput.cpp +++ b/source/gui/CInput.cpp @@ -28,7 +28,6 @@ #include "lib/sysdep/clipboard.h" #include "lib/timer.h" #include "lib/utf8.h" -#include "ps/CLogger.h" #include "ps/ConfigDB.h" #include "ps/GameSetup/Config.h" #include "ps/Globals.h" diff --git a/source/gui/CList.cpp b/source/gui/CList.cpp index 4e7b6a1228..46deb21ebf 100644 --- a/source/gui/CList.cpp +++ b/source/gui/CList.cpp @@ -22,8 +22,7 @@ #include "gui/CGUIColor.h" #include "gui/CGUIScrollBarVertical.h" #include "lib/external_libraries/libsdl.h" -#include "ps/CLogger.h" -#include "ps/Profile.h" +#include "lib/timer.h" CList::CList(CGUI& pGUI) : IGUIObject(pGUI), IGUITextOwner(pGUI), IGUIScrollBarOwner(pGUI), diff --git a/source/gui/CSlider.cpp b/source/gui/CSlider.cpp index 393a0ffc3c..79bdc620aa 100644 --- a/source/gui/CSlider.cpp +++ b/source/gui/CSlider.cpp @@ -19,7 +19,6 @@ #include "CSlider.h" #include "GUI.h" #include "lib/ogl.h" -#include "ps/CLogger.h" CSlider::CSlider(CGUI& pGUI) : IGUIObject(pGUI), m_IsPressed(false), m_ButtonSide(0) diff --git a/source/gui/GUIManager.h b/source/gui/GUIManager.h index fbc83201a3..7cd9d2e24f 100644 --- a/source/gui/GUIManager.h +++ b/source/gui/GUIManager.h @@ -23,7 +23,6 @@ #include "lib/input.h" #include "lib/file/vfs/vfs_path.h" -#include "ps/CLogger.h" #include "ps/CStr.h" #include "ps/TemplateLoader.h" #include "scriptinterface/ScriptVal.h" diff --git a/source/gui/IGUIButtonBehavior.cpp b/source/gui/IGUIButtonBehavior.cpp index 63ce70e1d1..4fe38061f5 100644 --- a/source/gui/IGUIButtonBehavior.cpp +++ b/source/gui/IGUIButtonBehavior.cpp @@ -19,8 +19,6 @@ #include "GUI.h" -#include "ps/CLogger.h" - IGUIButtonBehavior::IGUIButtonBehavior(CGUI& pGUI) : IGUIObject(pGUI), m_Pressed(false) { diff --git a/source/gui/scripting/JSInterface_IGUIObject.cpp b/source/gui/scripting/JSInterface_IGUIObject.cpp index 6d142e9317..c5a1967aaa 100644 --- a/source/gui/scripting/JSInterface_IGUIObject.cpp +++ b/source/gui/scripting/JSInterface_IGUIObject.cpp @@ -27,7 +27,6 @@ #include "gui/IGUIObject.h" #include "gui/IGUIScrollBar.h" #include "gui/scripting/JSInterface_GUITypes.h" -#include "ps/CLogger.h" #include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptInterface.h" diff --git a/source/i18n/scripting/JSInterface_L10n.cpp b/source/i18n/scripting/JSInterface_L10n.cpp index f4844d3e66..5fc99f54d2 100644 --- a/source/i18n/scripting/JSInterface_L10n.cpp +++ b/source/i18n/scripting/JSInterface_L10n.cpp @@ -21,7 +21,6 @@ #include "i18n/L10n.h" #include "lib/utf8.h" -#include "ps/Profile.h" #include "scriptinterface/ScriptInterface.h" // Returns a translation of the specified English string into the current language. diff --git a/source/network/NetClientTurnManager.cpp b/source/network/NetClientTurnManager.cpp index 5c8433b49b..2d04015158 100644 --- a/source/network/NetClientTurnManager.cpp +++ b/source/network/NetClientTurnManager.cpp @@ -23,6 +23,7 @@ #include "ps/CLogger.h" #include "ps/Pyrogenesis.h" #include "ps/Replay.h" +#include "ps/Profile.h" #include "ps/Util.h" #include "simulation2/Simulation2.h" diff --git a/source/ps/scripting/JSInterface_Console.cpp b/source/ps/scripting/JSInterface_Console.cpp index 51ff2d73f3..90575c37ea 100644 --- a/source/ps/scripting/JSInterface_Console.cpp +++ b/source/ps/scripting/JSInterface_Console.cpp @@ -21,7 +21,6 @@ #include "ps/CConsole.h" #include "ps/CLogger.h" -#include "ps/Profile.h" #include "scriptinterface/ScriptInterface.h" bool JSI_Console::CheckGlobalInitialized() diff --git a/source/ps/scripting/JSInterface_VisualReplay.cpp b/source/ps/scripting/JSInterface_VisualReplay.cpp index d26703af2c..c07b41a1da 100644 --- a/source/ps/scripting/JSInterface_VisualReplay.cpp +++ b/source/ps/scripting/JSInterface_VisualReplay.cpp @@ -20,7 +20,6 @@ #include "JSInterface_VisualReplay.h" #include "ps/CStr.h" -#include "ps/Profile.h" #include "ps/VisualReplay.h" #include "scriptinterface/ScriptInterface.h" diff --git a/source/scriptinterface/NativeWrapperDefns.h b/source/scriptinterface/NativeWrapperDefns.h index 17b62c7c6b..b5fbcaeb75 100644 --- a/source/scriptinterface/NativeWrapperDefns.h +++ b/source/scriptinterface/NativeWrapperDefns.h @@ -14,7 +14,6 @@ * You should have received a copy of the GNU General Public License * along with 0 A.D. If not, see . */ -#include "ps/Profile.h" // Use the macro below to define types that will be passed by value to C++ functions. // NOTE: References are used just to avoid superfluous copy constructor calls diff --git a/source/simulation2/components/CCmpTest.cpp b/source/simulation2/components/CCmpTest.cpp index e4a5c14925..5f8886f51e 100644 --- a/source/simulation2/components/CCmpTest.cpp +++ b/source/simulation2/components/CCmpTest.cpp @@ -23,8 +23,6 @@ #include "simulation2/scripting/ScriptComponent.h" #include "simulation2/MessageTypes.h" -#include "ps/Profile.h" - class CCmpTest1A : public ICmpTest1 { public: diff --git a/source/simulation2/system/ComponentManager.cpp b/source/simulation2/system/ComponentManager.cpp index b5fc987ce7..dfd4fe750a 100644 --- a/source/simulation2/system/ComponentManager.cpp +++ b/source/simulation2/system/ComponentManager.cpp @@ -29,6 +29,7 @@ #include "lib/utf8.h" #include "ps/CLogger.h" +#include "ps/Profile.h" #include "ps/Filesystem.h" #include "ps/scripting/JSInterface_VFS.h" diff --git a/source/simulation2/system/ReplayTurnManager.cpp b/source/simulation2/system/ReplayTurnManager.cpp index c11bf3049a..d5a7884fd8 100644 --- a/source/simulation2/system/ReplayTurnManager.cpp +++ b/source/simulation2/system/ReplayTurnManager.cpp @@ -20,6 +20,7 @@ #include "ReplayTurnManager.h" #include "gui/GUIManager.h" +#include "ps/CLogger.h" #include "ps/Util.h" #include "simulation2/Simulation2.h" diff --git a/source/simulation2/system/TurnManager.cpp b/source/simulation2/system/TurnManager.cpp index 9a518d82c8..d147eb04c3 100644 --- a/source/simulation2/system/TurnManager.cpp +++ b/source/simulation2/system/TurnManager.cpp @@ -22,6 +22,8 @@ #include "gui/GUIManager.h" #include "maths/MathUtil.h" #include "ps/Pyrogenesis.h" +#include "ps/Profile.h" +#include "ps/CLogger.h" #include "ps/Replay.h" #include "ps/Util.h" #include "scriptinterface/ScriptInterface.h" diff --git a/source/soundmanager/scripting/JSInterface_Sound.cpp b/source/soundmanager/scripting/JSInterface_Sound.cpp index c50f996d7f..7c0e4e2512 100644 --- a/source/soundmanager/scripting/JSInterface_Sound.cpp +++ b/source/soundmanager/scripting/JSInterface_Sound.cpp @@ -22,7 +22,6 @@ #include "lib/utf8.h" #include "maths/Vector3D.h" #include "ps/Filesystem.h" -#include "ps/Profile.h" #include "scriptinterface/ScriptInterface.h" #include "soundmanager/SoundManager.h"