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 /Slimber/Server.h | |
| parent | a7da393cfc807048d320ddba8a1c7d24ef23a46e (diff) | |
| download | swift-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 'Slimber/Server.h')
| -rw-r--r-- | Slimber/Server.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Slimber/Server.h b/Slimber/Server.h index 864f705..039f351 100644 --- a/Slimber/Server.h +++ b/Slimber/Server.h @@ -32,6 +32,7 @@ namespace Swift { class SessionTracer; class RosterPayload; class Presence; + class EventLoop; class Server { public: @@ -39,7 +40,8 @@ namespace Swift { int clientConnectionPort, int linkLocalConnectionPort, LinkLocalServiceBrowser* browser, - VCardCollection* vCardCollection); + VCardCollection* vCardCollection, + EventLoop* eventLoop); ~Server(); void start(); @@ -102,6 +104,7 @@ namespace Swift { int linkLocalConnectionPort; LinkLocalServiceBrowser* linkLocalServiceBrowser; VCardCollection* vCardCollection; + EventLoop* eventLoop; LinkLocalPresenceManager* presenceManager; bool stopping; boost::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer; |