1 files changed, 37 insertions, 36 deletions
diff --git a/Swiften/Examples/BenchTool/BenchTool.cpp b/Swiften/Examples/BenchTool/BenchTool.cpp
index 5b6da5f..97d760d 100644
--- a/Swiften/Examples/BenchTool/BenchTool.cpp
+++ b/Swiften/Examples/BenchTool/BenchTool.cpp
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 2010 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/Base/sleep.h>
 #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>
-#include <Swiften/Base/sleep.h>
 #include <Swiften/TLS/BlindCertificateTrustChecker.h>
 
 using namespace Swift;
@@ -27,40 +28,40 @@ static int numberOfInstances = 100;
 
 
 static void handleConnected() {
-	numberOfConnectedClients++;
-	std::cout << "Connected " << numberOfConnectedClients << std::endl;
+    numberOfConnectedClients++;
+    std::cout << "Connected " << numberOfConnectedClients << std::endl;
 }
 
 int main(int, char**) {
-	char* jid = getenv("SWIFT_BENCHTOOL_JID");
-	if (!jid) {
-		std::cerr << "Please set the SWIFT_BENCHTOOL_JID environment variable" << std::endl;
-		return -1;
-	}
-	char* pass = getenv("SWIFT_BENCHTOOL_PASS");
-	if (!pass) {
-		std::cerr << "Please set the SWIFT_BENCHTOOL_PASS environment variable" << std::endl;
-		return -1;
-	}
+    char* jid = getenv("SWIFT_BENCHTOOL_JID");
+    if (!jid) {
+        std::cerr << "Please set the SWIFT_BENCHTOOL_JID environment variable" << std::endl;
+        return -1;
+    }
+    char* pass = getenv("SWIFT_BENCHTOOL_PASS");
+    if (!pass) {
+        std::cerr << "Please set the SWIFT_BENCHTOOL_PASS environment variable" << std::endl;
+        return -1;
+    }
+
+    BlindCertificateTrustChecker trustChecker;
+    std::vector<CoreClient*> clients;
+    for (int i = 0; i < numberOfInstances; ++i) {
+        CoreClient* client = new Swift::CoreClient(JID(jid), createSafeByteArray(std::string(pass)), &networkFactories);
+        client->setCertificateTrustChecker(&trustChecker);
+        client->onConnected.connect(&handleConnected);
+        clients.push_back(client);
+    }
 
-	BlindCertificateTrustChecker trustChecker;
-	std::vector<CoreClient*> clients;
-	for (int i = 0; i < numberOfInstances; ++i) {
-		CoreClient* client = new Swift::CoreClient(JID(jid), createSafeByteArray(std::string(pass)), &networkFactories);
-		client->setCertificateTrustChecker(&trustChecker);
-		client->onConnected.connect(&handleConnected);
-		clients.push_back(client);
-	}
-	
-	for (size_t i = 0; i < clients.size(); ++i) {
-		clients[i]->connect();
-	}
+    for (auto& client : clients) {
+        client->connect();
+    }
 
-	eventLoop.run();
+    eventLoop.run();
 
-	for (size_t i = 0; i < clients.size(); ++i) {
-		delete clients[i];
-	}
+    for (auto& client : clients) {
+        delete client;
+    }
 
-	return 0;
+    return 0;
 }