Changeset 9577 for code/branches/core6

Timestamp:

Mar 25, 2013, 10:20:21 PM (11 years ago)

Author:

landauf

Message:

moved setConfigValues() from OrxonoxClass to Configurable. This new base class it pretty much useless at the moment, but inheriting from it rather than from OrxonoxClass expresses that you're only interested in the config value facilities

Location:

code/branches/core6/src/libraries/core

Files:

• CorePrereqs.h (modified) (1 diff)
• class/CMakeLists.txt (modified) (1 diff)
• class/OrxonoxClass.cc (deleted)
• class/OrxonoxClass.h (modified) (2 diffs)
• config/Configurable.h (added)

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

@@ -140 +140 @@
     class ConfigFileManager;
     class ConfigFileSection;
+    class Configurable;
     class ConfigValueContainer;
     class Context;

code/branches/core6/src/libraries/core/class/CMakeLists.txt

@@ -3 +3 @@
   Identifier.cc
   IdentifierManager.cc
-  OrxonoxClass.cc
 )

code/branches/core6/src/libraries/core/class/OrxonoxClass.h

@@ -43 +43 @@
 #include "core/CorePrereqs.h"
 
-#include "core/object/Listable.h"
+#include "core/config/Configurable.h"
 #include "core/object/Destroyable.h"
 
@@ -49 +49 @@
 {
     /**
-        @brief The class all objects and interfaces of the game-logic (not the engine) are derived from.
+        @brief This is the class from which all objects and interfaces of the game-logic (not the engine) are derived from.
 
         The BaseObject and Interfaces are derived with @c virtual @c public @c OrxonoxClass from OrxonoxClass.
     */
-    class _CoreExport OrxonoxClass : virtual public Listable, virtual public Destroyable
+    class _CoreExport OrxonoxClass : virtual public Configurable, virtual public Destroyable
     {
-        public:
-            OrxonoxClass();
-            virtual ~OrxonoxClass();
-
-            /// Function to collect the SetConfigValue-macro calls.
-            void setConfigValues() {};
     };
 }