Header cleanup: profile.h is no longer unnecessarily included in scriptinterface.h but rather in the required .cpp files

This was SVN commit r18417.

source/graphics/MapGenerator.cpp

@@ -21,6 +21,7 @@
 
 #include "lib/timer.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 
 
 // TODO: what's a good default? perhaps based on map size

source/graphics/scripting/JSInterface_GameView.cpp

@@ -18,9 +18,11 @@
 #include "precompiled.h"
 
 #include "JSInterface_GameView.h"
+
 #include "graphics/GameView.h"
 #include "ps/Game.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 
 #define IMPLEMENT_BOOLEAN_SCRIPT_SETTING(NAME) \

source/gui/CList.cpp

@@ -23,6 +23,7 @@
 
 #include "lib/external_libraries/libsdl.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 #include "soundmanager/ISoundManager.h"
 
 

source/gui/IGUIObject.cpp

@@ -22,6 +22,7 @@
 #include "gui/scripting/JSInterface_GUITypes.h"
 #include "gui/scripting/JSInterface_IGUIObject.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 
 

source/gui/scripting/ScriptFunctions.cpp

@@ -49,6 +49,7 @@
 #include "ps/Globals.h"	// g_frequencyFilter
 #include "ps/Hotkey.h"
 #include "ps/ProfileViewer.h"
+#include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/Replay.h"
 #include "ps/SavedGame.h"

source/i18n/scripting/JSInterface_L10n.cpp

@@ -21,6 +21,7 @@
 
 #include "i18n/L10n.h"
 #include "lib/utf8.h"
+#include "ps/Profile.h"
 
 // Returns a translation of the specified English string into the current language.
 std::wstring JSI_L10n::Translate(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& sourceString)

source/lobby/scripting/JSInterface_Lobby.cpp

@@ -22,6 +22,7 @@
 #include "gui/GUIManager.h"
 #include "lib/utf8.h"
 #include "lobby/IXmppClient.h"
+#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "third_party/encryption/pkcs5_pbkdf2.h"
 #include "third_party/encryption/sha.h"

source/network/NetServer.cpp

@@ -28,6 +28,7 @@
 #include "lib/external_libraries/enet.h"
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
+#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/ScriptRuntime.h"
 #include "simulation2/Simulation2.h"

source/network/NetSession.cpp

@@ -23,6 +23,7 @@
 #include "NetStats.h"
 #include "lib/external_libraries/enet.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 
 const u32 NETWORK_WARNING_TIMEOUT = 4000;

source/ps/CConsole.cpp

@@ -40,6 +40,7 @@
 #include "ps/Filesystem.h"
 #include "ps/Globals.h"
 #include "ps/Hotkey.h"
+#include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "renderer/Renderer.h"
 #include "scriptinterface/ScriptInterface.h"

source/ps/GameSetup/HWDetect.cpp

@@ -38,6 +38,7 @@
 #include "ps/CLogger.h"
 #include "ps/ConfigDB.h"
 #include "ps/Filesystem.h"
+#include "ps/Profile.h"
 #include "ps/UserReport.h"
 #include "ps/VideoMode.h"
 #include "ps/GameSetup/Config.h"

source/ps/scripting/JSInterface_ConfigDB.cpp

@@ -21,6 +21,7 @@
 
 #include "ps/ConfigDB.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 #include "scriptinterface/ScriptInterface.h"
 
 bool JSI_ConfigDB::GetConfigNamespace(const std::wstring& cfgNsString, EConfigNamespace& cfgNs)

source/ps/scripting/JSInterface_Console.cpp

