[Orxonox-commit 4898] r9567 - in code/branches/core6/src: libraries/core libraries/core/class libraries/core/command modules/notifications modules/weapons/projectiles orxonox/controllers orxonox/gamestates

[landauf at orxonox.net]

Author: landauf
Date: 2013-03-24 19:18:06 +0100 (Sun, 24 Mar 2013)
New Revision: 9567

Modified:
   code/branches/core6/src/libraries/core/CoreIncludes.h
   code/branches/core6/src/libraries/core/GUIManager.h
   code/branches/core6/src/libraries/core/class/Identifiable.cc
   code/branches/core6/src/libraries/core/command/Shell.h
   code/branches/core6/src/modules/notifications/NotificationManager.h
   code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc
   code/branches/core6/src/orxonox/controllers/FormationController.h
   code/branches/core6/src/orxonox/gamestates/GSLevel.h
Log:
details

Modified: code/branches/core6/src/libraries/core/CoreIncludes.h
===================================================================
--- code/branches/core6/src/libraries/core/CoreIncludes.h	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/libraries/core/CoreIncludes.h	2013-03-24 18:18:06 UTC (rev 9567)
@@ -164,9 +164,9 @@
 
     /**
         @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>
     inline Identifier* ClassByObjectType(const T*)

Modified: code/branches/core6/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/core6/src/libraries/core/GUIManager.h	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/libraries/core/GUIManager.h	2013-03-24 18:18:06 UTC (rev 9567)
@@ -48,7 +48,6 @@
 #include "util/tribool.h"
 #include "util/Singleton.h"
 #include "input/InputHandler.h"
-#include "class/OrxonoxClass.h"
 #include "WindowEventListener.h"
 
 #if CEGUI_VERSION_MAJOR < 1 && CEGUI_VERSION_MINOR < 7

Modified: code/branches/core6/src/libraries/core/class/Identifiable.cc
===================================================================
--- code/branches/core6/src/libraries/core/class/Identifiable.cc	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/libraries/core/class/Identifiable.cc	2013-03-24 18:18:06 UTC (rev 9567)
@@ -28,7 +28,7 @@
 
 /**
     @file
-    @brief Implementation of OrxonoxClass.
+    @brief Implementation of Identifiable.
 */
 
 #include "Identifiable.h"

Modified: code/branches/core6/src/libraries/core/command/Shell.h
===================================================================
--- code/branches/core6/src/libraries/core/command/Shell.h	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/libraries/core/command/Shell.h	2013-03-24 18:18:06 UTC (rev 9567)
@@ -199,7 +199,7 @@
             unsigned int              maxHistoryLength_;    ///< The maximum number of saved commands
             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
     };
 }
 

Modified: code/branches/core6/src/modules/notifications/NotificationManager.h
===================================================================
--- code/branches/core6/src/modules/notifications/NotificationManager.h	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/modules/notifications/NotificationManager.h	2013-03-24 18:18:06 UTC (rev 9567)
@@ -41,7 +41,6 @@
 #include <map>
 #include <string>
 
-#include "core/class/OrxonoxClass.h"
 #include "util/Singleton.h"
 #include "interfaces/NotificationListener.h"
 

Modified: code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc
===================================================================
--- code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/modules/weapons/projectiles/BasicProjectile.cc	2013-03-24 18:18:06 UTC (rev 9567)
@@ -45,7 +45,7 @@
     @brief
         Constructor. Registers the object and initializes some default values.
     */
-    BasicProjectile::BasicProjectile() : OrxonoxClass()
+    BasicProjectile::BasicProjectile()
     {
         RegisterRootObject(BasicProjectile);// Register the BasicProjectile class to the core
 

Modified: code/branches/core6/src/orxonox/controllers/FormationController.h
===================================================================
--- code/branches/core6/src/orxonox/controllers/FormationController.h	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/orxonox/controllers/FormationController.h	2013-03-24 18:18:06 UTC (rev 9567)
@@ -35,7 +35,6 @@
 #include "core/class/Super.h"
 
 #include "util/Math.h"
-#include "core/class/OrxonoxClass.h"
 #include "controllers/Controller.h"
 #include "worldentities/ControllableEntity.h"
 

Modified: code/branches/core6/src/orxonox/gamestates/GSLevel.h
===================================================================
--- code/branches/core6/src/orxonox/gamestates/GSLevel.h	2013-03-24 17:37:06 UTC (rev 9566)
+++ code/branches/core6/src/orxonox/gamestates/GSLevel.h	2013-03-24 18:18:06 UTC (rev 9567)
@@ -33,7 +33,6 @@
 
 #include <string>
 #include <set>
-#include "core/class/OrxonoxClass.h"
 #include "core/GameState.h"
 
 namespace orxonox