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

Timestamp:

Mar 24, 2013, 4:16:01 PM (12 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

Files:

• OrxonoxClass.cc (modified) (1 diff)
• OrxonoxClass.h (modified) (3 diffs)
• object/CMakeLists.txt (modified) (1 diff)
• object/Context.cc (modified) (1 diff)
• object/Context.h (modified) (1 diff)
• object/ContextObject.cc (added)
• object/ContextObject.h (added)

code/branches/core6/src/libraries/core/OrxonoxClass.cc

@@ -44 +44 @@
         @brief Constructor: Sets the default values.
     */
-    OrxonoxClass::OrxonoxClass(Context* context) : context_(context)
+    OrxonoxClass::OrxonoxClass()
     {
-        //assert(context);
-        if (!this->context_)
-            this->context_ = Context::getRootContext();
-
         this->identifier_ = 0;
         this->parents_ = 0;

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

@@ -70 +70 @@
 
         public:
-            OrxonoxClass(Context* context = NULL);
+            OrxonoxClass();
             virtual ~OrxonoxClass();
 
@@ -81 +81 @@
             /// Returns the Identifier of the object.
             inline Identifier* getIdentifier() const { return this->identifier_; }
-
-            /// Returns the object's Context.
-            inline Context* getContext() const { return this->context_; }
 
             bool isA(const Identifier* identifier);
@@ -170 +167 @@
 
             Identifier* identifier_;                                //!< The Identifier of the object
-            Context* context_;                                      //!< The object's context
             std::set<const Identifier*>* parents_;                  //!< List of all parents of the object
             MetaObjectList* metaList_;                              //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in

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: