summaryrefslogtreecommitdiffstats
path: root/client/x11/events_loop_p.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'client/x11/events_loop_p.cpp')
-rw-r--r--client/x11/events_loop_p.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/client/x11/events_loop_p.cpp b/client/x11/events_loop_p.cpp
index 4db1469c..a1c450b5 100644
--- a/client/x11/events_loop_p.cpp
+++ b/client/x11/events_loop_p.cpp
@@ -38,7 +38,7 @@
class EventWrapper {
public:
- EventWrapper(EventsLoop& owner, EventSource& event)
+ EventWrapper(EventsLoop& owner, EventSourceOld& event)
: _owner (owner)
, _event (&event)
, _refs (1)
@@ -59,7 +59,7 @@ public:
}
}
- EventSource* get_event()
+ EventSourceOld* get_event()
{
return _event;
}
@@ -71,7 +71,7 @@ public:
private:
EventsLoop& _owner;
- EventSource* _event;
+ EventSourceOld* _event;
int _refs;
};
@@ -116,7 +116,7 @@ void EventsLoop::run_once(int timeout_milli)
}
for (int i = 0; i < num_events; i++) {
EventWrapper* wrapper;
- EventSource* event;
+ EventSourceOld* event;
wrapper = (EventWrapper *)events[i].data.ptr;
if ((event = wrapper->get_event())) {
@@ -218,7 +218,7 @@ void EventsLoop::Trigger::trigger()
}
}
-bool Trigger_p::reset_event()
+bool EventsLoop_p::Trigger_p::reset_event()
{
Lock lock(_lock);
if (!_pending_int) {
@@ -287,7 +287,7 @@ void EventsLoop::add_socket(Socket& socket)
_events.push_back(wrapper);
}
-static bool remove_event(EventsLoop_p::Events& events, EventSource& event)
+static bool remove_event(EventsLoop_p::Events& events, EventSourceOld& event)
{
EventsLoop_p::Events::iterator iter = events.begin();
for (;; iter++) {