Changeset 9572 for code/branches/core6/src/libraries/core/class/Identifier.h

Timestamp:

Mar 24, 2013, 10:30:39 PM (11 years ago)

Author:

landauf

Message:

moved meta-object-list from Identifiable to Listable, a new base class for objects with objectlists (yep)

File:

• code/branches/core6/src/libraries/core/class/Identifier.h (modified) (3 diffs)

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

@@ -288 +288 @@
 
             bool initialiseObject(T* object, const std::string& className, bool bRootClass);
+
+            void addObjectToList(T* object, Listable*);
+            void addObjectToList(T* object, Identifiable*);
 
             void updateConfigValues(bool updateChildren = true) const;
@@ -392 +395 @@
         else
         {
-            orxout(verbose, context::object_list) << "Added object to " << this->getName() << "-list." << endl;
-            object->metaList_->add(this->objects_, this->objects_->add(new ObjectListElement<T>(object)));
+            this->addObjectToList(object, object);
 
             // Add pointer of type T to the map in the Identifiable instance that enables "dynamic_casts"
@@ -399 +401 @@
             return false;
         }
+    }
+
+    /**
+     * @brief Only adds the object to the object list if is a @ref Listable
+     */
+    template <class T>
+    void ClassIdentifier<T>::addObjectToList(T* object, Listable*)
+    {
+        orxout(verbose, context::object_list) << "Added object to " << this->getName() << "-list." << endl;
+        object->metaList_->add(this->objects_, this->objects_->add(new ObjectListElement<T>(object)));
+    }
+
+    template <class T>
+    void ClassIdentifier<T>::addObjectToList(T*, Identifiable*)
+    {
+        // no action
     }