Clean up after the timedelta.h/units.h merge

[libs/core.git] / source / io / eventdispatcher.cpp

diff --git a/source/io/eventdispatcher.cpp b/source/io/eventdispatcher.cpp
index 06a594f76d397165789940184f7c1a8d0ab65771..3a3baa673d1c08a4412f9a875af1a6cd086f1583 100644 (file)
--- a/source/io/eventdispatcher.cpp
+++ b/source/io/eventdispatcher.cpp
@@ -1,6 +1,6 @@
-#include <msp/time/units.h>
 #include "base.h"
 #include "eventdispatcher.h"
+#include "eventobject.h"
 #include "poll.h"
 
 namespace Msp {
@@ -9,7 +9,7 @@ namespace IO {
 EventDispatcher::EventDispatcher()
 { }
 
-void EventDispatcher::add(Base &obj)
+void EventDispatcher::add(EventObject &obj)
 {
        SlotMap::iterator i = objects.find(&obj);
        if(i==objects.end())
@@ -23,7 +23,7 @@ void EventDispatcher::add(Base &obj)
        }
 }
 
-void EventDispatcher::remove(Base &obj)
+void EventDispatcher::remove(EventObject &obj)
 {
        SlotMap::iterator i = objects.find(&obj);
        if(i!=objects.end())
@@ -54,20 +54,20 @@ void EventDispatcher::tick(const Time::TimeDelta &dt)
                dispatch();
 }
 
-void EventDispatcher::object_events_changed(PollEvent ev, Base *obj)
+void EventDispatcher::object_events_changed(PollEvent ev, EventObject *obj)
 {
        poller.set_object(*obj, ev);
 }
 
-void EventDispatcher::object_deleted(Base *obj)
+void EventDispatcher::object_deleted(EventObject *obj)
 {
        remove(*obj);
 }
 
 void EventDispatcher::dispatch()
 {
-       const Poller::SlotSeq &result = poller.get_result();
-       for(Poller::SlotSeq::const_iterator i=result.begin(); i!=result.end(); ++i)
+       const Poller::SlotList &result = poller.get_result();
+       for(Poller::SlotList::const_iterator i=result.begin(); i!=result.end(); ++i)
                i->object->event(i->events);
 }