Separate event-related stuff from Base

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

diff --git a/source/io/eventdispatcher.h b/source/io/eventdispatcher.h
index 7e89d4739e845f0e0c180845ffedb43184eefd9f..fec8ded63049ba28911b2e92ef6257accec162e0 100644 (file)
--- a/source/io/eventdispatcher.h
+++ b/source/io/eventdispatcher.h
@@ -17,14 +17,14 @@ class EventDispatcher: public sigc::trackable
 private:
        struct Slot
        {
-               Base *obj;
+               EventObject *obj;
                sigc::connection evch_conn;
                sigc::connection del_conn;
 
-               Slot(Base *o): obj(o) { }
+               Slot(EventObject *o): obj(o) { }
        };
 
-       typedef std::map<Base *, Slot> SlotMap;
+       typedef std::map<EventObject *, Slot> SlotMap;
 
        Poller poller;
        SlotMap objects;
@@ -32,8 +32,8 @@ private:
 public:
        EventDispatcher();
 
-       void add(Base &);
-       void remove(Base &);
+       void add(EventObject &);
+       void remove(EventObject &);
 
        /** Checks for and dispatches events.  If there are no events available,
        blocks until there are. */
@@ -44,8 +44,8 @@ public:
        void tick(const Time::TimeDelta &);
 
 private:
-       void object_events_changed(PollEvent, Base *);
-       void object_deleted(Base *);
+       void object_events_changed(PollEvent, EventObject *);
+       void object_deleted(EventObject *);
        void dispatch();
 };