Changeset 9597 for code/branches/core6

Timestamp:

Mar 29, 2013, 11:44:22 AM (12 years ago)

Author:

landauf

Message:

removed MetaObjectList. replaced it by std::vector because object list elements can now remove themselves from their lists.

Location:

code/branches/core6/src/libraries/core

Files:

• CorePrereqs.h (modified) (1 diff)
• class/Identifier.h (modified) (2 diffs)
• object/CMakeLists.txt (modified) (1 diff)
• object/Listable.cc (modified) (2 diffs)
• object/Listable.h (modified) (3 diffs)
• object/MetaObjectList.cc (deleted)
• object/MetaObjectList.h (deleted)
• object/ObjectListBase.cc (modified) (2 diffs)
• object/ObjectListBase.h (modified) (1 diff)

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

@@ -167 +167 @@
     class MemoryArchive;
     class MemoryArchiveFactory;
-    class MetaObjectList;
-    class MetaObjectListElement;
     class Namespace;
     class NamespaceNode;

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

@@ -90 +90 @@
 
 #include "util/Output.h"
-#include "core/object/MetaObjectList.h"
 #include "core/object/ObjectList.h"
 #include "core/object/ObjectListBase.h"
@@ -428 +427 @@
     {
         orxout(verbose, context::object_list) << "Added object to " << this->getName() << "-list." << endl;
-        object->metaList_->add(this->objects_, this->objects_->add(object));
+        object->elements_.push_back(this->objects_->add(object));
     }
 

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

@@ -3 +3 @@
   Destroyable.cc
   Listable.cc
-  MetaObjectList.cc
   ObjectListBase.cc
 )

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

@@ -33 +33 @@
 
 #include "Listable.h"
-
-#include "core/object/MetaObjectList.h"
+#include "ObjectListBase.h"
 
 namespace orxonox
 {
     /**
-        @brief Constructor: creates the meta-object-list.
+        @brief Constructor: Allocates space in the element list.
     */
     Listable::Listable()
     {
-        this->metaList_ = new MetaObjectList();
+        this->elements_.reserve(6);
     }
 
@@ -59 +58 @@
     void Listable::unregisterObject()
     {
-        if (this->metaList_)
-            delete this->metaList_;
-        this->metaList_ = 0;
+        for (size_t i = 0; i < this->elements_.size(); ++i)
+            delete this->elements_[i];
+        this->elements_.clear();
     }
 }

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

@@ -37 +37 @@
 
 #include "core/CorePrereqs.h"
+
+#include <vector>
+
 #include "core/class/Identifiable.h"
 
@@ -42 +45 @@
 {
     /**
-        @brief Listable stores the MetaObjectList which is used when storing instances in object lists.
+        @brief Listable stores the entries of all object lists pointing to this instance.
     */
     class _CoreExport Listable : virtual public Identifiable
@@ -56 +59 @@
 
         private:
-            MetaObjectList* metaList_; //!< MetaObjectList, containing all ObjectLists and ObjectListElements the object is registered in
+            std::vector<ObjectListBaseElement*> elements_; //!< The corresponding ObjectListElements in all object lists the object is registered in
     };
 }

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

@@ -84 +84 @@
         @brief Adds a new object to the end of the list.
         @param element The element to add
-        @return The pointer to the new ObjectListBaseElement, needed by the MetaObjectList of the added object
     */
-    ObjectListBaseElement* ObjectListBase::addElement(ObjectListBaseElement* element)
+    void ObjectListBase::addElement(ObjectListBaseElement* element)
     {
         if (!this->last_)
@@ -102 +101 @@
             temp->next_ = this->last_;
         }
-
-        return this->last_;
     }
 
+    /**
+     * @brief Removes the element from the list
+     */
     void ObjectListBase::removeElement(ObjectListBaseElement* element)
     {

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

@@ -101 +101 @@
             template <class T>
             inline ObjectListBaseElement* add(T* object)
-                { return this->addElement(new ObjectListElement<T>(object, this)); }
+            {
+                ObjectListBaseElement* element = new ObjectListElement<T>(object, this);
+                this->addElement(element);
+                return element;
+            }
 
-            ObjectListBaseElement* addElement(ObjectListBaseElement* element);
+            void addElement(ObjectListBaseElement* element);
             void removeElement(ObjectListBaseElement* element);