Changeset 9591 for code/branches

Timestamp:

Mar 27, 2013, 9:31:41 PM (12 years ago)

Author:

landauf

Message:

removed ContextObject again

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 (deleted)
• ContextObject.h (deleted)

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(CORE_SRC_FILES
   Context.cc
-  ContextObject.cc
   Destroyable.cc
   Listable.cc

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

@@ -33 +33 @@
 
 #include "Context.h"
-#include "core/CoreIncludes.h"
 
 namespace orxonox
 {
-    Context::Context(Context* context) : ContextObject(this), parentContext_(context)
+    Context::Context(Context* context) : parentContext_(context)
     {
-        RegisterRootObject(Context);
     }
 

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

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