Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-15 22:09:20 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-16 07:16:37 (GMT) |
| commit | 999f19158672bd6c91fa274a9f8e968b84f8a931 (patch) | |
| tree | cbcf864514c0abc71414d187f6810619bbf0fea9 /Swiften/QA | |
| parent | 0f4fad3929097dca24d1ca92b06283811661e1f4 (diff) | |
| download | swift-contrib-999f19158672bd6c91fa274a9f8e968b84f8a931.zip swift-contrib-999f19158672bd6c91fa274a9f8e968b84f8a931.tar.bz2 | |
Pass NetworkFactories as an explicit dependency into client.
Diffstat (limited to 'Swiften/QA')
| -rw-r--r-- | Swiften/QA/ClientTest/ClientTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp index dd63056..511deb4 100644 --- a/Swiften/QA/ClientTest/ClientTest.cpp +++ b/Swiften/QA/ClientTest/ClientTest.cpp @@ -8,17 +8,17 @@ #include <boost/thread.hpp> #include "Swiften/Client/Client.h" -#include "Swiften/Network/BoostTimer.h" +#include "Swiften/Network/TimerFactory.h" +#include "Swiften/Network/BoostNetworkFactories.h" #include "Swiften/EventLoop/EventLoop.h" #include "Swiften/EventLoop/SimpleEventLoop.h" #include "Swiften/Roster/GetRosterRequest.h" #include "Swiften/Client/ClientXMLTracer.h" -#include "Swiften/Network/BoostIOServiceThread.h" -#include "Swiften/Network/MainBoostIOServiceThread.h" using namespace Swift; SimpleEventLoop eventLoop; +BoostNetworkFactories networkFactories(&eventLoop); Client* client = 0; bool reconnected = false; @@ -55,14 +55,14 @@ int main(int, char**) { return -1; } - client = new Swift::Client(&eventLoop, JID(jid), String(pass)); + client = new Swift::Client(&eventLoop, &networkFactories, JID(jid), String(pass)); ClientXMLTracer* tracer = new ClientXMLTracer(client); client->onConnected.connect(&handleConnected); client->setAlwaysTrustCertificates(); client->connect(); { - boost::shared_ptr<BoostTimer> timer(BoostTimer::create(30000, &MainBoostIOServiceThread::getInstance().getIOService(), &eventLoop)); + Timer::ref timer = networkFactories.getTimerFactory()->createTimer(30000); timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop)); timer->start(); |