@@ -21,6 +21,7 @@
 #include "JSInterface_Console.h"
 #include "ps/CConsole.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 
 bool JSI_Console::CheckGlobalInitialized()
 {	

source/ps/scripting/JSInterface_Mod.cpp

@@ -27,6 +27,7 @@
 #include "ps/GameSetup/GameSetup.h"
 #include "ps/GameSetup/Paths.h"
 #include "ps/Mod.h"
+#include "ps/Profile.h"
 #include "ps/scripting/JSInterface_Mod.h"
 
 #include <algorithm>

source/ps/scripting/JSInterface_VisualReplay.cpp

@@ -17,6 +17,7 @@
 
 #include "precompiled.h"
 
+#include "ps/Profile.h"
 #include "ps/VisualReplay.h"
 #include "ps/scripting/JSInterface_VisualReplay.h"
 

source/renderer/scripting/JSInterface_Renderer.cpp

@@ -18,6 +18,7 @@
 #include "precompiled.h"
 
 #include "JSInterface_Renderer.h"
+#include "ps/Profile.h"
 #include "renderer/Renderer.h"
 
 #define IMPLEMENT_BOOLEAN_SCRIPT_SETTING(NAME, SCRIPTNAME) \

source/scriptinterface/NativeWrapperDefns.h

@@ -15,6 +15,7 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ps/GameSetup/Config.h"
+#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

source/scriptinterface/ScriptInterface.h

@@ -26,7 +26,6 @@
 #include "ScriptTypes.h"
 #include "ScriptVal.h"
 #include "ps/Errors.h"
-#include "ps/Profile.h"
 
 ERROR_GROUP(Scripting);
 ERROR_TYPE(Scripting, SetupFailed);

source/simulation2/components/CCmpAIManager.cpp

@@ -28,6 +28,7 @@
 #include "lib/allocators/shared_ptr.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
+#include "ps/Profile.h"
 #include "ps/Util.h"
 #include "simulation2/components/ICmpAIInterface.h"
 #include "simulation2/components/ICmpCommandQueue.h"

source/simulation2/components/CCmpCommandQueue.cpp

@@ -22,6 +22,7 @@
 
 #include "ps/CLogger.h"
 #include "ps/Game.h"
+#include "ps/Profile.h"
 #include "network/NetTurnManager.h"
 
 class CCmpCommandQueue : public ICmpCommandQueue

source/simulation2/components/CCmpDecay.cpp

@@ -26,6 +26,8 @@
 #include "ICmpTerrain.h"
 #include "ICmpVisual.h"
 
+#include "ps/Profile.h"
+
 /**
  * Fairly basic decay implementation, for units and buildings etc.
  * The decaying entity remains stationary for some time period, then falls downwards

source/simulation2/components/CCmpObstructionManager.cpp

@@ -661,6 +661,7 @@ REGISTER_COMPONENT_TYPE(ObstructionManager)
 bool CCmpObstructionManager::TestLine(const IObstructionTestFilter& filter, entity_pos_t x0, entity_pos_t z0, entity_pos_t x1, entity_pos_t z1, entity_pos_t r, bool relaxClearanceForUnits)
 {
 	PROFILE("TestLine");
+	PROFILE2_IFSPIKE("TestLine", 0.001);
 
 	// Check that both end points are within the world (which means the whole line must be)
 	if (!IsInWorld(x0, z0, r) || !IsInWorld(x1, z1, r))
@@ -992,7 +993,7 @@ void CCmpObstructionManager::GetStaticObstructionsInRange(const IObstructionTest
 
 void CCmpObstructionManager::GetUnitsOnObstruction(const ObstructionSquare& square, std::vector<entity_id_t>& out, const IObstructionTestFilter& filter, bool strict)
 {
-	PROFILE3("GetUnitsOnObstruction");
+	PROFILE("GetUnitsOnObstruction");
 
 	// In order to avoid getting units on impassable cells, we want to find all
 	// units s.t. the RasterizeRectWithClearance of the building's shape with the

source/simulation2/components/CCmpOverlayRenderer.cpp

@@ -21,13 +21,14 @@
 #include "ICmpOverlayRenderer.h"
 
 #include "ICmpPosition.h"
+
 #include "simulation2/MessageTypes.h"
 
 #include "graphics/Overlay.h"
 #include "graphics/TextureManager.h"
 #include "renderer/Renderer.h"
-
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 
 class CCmpOverlayRenderer : public ICmpOverlayRenderer
 {

source/simulation2/components/CCmpPosition.cpp

@@ -34,6 +34,7 @@
 #include "maths/Vector3D.h"
 #include "maths/Vector2D.h"
 #include "ps/CLogger.h"
+#include "ps/Profile.h"
 
 /**
  * Basic ICmpPosition implementation.

source/simulation2/components/CCmpRallyPointRenderer.cpp

@@ -34,9 +34,10 @@
 #include "simulation2/helpers/Geometry.h"
 #include "simulation2/system/Component.h"
 
-#include "ps/CLogger.h"
 #include "graphics/Overlay.h"
 #include "graphics/TextureManager.h"
+#include "ps/CLogger.h"
+#include "ps/Profile.h"
 #include "renderer/Renderer.h"
 
 struct SVisibilitySegment

source/simulation2/components/CCmpSelectable.cpp

@@ -27,6 +27,7 @@
 #include "maths/Matrix3D.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector2D.h"
+#include "ps/Profile.h"
 #include "renderer/Scene.h"
 #include "renderer/Renderer.h"
 #include "simulation2/MessageTypes.h"

source/simulation2/components/CCmpTerritoryManager.cpp

@@ -25,6 +25,7 @@
 #include "graphics/TextureManager.h"
 #include "graphics/TerritoryBoundary.h"
 #include "maths/MathUtil.h"
+#include "ps/Profile.h"
 #include "ps/XML/Xeromyces.h"
 #include "renderer/Renderer.h"
 #include "renderer/Scene.h"

source/simulation2/components/CCmpTest.cpp

@@ -23,6 +23,8 @@
 #include "simulation2/scripting/ScriptComponent.h"
 #include "simulation2/MessageTypes.h"
 
+#include "ps/Profile.h"
+
 class CCmpTest1A : public ICmpTest1
 {
 public:

source/simulation2/components/CCmpUnitRenderer.cpp

@@ -35,6 +35,7 @@
 #include "graphics/Unit.h"
 #include "maths/BoundingSphere.h"
 #include "maths/Matrix3D.h"
+#include "ps/Profile.h"
 #include "renderer/Scene.h"
 
 #include "tools/atlas/GameInterface/GameLoop.h"

source/soundmanager/scripting/JSInterface_Sound.cpp

@@ -23,6 +23,7 @@
 #include "lib/utf8.h"
 #include "maths/Vector3D.h"
 #include "ps/Filesystem.h"
+#include "ps/Profile.h"
 #include "soundmanager/SoundManager.h"
 
 #include <sstream>