Changeset 9599 for code/branches/core6/src/libraries/core/object/IteratorBase.h

Timestamp:

Mar 29, 2013, 2:33:04 PM (11 years ago)

Author:

landauf

Message:

added proper interface (ObjectListElementRemovalListener) to notify iterators about removed elements

File:

• code/branches/core6/src/libraries/core/object/IteratorBase.h (modified) (4 diffs)

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

@@ -47 +47 @@
     */
     template <class T, class I>
-    class IteratorBase
+    class IteratorBase : public ObjectListElementRemovalListener
     {
         public:
@@ -169 +169 @@
 
             /**
-                @brief Increments the Iterator if it points at the given object.
+                @brief Increments the Iterator if it points at the given element.
                 @param object The object to compare with
             */
-            inline void incrementIfEqual(Listable* object)
-            {
-                if (this->element_ && this->element_->objectBase_ == object)
+            virtual void removedElement(ObjectListBaseElement* element)
+            {
+                if (this->element_ == element)
                     this->operator++();
             }
@@ -194 +194 @@
                 {
                     this->list_ = this->element_->list_;
-                    this->list_->registerIterator(this);
+                    this->list_->registerRemovalListener(this);
                 }
                 else
@@ -206 +206 @@
             {
                 if (this->list_)
-                    this->list_->unregisterIterator(this);
+                    this->list_->unregisterRemovalListener(this);
             }