Changeset 852

Timestamp:

Mar 5, 2008, 12:19:05 PM (17 years ago)

Author:

landauf

Message:

removed some includes of CoreIncludes.h from other .h files (included in .cc only)

Location:

code/branches/core/src

Files:

• network/Synchronisable.h (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• orxonox/core/BaseObject.cc (modified) (1 diff)
• orxonox/core/BaseObject.h (modified) (1 diff)
• orxonox/core/DebugLevel.cc (modified) (1 diff)
• orxonox/core/DebugLevel.h (modified) (1 diff)
• orxonox/core/Loader.cc (modified) (1 diff)
• orxonox/objects/Test.h (modified) (1 diff)
• orxonox/objects/Tickable.cc (added)
• orxonox/objects/Tickable.h (modified) (2 diffs)
• orxonox/objects/WorldEntity.h (modified) (1 diff)
• orxonox/objects/test1.cc (modified) (1 diff)
• orxonox/objects/test2.cc (modified) (1 diff)
• orxonox/objects/test3.cc (modified) (1 diff)
• orxonox/objects/test3.h (modified) (1 diff)
• orxonox/objects/weapon/AmmunitionDump.h (modified) (1 diff)
• orxonox/objects/weapon/BulletManager.h (modified) (1 diff)
• orxonox/tools/BillboardSet.h (modified) (1 diff)
• orxonox/tools/Timer.cc (added)
• orxonox/tools/Timer.h (modified) (2 diffs)

code/branches/core/src/network/Synchronisable.h

@@ -16 +16 @@
 
 #include "NetworkPrereqs.h"
-#include "core/CoreIncludes.h"
 
 namespace network

code/branches/core/src/orxonox/CMakeLists.txt

@@ -3 +3 @@
   Main.cc
   Orxonox.cc
+  objects/Tickable.cc
 #  SpaceshipSteering.cc
 #  hud/HUD.cc
@@ -9 +10 @@
 #  tools/Light.cc
   tools/Mesh.cc
+  tools/Timer.cc
 #  objects/Ambient.cc
 #  objects/Camera.cc

code/branches/core/src/orxonox/Orxonox.cc

@@ -54 +54 @@
 //***** ORXONOX ****
 //misc
+#include "core/CoreIncludes.h"
 #include "util/Sleep.h"
 

code/branches/core/src/orxonox/OrxonoxStableHeaders.h

@@ -73 +73 @@
 //#include "audio/AudioManager.h"
 
-#include "core/CoreIncludes.h"
+//#include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
 //#include "core/ArgReader.h"

code/branches/core/src/orxonox/core/BaseObject.cc

@@ -33 +33 @@
 #include "util/tinyxml/tinyxml.h"
 
+#include "core/CoreIncludes.h"
 #include "BaseObject.h"
 #include "XMLPort.h"

code/branches/core/src/orxonox/core/BaseObject.h

@@ -39 +39 @@
 #include "util/XMLIncludes.h"
 
-#include "CoreIncludes.h"
+#include "OrxonoxClass.h"
 
 namespace orxonox

code/branches/core/src/orxonox/core/DebugLevel.cc

@@ -32 +32 @@
 
 #include "DebugLevel.h"
+#include "CoreIncludes.h"
 
 namespace orxonox

code/branches/core/src/orxonox/core/DebugLevel.h

@@ -41 +41 @@
 #include "OrxonoxClass.h"
 #include "OutputHandler.h"
-#include "CoreIncludes.h"
 
 namespace orxonox

code/branches/core/src/orxonox/core/Loader.cc

@@ -32 +32 @@
 #include "Iterator.h"
 #include "Debug.h"
+#include "CoreIncludes.h"
 
-//#define TIXML_USE_TICPP
 #include "util/tinyxml/ticpp.h"
 

code/branches/core/src/orxonox/objects/Test.h

@@ -30 +30 @@
 
 #include "core/BaseObject.h"
-#include "../core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core/src/orxonox/objects/Tickable.h

@@ -45 +45 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "../core/CoreIncludes.h"
-
 namespace orxonox
 {
@@ -62 +60 @@
 
         protected:
-            /**
-                @brief Constructor: Registers the object in the Tickable-list
-            */
-            Tickable() { RegisterRootObject(Tickable); }
+            Tickable();
     };
 

code/branches/core/src/orxonox/objects/WorldEntity.h

@@ -11 +11 @@
 #include "network/Synchronisable.h"
 //#include "util/tinyxml/tinyxml.h"
-#include "../core/CoreIncludes.h"
 #include "core/BaseObject.h"
 #include "Tickable.h"

code/branches/core/src/orxonox/objects/test1.cc

@@ -29 +29 @@
 #include "test2.h"
 #include "test3.h"
-#include "util/tinyxml/tinyxml.h"
-#include "../Orxonox.h"
-#include <OgreSceneManager.h>
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core/src/orxonox/objects/test2.cc

@@ -29 +29 @@
 #include "test2.h"
 #include "test3.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core/src/orxonox/objects/test3.cc

@@ -29 +29 @@
 #include "test2.h"
 #include "test3.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/core/src/orxonox/objects/test3.h

@@ -3 +3 @@
 
 #include "core/BaseObject.h"
+#include "util/Math.h"
 
 namespace orxonox

code/branches/core/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -37 +37 @@
 
 #include "network/Synchronisable.h"
-//#include "../core/CoreIncludes.h"
 #include "core/BaseObject.h"
 

code/branches/core/src/orxonox/objects/weapon/BulletManager.h

@@ -38 +38 @@
 #include "network/Synchronisable.h"
 #include "util/tinyxml/tinyxml.h"
-#include "../../core/CoreIncludes.h"
 #include "core/BaseObject.h"
 #include "../Tickable.h"

code/branches/core/src/orxonox/tools/BillboardSet.h

@@ -7 +7 @@
 
 #include "../OrxonoxPrereqs.h"
-
-#include "../core/CoreIncludes.h"
 #include "util/Math.h"
 

code/branches/core/src/orxonox/tools/Timer.h

@@ -59 +59 @@
 
 #include <OgreFrameListener.h>
-
 #include "../OrxonoxPrereqs.h"
-
-#include "../core/CoreIncludes.h"
 
 namespace orxonox
@@ -72 +69 @@
 
         public:
-            /** @brief Constructor: Sets the default-values. */
-            TimerBase()
-            {
-                RegisterRootObject(TimerBase);
-
-                this->interval_ = 0;
-                this->bLoop_ = false;
-                this->bActive_ = false;
-
-                this->time_ = 0;
-            }
+            TimerBase();
 
             virtual void run() const = 0;