Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-27 19:06:56 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-27 19:07:55 (GMT) |
| commit | 6810a2896f27e7ee07aee847f5e8dbccd1f6ec89 (patch) | |
| tree | f7ea87f030e57cb4494a4f897506fb18fc3d2241 /Swiften/Network/BoostConnection.h | |
| parent | a7da393cfc807048d320ddba8a1c7d24ef23a46e (diff) | |
| download | swift-contrib-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.zip swift-contrib-6810a2896f27e7ee07aee847f5e8dbccd1f6ec89.tar.bz2 | |
Remove MainEventLoop singleton.
The event loop now needs to be explicitly passed to clients
using it.
Diffstat (limited to 'Swiften/Network/BoostConnection.h')
| -rw-r--r-- | Swiften/Network/BoostConnection.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Swiften/Network/BoostConnection.h b/Swiften/Network/BoostConnection.h index 4f5352f..da4f7b8 100644 --- a/Swiften/Network/BoostConnection.h +++ b/Swiften/Network/BoostConnection.h @@ -20,14 +20,16 @@ namespace boost { } namespace Swift { + class EventLoop; + class BoostConnection : public Connection, public EventOwner, public boost::enable_shared_from_this<BoostConnection> { public: typedef boost::shared_ptr<BoostConnection> ref; ~BoostConnection(); - static ref create(boost::asio::io_service* ioService) { - return ref(new BoostConnection(ioService)); + static ref create(boost::asio::io_service* ioService, EventLoop* eventLoop) { + return ref(new BoostConnection(ioService, eventLoop)); } virtual void listen(); @@ -42,7 +44,7 @@ namespace Swift { HostAddressPort getLocalAddress() const; private: - BoostConnection(boost::asio::io_service* ioService); + BoostConnection(boost::asio::io_service* ioService, EventLoop* eventLoop); void handleConnectFinished(const boost::system::error_code& error); void handleSocketRead(const boost::system::error_code& error, size_t bytesTransferred); @@ -50,6 +52,7 @@ namespace Swift { void doRead(); private: + EventLoop* eventLoop; boost::asio::ip::tcp::socket socket_; std::vector<char> readBuffer_; bool disconnecting_; |