Changeset 9561 for code/branches/core6

Timestamp:

Mar 24, 2013, 2:02:01 PM (11 years ago)

Author:

landauf

Message:

OrxonoxClass now takes a 'Context' object as constructor argument. Not yet enforced nor used

Location:

code/branches/core6/src/libraries/core

Files:

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

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

@@ -141 +141 @@
     class ConfigFileSection;
     class ConfigValueContainer;
+    class Context;
     class Core;
     class DestructionListener;

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

@@ -36 +36 @@
 #include <cassert>
 #include "object/MetaObjectList.h"
+#include "object/Context.h"
 #include "Identifier.h"
 
@@ -43 +44 @@
         @brief Constructor: Sets the default values.
     */
-    OrxonoxClass::OrxonoxClass()
+    OrxonoxClass::OrxonoxClass(Context* context) : context_(context)
     {
+        //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();
+            OrxonoxClass(Context* context = NULL);
             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);
@@ -167 +170 @@
 
             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
   MetaObjectList.cc
   ObjectListBase.cc