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/MainController.cpp | |
| 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/MainController.cpp')
| -rw-r--r-- | Slimber/MainController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Slimber/MainController.cpp b/Slimber/MainController.cpp index 38c1a7c..e6c2ab5 100644 --- a/Slimber/MainController.cpp +++ b/Slimber/MainController.cpp @@ -22,8 +22,8 @@ using namespace Swift; -MainController::MainController(Menulet* menulet) : menulet(menulet) { - dnsSDQuerier = PlatformDNSSDQuerierFactory().createQuerier(); +MainController::MainController(Menulet* menulet, EventLoop* eventLoop) : menulet(menulet) { + dnsSDQuerier = PlatformDNSSDQuerierFactory(eventLoop).createQuerier(); assert(dnsSDQuerier); linkLocalServiceBrowser = new LinkLocalServiceBrowser(dnsSDQuerier); @@ -37,7 +37,7 @@ MainController::MainController(Menulet* menulet) : menulet(menulet) { vCardCollection = new FileVCardCollection( PlatformApplicationPathProvider("Slimber").getDataDir()); - server = new Server(5222, 5562, linkLocalServiceBrowser, vCardCollection); + server = new Server(5222, 5562, linkLocalServiceBrowser, vCardCollection, eventLoop); server->onStopped.connect( boost::bind(&MainController::handleServerStopped, this, _1)); server->onSelfConnected.connect( |