Changeset 9562 for code/branches/core6/src/libraries/core/object

Timestamp:

Mar 24, 2013, 4:16:01 PM (11 years ago)

Author:

landauf

Message:

it's probably better to store the context in a seaprate interface instead of adding a constructor argument to OrxonoxClass

Location:

code/branches/core6/src/libraries/core/object

Files:

• CMakeLists.txt (modified) (1 diff)
• Context.cc (modified) (1 diff)
• Context.h (modified) (1 diff)
• ContextObject.cc (added)
• ContextObject.h (added)

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(CORE_SRC_FILES
   Context.cc
+  ContextObject.cc
   MetaObjectList.cc
   ObjectListBase.cc

code/branches/core6/src/libraries/core/object/Context.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    Context::Context(Context* context) : OrxonoxClass(this), parentContext_(context)
+    Context::Context(Context* context) : ContextObject(this), parentContext_(context)
     {
         RegisterRootObject(Context);

code/branches/core6/src/libraries/core/object/Context.h

@@ -37 +37 @@
 #include "core/CorePrereqs.h"
 
-#include "core/OrxonoxClass.h"
+#include "ContextObject.h"
 
 namespace orxonox
 {
-    class _CoreExport Context : virtual public OrxonoxClass
+    class _CoreExport Context : public ContextObject
     {
         public: