Changeset 9579

Timestamp:

Mar 25, 2013, 11:39:50 PM (12 years ago)

Author:

landauf

Message:

cleaned up some includes

Location:

code/branches/core6/src

Files:

• libraries/network/WANDiscoverable.h (modified) (1 diff)
• libraries/network/WANDiscovery.h (modified) (1 diff)
• libraries/network/packet/Gamestate.cc (modified) (1 diff)
• libraries/network/synchronisable/Serialise.h (modified) (1 diff)
• libraries/network/synchronisable/Synchronisable.h (modified) (1 diff)
• modules/designtools/ScreenshotManager.cc (modified) (1 diff)
• modules/docking/Dock.h (modified) (1 diff)
• modules/docking/DockingAnimation.cc (modified) (1 diff)
• modules/docking/DockingAnimation.h (modified) (1 diff)
• modules/docking/DockingController.cc (modified) (1 diff)
• modules/docking/DockingEffect.cc (modified) (1 diff)
• modules/docking/DockingEffect.h (modified) (1 diff)
• modules/docking/DockingPrecompiledHeaders.h (modified) (1 diff)
• modules/docking/DockingTarget.cc (modified) (1 diff)
• modules/docking/MoveToDockingTarget.cc (modified) (1 diff)
• modules/objects/SpaceBoundaries.h (modified) (1 diff)
• modules/pong/PongAI.h (modified) (1 diff)
• modules/towerdefense/TowerDefense.cc (modified) (1 diff)

code/branches/core6/src/libraries/network/WANDiscoverable.h

@@ -31 +31 @@
 #include "NetworkPrereqs.h"
 #include "core/class/OrxonoxClass.h"
-#include "core/CoreIncludes.h"
 #include "MasterServerComm.h"
 

code/branches/core6/src/libraries/network/WANDiscovery.h

@@ -31 +31 @@
 #include "NetworkPrereqs.h"
 #include "packet/ServerInformation.h"
-#include "core/CoreIncludes.h"
 #include "core/config/Configurable.h"
 #include "core/config/ConfigValueIncludes.h"

code/branches/core6/src/libraries/network/packet/Gamestate.cc

@@ -33 +33 @@
 #include "util/Output.h"
 #include "util/OrxAssert.h"
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
 #include "core/object/ObjectList.h"

code/branches/core6/src/libraries/network/synchronisable/Serialise.h

@@ -41 +41 @@
 #include "util/Serialise.h"
 #include "core/CorePrereqs.h"
-#include "core/CoreIncludes.h"
-#include "core/BaseObject.h" // remove this if circular dependencies in BaseObject/SmartPtr are fixed
-//#include "core/SmartPtr.h"
 
 namespace orxonox{

code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h

@@ -40 +40 @@
 
 #include "util/mbool.h"
+#include "util/Output.h"
 #include "core/class/OrxonoxClass.h"
 #include "SynchronisableVariable.h"

code/branches/core6/src/modules/designtools/ScreenshotManager.cc

@@ -42 +42 @@
 #include <OgreViewport.h>
 
+#include "core/CoreIncludes.h"
 #include "core/config/ConfigValueIncludes.h"
 #include "core/GraphicsManager.h"

code/branches/core6/src/modules/docking/Dock.h

@@ -40 +40 @@
 #include <set>
 
-#include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"

code/branches/core6/src/modules/docking/DockingAnimation.cc

@@ -35 +35 @@
 
 #include "DockingEffect.h"  // For DockingEffect::findTarget
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core6/src/modules/docking/DockingAnimation.h

@@ -36 +36 @@
 #define _DockingAnimation_H__
 
-#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 

code/branches/core6/src/modules/docking/DockingController.cc

@@ -34 +34 @@
 #include "worldentities/ControllableEntity.h"
 #include "Dock.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core6/src/modules/docking/DockingEffect.cc

@@ -33 +33 @@
 
 #include "DockingEffect.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core6/src/modules/docking/DockingEffect.h

@@ -36 +36 @@
 #define _DockingEffect_H__
 
-#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 

code/branches/core6/src/modules/docking/DockingPrecompiledHeaders.h

@@ -45 +45 @@
 
 #include "core/BaseObject.h"
-#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 

code/branches/core6/src/modules/docking/DockingTarget.cc

@@ -33 +33 @@
 
 #include "DockingTarget.h"
+#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 

code/branches/core6/src/modules/docking/MoveToDockingTarget.cc

@@ -36 +36 @@
 
 #include "core/XMLPort.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core6/src/modules/objects/SpaceBoundaries.h

@@ -36 +36 @@
 #include <vector>
 
-#include "core/CoreIncludes.h"
 #include "core/object/WeakPtr.h"
 

code/branches/core6/src/modules/pong/PongAI.h

@@ -44 +44 @@
 
 #include "controllers/Controller.h"
+#include "PongBall.h"
 
 namespace orxonox

code/branches/core6/src/modules/towerdefense/TowerDefense.cc

@@ -87 +87 @@
 
 #include "chat/ChatManager.h"
+#include "core/CoreIncludes.h"
 
 /* Part of a temporary hack to allow the player to add towers */