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/Examples | |
| 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 'Swiften/Examples')
| -rw-r--r-- | Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp | 6 | ||||
| -rw-r--r-- | Swiften/Examples/LinkLocalTool/main.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Examples/SendFile/SendFile.cpp | 6 | ||||
| -rw-r--r-- | Swiften/Examples/SendMessage/SendMessage.cpp | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp index e796e66..e870d83 100644 --- a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp +++ b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp @@ -9,7 +9,7 @@ #include "Swiften/Client/Client.h" #include "Swiften/Network/BoostTimer.h" -#include "Swiften/EventLoop/MainEventLoop.h" +#include "Swiften/EventLoop/EventLoop.h" #include "Swiften/Client/ClientXMLTracer.h" #include "Swiften/EventLoop/SimpleEventLoop.h" #include "Swiften/Network/BoostIOServiceThread.h" @@ -67,7 +67,7 @@ int main(int argc, char* argv[]) { connectHost = argv[argi++]; } - client = new Swift::Client(JID(jid), String(argv[argi++])); + client = new Swift::Client(&eventLoop, JID(jid), String(argv[argi++])); char* timeoutChar = argv[argi++]; int timeout = atoi(timeoutChar); timeout = (timeout ? timeout : 30) * 1000; @@ -84,7 +84,7 @@ int main(int argc, char* argv[]) { } { - BoostTimer::ref timer(BoostTimer::create(timeout, &MainBoostIOServiceThread::getInstance().getIOService())); + BoostTimer::ref timer(BoostTimer::create(timeout, &MainBoostIOServiceThread::getInstance().getIOService(), &eventLoop)); timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop)); timer->start(); diff --git a/Swiften/Examples/LinkLocalTool/main.cpp b/Swiften/Examples/LinkLocalTool/main.cpp index ccecd1a..65fc9bc 100644 --- a/Swiften/Examples/LinkLocalTool/main.cpp +++ b/Swiften/Examples/LinkLocalTool/main.cpp @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { } SimpleEventLoop eventLoop; - PlatformDNSSDQuerierFactory factory; + PlatformDNSSDQuerierFactory factory(&eventLoop); boost::shared_ptr<DNSSDQuerier> querier = factory.createQuerier(); querier->start(); diff --git a/Swiften/Examples/SendFile/SendFile.cpp b/Swiften/Examples/SendFile/SendFile.cpp index da0b2fe..6f72480 100644 --- a/Swiften/Examples/SendFile/SendFile.cpp +++ b/Swiften/Examples/SendFile/SendFile.cpp @@ -9,7 +9,7 @@ #include "Swiften/Client/Client.h" #include "Swiften/Network/BoostTimer.h" -#include "Swiften/EventLoop/MainEventLoop.h" +#include "Swiften/EventLoop/EventLoop.h" #include "Swiften/Client/ClientXMLTracer.h" #include "Swiften/EventLoop/SimpleEventLoop.h" #include "Swiften/Network/MainBoostIOServiceThread.h" @@ -27,10 +27,10 @@ int exitCode = 2; class FileSender { public: FileSender(const JID& jid, const String& password, const JID& recipient, const boost::filesystem::path& file, int port) : jid(jid), password(password), recipient(recipient), file(file), transfer(NULL) { - connectionServer = BoostConnectionServer::create(port, &MainBoostIOServiceThread::getInstance().getIOService()); + connectionServer = BoostConnectionServer::create(port, &MainBoostIOServiceThread::getInstance().getIOService(), &eventLoop); socksBytestreamServer = new SOCKS5BytestreamServer(connectionServer); - client = new Swift::Client(jid, password); + client = new Swift::Client(&eventLoop, jid, password); client->onConnected.connect(boost::bind(&FileSender::handleConnected, this)); client->onError.connect(boost::bind(&FileSender::handleError, this, _1)); //tracer = new ClientXMLTracer(client); diff --git a/Swiften/Examples/SendMessage/SendMessage.cpp b/Swiften/Examples/SendMessage/SendMessage.cpp index 2ba5f3b..d9ed923 100644 --- a/Swiften/Examples/SendMessage/SendMessage.cpp +++ b/Swiften/Examples/SendMessage/SendMessage.cpp @@ -9,7 +9,7 @@ #include "Swiften/Client/Client.h" #include "Swiften/Network/BoostTimer.h" -#include "Swiften/EventLoop/MainEventLoop.h" +#include "Swiften/EventLoop/EventLoop.h" #include "Swiften/Client/ClientXMLTracer.h" #include "Swiften/EventLoop/SimpleEventLoop.h" #include "Swiften/Network/BoostIOServiceThread.h" @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) { connectHost = argv[argi++]; } - client = new Swift::Client(JID(jid), String(argv[argi++])); + client = new Swift::Client(&eventLoop, JID(jid), String(argv[argi++])); recipient = JID(argv[argi++]); messageBody = std::string(argv[argi++]); @@ -72,7 +72,7 @@ int main(int argc, char* argv[]) { } { - BoostTimer::ref timer(BoostTimer::create(30000, &MainBoostIOServiceThread::getInstance().getIOService())); + BoostTimer::ref timer(BoostTimer::create(30000, &MainBoostIOServiceThread::getInstance().getIOService(), &eventLoop)); timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop)); timer->start(); |