[Orxonox-commit 1165] r5886 - code/branches/core5/src/modules/objects/eventsystem

[landauf at orxonox.net]

Author: landauf
Date: 2009-10-06 02:14:46 +0200 (Tue, 06 Oct 2009)
New Revision: 5886

Modified:
   code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc
   code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.h
Log:
forgot some changes in r5882. EventDispatcher now really supports all kinds of objects in the "targets" section.

Modified: code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc
===================================================================
--- code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc	2009-10-05 23:51:56 UTC (rev 5885)
+++ code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc	2009-10-06 00:14:46 UTC (rev 5886)
@@ -31,7 +31,6 @@
 #include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
-#include "EventTarget.h"
 
 namespace orxonox
 {
@@ -45,7 +44,7 @@
     EventDispatcher::~EventDispatcher()
     {
         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();
     }
 
@@ -58,19 +57,19 @@
 
     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)
                 return (*it);

Modified: code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.h
===================================================================
--- code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.h	2009-10-05 23:51:56 UTC (rev 5885)
+++ code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.h	2009-10-06 00:14:46 UTC (rev 5886)
@@ -46,11 +46,11 @@
 
             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_;
     };
 }