summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-07-20 22:22:48 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-07-20 22:22:48 (GMT)
commitcc03d5aab20bde58d700b329f5fa7388698d9e68 (patch)
treee273fec9699420a823ede200a07f288b53eb85db /Swiften/EventLoop
parent1b73d4228fc3269284427ed574b9f35775315488 (diff)
downloadswift-contrib-cc03d5aab20bde58d700b329f5fa7388698d9e68.zip
swift-contrib-cc03d5aab20bde58d700b329f5fa7388698d9e68.tar.bz2
Separated Event out of EventLoop.
Diffstat (limited to 'Swiften/EventLoop')
-rw-r--r--Swiften/EventLoop/Event.h22
-rw-r--r--Swiften/EventLoop/EventLoop.h16
2 files changed, 24 insertions, 14 deletions
diff --git a/Swiften/EventLoop/Event.h b/Swiften/EventLoop/Event.h
new file mode 100644
index 0000000..edd35f4
--- /dev/null
+++ b/Swiften/EventLoop/Event.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+
+#include "Swiften/EventLoop/EventOwner.h"
+
+namespace Swift {
+ struct Event {
+ Event(boost::shared_ptr<EventOwner> owner, const boost::function<void()>& callback) :
+ owner(owner), callback(callback) {
+ }
+
+ bool operator==(const Event& o) const {
+ return o.id == id;
+ }
+
+ unsigned int id;
+ boost::shared_ptr<EventOwner> owner;
+ boost::function<void()> callback;
+ };
+}
diff --git a/Swiften/EventLoop/EventLoop.h b/Swiften/EventLoop/EventLoop.h
index bf6f929..2b45288 100644
--- a/Swiften/EventLoop/EventLoop.h
+++ b/Swiften/EventLoop/EventLoop.h
@@ -4,6 +4,8 @@
#include <boost/thread/mutex.hpp>
#include <list>
+#include "Swiften/EventLoop/Event.h"
+
namespace Swift {
class EventOwner;
class EventLoop {
@@ -15,20 +17,6 @@ namespace Swift {
void removeEventsFromOwner(boost::shared_ptr<EventOwner> owner);
protected:
- struct Event {
- Event(boost::shared_ptr<EventOwner> owner, const boost::function<void()>& callback) :
- owner(owner), callback(callback) {
- }
-
- bool operator==(const Event& o) const {
- return o.id == id;
- }
-
- unsigned int id;
- boost::shared_ptr<EventOwner> owner;
- boost::function<void()> callback;
- };
-
/**
* Reimplement this to call handleEvent(event) from the thread in which
* the event loop is residing.