Changeset 2908 for code/branches/questsystem5/src/core/Iterator.h

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/core/Iterator.h (modified) (10 diffs)

code/branches/questsystem5/src/core/Iterator.h

@@ -75 +75 @@
                 this->element_ = exp.element_;
                 this->list_ = exp.list_;
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
             }
 
@@ -86 +86 @@
                 this->element_ = other.element_;
                 this->list_ = other.list_;
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
             }
 
@@ -98 +98 @@
                 this->element_ = (element) ? static_cast<ObjectListBaseElement*>(element) : 0;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
             }
 
@@ -110 +110 @@
                 this->element_ = (other.element_) ? static_cast<ObjectListBaseElement*>(other.element_) : 0;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
             }
 
@@ -118 +118 @@
             inline ~Iterator()
             {
-                this->list_->unregisterIterator(this);
+                this->list_->unregisterIterator(this->iterator_);
             }
 
@@ -128 +128 @@
             {
                 if (this->list_)
-                    this->list_->unregisterIterator(this);
+                    this->list_->unregisterIterator(this->iterator_);
 
                 this->element_ = exp.element_;
                 this->list_ = exp.list_;
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
 
                 return (*this);
@@ -144 +144 @@
             {
                 if (this->list_)
-                    this->list_->unregisterIterator(this);
+                    this->list_->unregisterIterator(this->iterator_);
 
                 this->element_ = other.element_;
                 this->list_ = other.list_;
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
 
                 return (*this);
@@ -161 +161 @@
             {
                 if (this->list_)
-                    this->list_->unregisterIterator(this);
+                    this->list_->unregisterIterator(this->iterator_);
 
                 this->element_ = (element) ? static_cast<ObjectListBaseElement*>(element) : 0;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
 
                 return (*this);
@@ -179 +179 @@
             {
                 if (this->list_)
-                    this->list_->unregisterIterator(this);
-
-                this->element_ = (other.element_) ? static_cast<ObjectListBaseElement*>(other.element_) : 0;
+                    this->list_->unregisterIterator(this->iterator_);
+
+                this->element_ = (other.element_) ? (ObjectListBaseElement*)other.element_ : 0;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
-                this->list_->registerIterator(this);
+                this->iterator_ = this->list_->registerIterator(this);
 
                 return (*this);
@@ -300 +300 @@
             ObjectListBaseElement* element_;       //!< The element the Iterator points at
             ObjectListBase* list_;                 //!< The list wherein the element is
+            std::list<void*>::iterator iterator_;  //!< The iterator in the notifying list of the ObjectList
     };