Changeset 5886 for code/branches/core5

Timestamp:

Oct 6, 2009, 2:14:46 AM (15 years ago)

Author:

landauf

Message:

forgot some changes in r5882. EventDispatcher now really supports all kinds of objects in the "targets" section.

Location:

code/branches/core5/src/modules/objects/eventsystem

Files:

• EventDispatcher.cc (modified) (3 diffs)
• EventDispatcher.h (modified) (1 diff)

code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc

@@ -32 +32 @@
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
-#include "EventTarget.h"
 
 namespace orxonox
@@ -46 +45 @@
     {
         if (this->isInitialized())
-            for (std::list<EventTarget*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
+            for (std::list<BaseObject*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
                 (*it)->destroy();
     }
@@ -59 +58 @@
     void EventDispatcher::processEvent(Event& event)
     {
-        for (std::list<EventTarget*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
+        for (std::list<BaseObject*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
             (*it)->processEvent(event);
     }
 
-    void EventDispatcher::addTarget(EventTarget* target)
+    void EventDispatcher::addTarget(BaseObject* target)
     {
         this->targets_.push_back(target);
     }
 
-    EventTarget* EventDispatcher::getTarget(unsigned int index) const
+    BaseObject* EventDispatcher::getTarget(unsigned int index) const
     {
         unsigned int i = 0;
-        for (std::list<EventTarget*>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
+        for (std::list<BaseObject*>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); ++it)
         {
             if (i == index)

code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.h

@@ -47 +47 @@
             virtual void processEvent(Event& event);
 
-            void addTarget(EventTarget* target);
-            EventTarget* getTarget(unsigned int index) const;
+            void addTarget(BaseObject* target);
+            BaseObject* getTarget(unsigned int index) const;
 
         private:
-            std::list<EventTarget*> targets_;
+            std::list<BaseObject*> targets_;
     };
 }