Changeset 9567 for code/branches/core6

Timestamp:

Mar 24, 2013, 7:18:06 PM (11 years ago)

Author:

landauf

Message:

details

Location:

code/branches/core6/src

Files:

• libraries/core/CoreIncludes.h (modified) (1 diff)
• libraries/core/GUIManager.h (modified) (1 diff)
• libraries/core/class/Identifiable.cc (modified) (1 diff)
• libraries/core/command/Shell.h (modified) (1 diff)
• modules/notifications/NotificationManager.h (modified) (1 diff)
• modules/weapons/projectiles/BasicProjectile.cc (modified) (1 diff)
• orxonox/controllers/FormationController.h (modified) (1 diff)
• orxonox/gamestates/GSLevel.h (modified) (1 diff)

code/branches/core6/src/libraries/core/CoreIncludes.h

@@ -165 +165 @@
     /**
         @brief Returns the Identifier with a given 'this' pointer.
-        @note This of course only works with OrxonoxClasses.
+        @note This of course only works with Identifiables.
               The only use is in conjunction with macros that don't know the class type.
-        @param object Pointer to an OrxonoxClass
+        @param object Pointer to an Identifiable
     */
     template <class T>

code/branches/core6/src/libraries/core/GUIManager.h

@@ -49 +49 @@
 #include "util/Singleton.h"
 #include "input/InputHandler.h"
-#include "class/OrxonoxClass.h"
 #include "WindowEventListener.h"
 

code/branches/core6/src/libraries/core/class/Identifiable.cc

@@ -29 +29 @@
 /**
     @file
-    @brief Implementation of OrxonoxClass.
+    @brief Implementation of Identifiable.
 */
 

code/branches/core6/src/libraries/core/command/Shell.h

@@ -200 +200 @@
             unsigned int              historyOffset_;       ///< The command history is a circular buffer, this variable defines the current write-offset
             std::vector<std::string>  commandHistory_;      ///< The history of commands that were entered by the user
-            static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is no OrxonoxClass
+            static unsigned int       cacheSize_s;          ///< The maximum cache size of the CommandExecutor - this is stored here for better readability of the config file and because CommandExecutor is not configurable
     };
 }

code/branches/core6/src/modules/notifications/NotificationManager.h

@@ -42 +42 @@
 #include <string>
 
-#include "core/class/OrxonoxClass.h"
 #include "util/Singleton.h"
 #include "interfaces/NotificationListener.h"

code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -46 +46 @@
         Constructor. Registers the object and initializes some default values.
     */
-    BasicProjectile::BasicProjectile() : OrxonoxClass()
+    BasicProjectile::BasicProjectile()
     {
         RegisterRootObject(BasicProjectile);// Register the BasicProjectile class to the core

code/branches/core6/src/orxonox/controllers/FormationController.h

@@ -36 +36 @@
 
 #include "util/Math.h"
-#include "core/class/OrxonoxClass.h"
 #include "controllers/Controller.h"
 #include "worldentities/ControllableEntity.h"

code/branches/core6/src/orxonox/gamestates/GSLevel.h

@@ -34 +34 @@
 #include <string>
 #include <set>
-#include "core/class/OrxonoxClass.h"
 #include "core/GameState.h"