Changeset 9593 for code/branches/core6/src/libraries/core/object/MetaObjectList.cc

Timestamp:

Mar 27, 2013, 11:17:45 PM (11 years ago)

Author:

landauf

Message:

moved logic to remove an element from an ObjectListBase from MetaObjectList to ObjectListBase

File:

• code/branches/core6/src/libraries/core/object/MetaObjectList.cc (modified) (1 diff)

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

@@ -48 +48 @@
     MetaObjectListElement::~MetaObjectListElement()
     {
-        orxout(verbose, context::object_list) << "Removing Object from " << this->list_->getIdentifier()->getName() << "-list." << endl;
-        this->list_->notifyIterators(this->element_->objectBase_);
-
-        if (this->element_->next_)
-            this->element_->next_->prev_ = this->element_->prev_;
-        else
-            this->list_->last_ = this->element_->prev_; // If there is no next_, we deleted the last object and have to update the last_ pointer of the list
-
-        if (this->element_->prev_)
-            this->element_->prev_->next_ = this->element_->next_;
-        else
-            this->list_->first_ = this->element_->next_; // If there is no prev_, we deleted the first object and have to update the first_ pointer of the list
-
+        this->list_->removeElement(this->element_);
         delete this->element_;
     }