Changeset 852 for code/branches/core/src/orxonox/objects

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/orxonox/objects

Files:

• Test.h (modified) (1 diff)
• Tickable.cc (added)
• Tickable.h (modified) (2 diffs)
• WorldEntity.h (modified) (1 diff)
• test1.cc (modified) (1 diff)
• test2.cc (modified) (1 diff)
• test3.cc (modified) (1 diff)
• test3.h (modified) (1 diff)
• weapon/AmmunitionDump.h (modified) (1 diff)
• weapon/BulletManager.h (modified) (1 diff)

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"