2 files changed, 76 insertions, 75 deletions
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index eb116e9..5cb1765 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -1,98 +1,99 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include <boost/bind.hpp>
-#include <boost/thread.hpp>
 #include <iostream>
+#include <thread>
+
+#include <boost/bind.hpp>
 
 #include <Swiften/Client/Client.h>
-#include <Swiften/Network/TimerFactory.h>
-#include <Swiften/Network/BoostNetworkFactories.h>
+#include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/EventLoop/EventLoop.h>
 #include <Swiften/EventLoop/SimpleEventLoop.h>
+#include <Swiften/Network/BoostNetworkFactories.h>
+#include <Swiften/Network/TimerFactory.h>
 #include <Swiften/Roster/GetRosterRequest.h>
-#include <Swiften/Client/ClientXMLTracer.h>
 
 using namespace Swift;
 
 static SimpleEventLoop eventLoop;
 static BoostNetworkFactories networkFactories(&eventLoop);
 
-static Client* client = 0;
+static Client* client = nullptr;
 static bool rosterReceived = false;
 enum TestStage {
-	FirstConnect,
-	Reconnect
+    FirstConnect,
+    Reconnect
 };
 static TestStage stage;
 static ClientOptions options;
 
 static void handleDisconnected(boost::optional<ClientError> e) {
-	std::cout << "Disconnected: " << (e ? e.get().getType() : ClientError::UnknownError) << std::endl;
-	if (stage == FirstConnect) {
-		stage = Reconnect;
-		client->connect(options);
-	}
-	else {
-		eventLoop.stop();
-	}
+    std::cout << "Disconnected: " << (e ? e.get().getType() : ClientError::UnknownError) << std::endl;
+    if (stage == FirstConnect) {
+        stage = Reconnect;
+        client->connect(options);
+    }
+    else {
+        eventLoop.stop();
+    }
 }
 
-static void handleRosterReceived(boost::shared_ptr<Payload>) {
-	rosterReceived = true;
-	std::cout << "Disconnecting" << std::endl;
-	client->disconnect();
+static void handleRosterReceived(std::shared_ptr<Payload>) {
+    rosterReceived = true;
+    std::cout << "Disconnecting" << std::endl;
+    client->disconnect();
 }
 
 static void handleConnected() {
-	std::cout << "Connected" << std::endl;
-	rosterReceived = false;
-	GetRosterRequest::ref rosterRequest = GetRosterRequest::create(client->getIQRouter());
-	rosterRequest->onResponse.connect(boost::bind(&handleRosterReceived, _1));
-	rosterRequest->send();
+    std::cout << "Connected" << std::endl;
+    rosterReceived = false;
+    GetRosterRequest::ref rosterRequest = GetRosterRequest::create(client->getIQRouter());
+    rosterRequest->onResponse.connect(boost::bind(&handleRosterReceived, _1));
+    rosterRequest->send();
 }
 
 int main(int, char**) {
-	char* jid = getenv("SWIFT_CLIENTTEST_JID");
-	if (!jid) {
-		std::cerr << "Please set the SWIFT_CLIENTTEST_JID environment variable" << std::endl;
-		return -1;
-	}
-	char* pass = getenv("SWIFT_CLIENTTEST_PASS");
-	if (!pass) {
-		std::cerr << "Please set the SWIFT_CLIENTTEST_PASS environment variable" << std::endl;
-		return -1;
-	}
-
-	char* boshHost = getenv("SWIFT_CLIENTTEST_BOSH_HOST");
-	char* boshPort = getenv("SWIFT_CLIENTTEST_BOSH_PORT");
-	char* boshPath = getenv("SWIFT_CLIENTTEST_BOSH_PATH");
-
-	if (boshHost && boshPort && boshPath) {
-		std::cout << "Using BOSH with URL: http://" << boshHost << ":" << boshPort << boshPath << std::endl;
-		options.boshURL = URL("http", boshHost, atoi(boshPort), boshPath);
-	}
-
-	client = new Swift::Client(JID(jid), std::string(pass), &networkFactories);
-	ClientXMLTracer* tracer = new ClientXMLTracer(client, !options.boshURL.isEmpty());
-	client->onConnected.connect(&handleConnected);
-	client->onDisconnected.connect(boost::bind(&handleDisconnected, _1));
-	client->setAlwaysTrustCertificates();
-	stage = FirstConnect;
-	client->connect(options);
-
-	{
-		Timer::ref timer = networkFactories.getTimerFactory()->createTimer(60000);
-		timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
-		timer->start();
-
-		eventLoop.run();
-	}
-
-	delete tracer;
-	delete client;
-	return !rosterReceived;
+    char* jid = getenv("SWIFT_CLIENTTEST_JID");
+    if (!jid) {
+        std::cerr << "Please set the SWIFT_CLIENTTEST_JID environment variable" << std::endl;
+        return -1;
+    }
+    char* pass = getenv("SWIFT_CLIENTTEST_PASS");
+    if (!pass) {
+        std::cerr << "Please set the SWIFT_CLIENTTEST_PASS environment variable" << std::endl;
+        return -1;
+    }
+
+    char* boshHost = getenv("SWIFT_CLIENTTEST_BOSH_HOST");
+    char* boshPort = getenv("SWIFT_CLIENTTEST_BOSH_PORT");
+    char* boshPath = getenv("SWIFT_CLIENTTEST_BOSH_PATH");
+
+    if (boshHost && boshPort && boshPath) {
+        std::cout << "Using BOSH with URL: http://" << boshHost << ":" << boshPort << boshPath << std::endl;
+        options.boshURL = URL("http", boshHost, atoi(boshPort), boshPath);
+    }
+
+    client = new Swift::Client(JID(jid), std::string(pass), &networkFactories);
+    ClientXMLTracer* tracer = new ClientXMLTracer(client, !options.boshURL.isEmpty());
+    client->onConnected.connect(&handleConnected);
+    client->onDisconnected.connect(boost::bind(&handleDisconnected, _1));
+    client->setAlwaysTrustCertificates();
+    stage = FirstConnect;
+    client->connect(options);
+
+    {
+        Timer::ref timer = networkFactories.getTimerFactory()->createTimer(60000);
+        timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));
+        timer->start();
+
+        eventLoop.run();
+    }
+
+    delete tracer;
+    delete client;
+    return !rosterReceived;
 }
diff --git a/Swiften/QA/ClientTest/SConscript b/Swiften/QA/ClientTest/SConscript
index 15a68c6..812c472 100644
--- a/Swiften/QA/ClientTest/SConscript
+++ b/Swiften/QA/ClientTest/SConscript
@@ -3,15 +3,15 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
+    myenv = env.Clone()
+    myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
 
-	for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
-		if ARGUMENTS.get(i.lower(), False) :
-			myenv["ENV"][i] = ARGUMENTS[i.lower()]
-		elif os.environ.get(i, "") :
-			myenv["ENV"][i] = os.environ[i]
+    for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
+        if ARGUMENTS.get(i.lower(), False) :
+            myenv["ENV"][i] = ARGUMENTS[i.lower()]
+        elif os.environ.get(i, "") :
+            myenv["ENV"][i] = os.environ[i]
 
-	tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
-	myenv.Test(tester, "system")
+    tester = myenv.Program("ClientTest", ["ClientTest.cpp"])
+    myenv.Test(tester, "system")