2 files changed, 66 insertions, 65 deletions
diff --git a/Swiften/QA/ReconnectTest/ReconnectTest.cpp b/Swiften/QA/ReconnectTest/ReconnectTest.cpp
index 933d5d2..af3369c 100644
--- a/Swiften/QA/ReconnectTest/ReconnectTest.cpp
+++ b/Swiften/QA/ReconnectTest/ReconnectTest.cpp
@@ -1,20 +1,21 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
+#include <thread>
+
 #include <boost/bind.hpp>
-#include <boost/thread.hpp>
 
 #include <Swiften/Client/Client.h>
-#include <Swiften/Network/BoostTimer.h>
+#include <Swiften/Client/ClientXMLTracer.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/BoostTimer.h>
 #include <Swiften/Network/MainBoostIOServiceThread.h>
+#include <Swiften/Roster/GetRosterRequest.h>
 
 using namespace Swift;
 
@@ -25,49 +26,49 @@ Client* client_;
 SimpleEventLoop eventLoop_;
 int count = 0;
 
-void handleTick(boost::shared_ptr<BoostTimer> timer) {
-	std::cout << "Count " << count++ << std::endl;
-	if (timer) {
-		timer->stop();
-	}
-	if (connecting_) {
-		client_->disconnect();
-	} else {
-		if (count > 60) {
-			eventLoop_.stop();
-			return;
-		}
-		client_->connect();
-	}
-	connecting_ = !connecting_;
-	
-	int delay = 500;
-//	int delay = 0;
-	boost::shared_ptr<BoostTimer> newTimer(BoostTimer::create(delay, &MainBoostIOServiceThread::getInstance().getIOService()));
-	newTimer->onTick.connect(boost::bind(&handleTick, timer));
-	newTimer->start();
+void handleTick(std::shared_ptr<BoostTimer> timer) {
+    std::cout << "Count " << count++ << std::endl;
+    if (timer) {
+        timer->stop();
+    }
+    if (connecting_) {
+        client_->disconnect();
+    } else {
+        if (count > 60) {
+            eventLoop_.stop();
+            return;
+        }
+        client_->connect();
+    }
+    connecting_ = !connecting_;
+
+    int delay = 500;
+//    int delay = 0;
+    std::shared_ptr<BoostTimer> newTimer(BoostTimer::create(delay, &MainBoostIOServiceThread::getInstance().getIOService()));
+    newTimer->onTick.connect(boost::bind(&handleTick, timer));
+    newTimer->start();
 }
 
 int main(int, char**) {
-	char* jidChars = getenv("SWIFT_CLIENTTEST_JID");
-	if (!jidChars) {
-		std::cerr << "Please set the SWIFT_CLIENTTEST_JID environment variable" << std::endl;
-		return -1;
-	}
-	char* passChars = getenv("SWIFT_CLIENTTEST_PASS");
-	if (!passChars) {
-		std::cerr << "Please set the SWIFT_CLIENTTEST_PASS environment variable" << std::endl;
-		return -1;
-	}
-	
-	JID jid(jidChars);
-	std::string pass(passChars);
+    char* jidChars = getenv("SWIFT_CLIENTTEST_JID");
+    if (!jidChars) {
+        std::cerr << "Please set the SWIFT_CLIENTTEST_JID environment variable" << std::endl;
+        return -1;
+    }
+    char* passChars = getenv("SWIFT_CLIENTTEST_PASS");
+    if (!passChars) {
+        std::cerr << "Please set the SWIFT_CLIENTTEST_PASS environment variable" << std::endl;
+        return -1;
+    }
+
+    JID jid(jidChars);
+    std::string pass(passChars);
+
+    client_ = new Swift::Client(jid, pass);
+    handleTick(std::shared_ptr<BoostTimer>());
+    eventLoop_.run();
 
-	client_ = new Swift::Client(jid, pass);
-	handleTick(boost::shared_ptr<BoostTimer>());
-	eventLoop_.run();
-	
-	delete client_;
-	return 0;
+    delete client_;
+    return 0;
 
 }
diff --git a/Swiften/QA/ReconnectTest/SConscript b/Swiften/QA/ReconnectTest/SConscript
index 6db6a6f..a94af5e 100644
--- a/Swiften/QA/ReconnectTest/SConscript
+++ b/Swiften/QA/ReconnectTest/SConscript
@@ -3,23 +3,23 @@ import os
 Import("env")
 
 if env["TEST"] :
-	myenv = env.Clone()
-	myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-	myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
-	myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
-	myenv.MergeFlags(myenv["BOOST_FLAGS"])
-	myenv.MergeFlags(myenv.get("SQLITE_FLAGS", ""))
-	myenv.MergeFlags(myenv["ZLIB_FLAGS"])
-	myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
-	myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
-	myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
-	myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
-#	myenv.Append(LIBPATH = ["/opt/local/lib"])
-#	myenv.Append(LIBS = ["efence"])
+    myenv = env.Clone()
+    myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
+    myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
+    myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+    myenv.MergeFlags(myenv["BOOST_FLAGS"])
+    myenv.MergeFlags(myenv.get("SQLITE_FLAGS", ""))
+    myenv.MergeFlags(myenv["ZLIB_FLAGS"])
+    myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
+    myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
+    myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
+    myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+#   myenv.Append(LIBPATH = ["/opt/local/lib"])
+#   myenv.Append(LIBS = ["efence"])
 
-	for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
-		if os.environ.get(i, "") :
-			myenv["ENV"][i] = os.environ[i]
+    for i in ["SWIFT_CLIENTTEST_JID", "SWIFT_CLIENTTEST_PASS"]:
+        if os.environ.get(i, "") :
+            myenv["ENV"][i] = os.environ[i]
 
-	tester = myenv.Program("ReconnectTest", ["ReconnectTest.cpp"])
-	myenv.Test(tester, "system", is_checker = True)
+    tester = myenv.Program("ReconnectTest", ["ReconnectTest.cpp"])
+    myenv.Test(tester, "system", is_checker = True)