summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-27 19:06:56 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-27 19:07:55 (GMT)
commit6810a2896f27e7ee07aee847f5e8dbccd1f6ec89 (patch)
treef7ea87f030e57cb4494a4f897506fb18fc3d2241 /Swiften/Network/BoostTimer.h
parenta7da393cfc807048d320ddba8a1c7d24ef23a46e (diff)
downloadswift-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.zip
swift-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.tar.bz2
Remove MainEventLoop singleton.
The event loop now needs to be explicitly passed to clients using it.
Diffstat (limited to 'Swiften/Network/BoostTimer.h')
-rw-r--r--Swiften/Network/BoostTimer.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/Swiften/Network/BoostTimer.h b/Swiften/Network/BoostTimer.h
index f48cb36..548133f 100644
--- a/Swiften/Network/BoostTimer.h
+++ b/Swiften/Network/BoostTimer.h
@@ -14,24 +14,27 @@
#include "Swiften/Network/Timer.h"
namespace Swift {
+ class EventLoop;
+
class BoostTimer : public Timer, public EventOwner, public boost::enable_shared_from_this<BoostTimer> {
public:
typedef boost::shared_ptr<BoostTimer> ref;
- static ref create(int milliseconds, boost::asio::io_service* service) {
- return ref(new BoostTimer(milliseconds, service));
+ static ref create(int milliseconds, boost::asio::io_service* service, EventLoop* eventLoop) {
+ return ref(new BoostTimer(milliseconds, service, eventLoop));
}
virtual void start();
virtual void stop();
private:
- BoostTimer(int milliseconds, boost::asio::io_service* service);
+ BoostTimer(int milliseconds, boost::asio::io_service* service, EventLoop* eventLoop);
void handleTimerTick(const boost::system::error_code& error);
private:
int timeout;
boost::asio::deadline_timer timer;
+ EventLoop* eventLoop;
};
}