1 files changed, 60 insertions, 61 deletions
diff --git a/Swiften/Component/ComponentConnector.cpp b/Swiften/Component/ComponentConnector.cpp
index 072fd73..a7375a7 100644
--- a/Swiften/Component/ComponentConnector.cpp
+++ b/Swiften/Component/ComponentConnector.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,11 +7,10 @@
 #include <Swiften/Component/ComponentConnector.h>
 
 #include <boost/bind.hpp>
-#include <iostream>
 
 #include <Swiften/Network/ConnectionFactory.h>
-#include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/DomainNameAddressQuery.h>
+#include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/TimerFactory.h>
 
 namespace Swift {
@@ -20,88 +19,88 @@ ComponentConnector::ComponentConnector(const std::string& hostname, int port, Do
 }
 
 void ComponentConnector::setTimeoutMilliseconds(int milliseconds) {
-	timeoutMilliseconds = milliseconds;
+    timeoutMilliseconds = milliseconds;
 }
 
 void ComponentConnector::start() {
-	assert(!currentConnection);
-	assert(!timer);
-	assert(!addressQuery);
-	addressQuery = resolver->createAddressQuery(hostname);
-	addressQuery->onResult.connect(boost::bind(&ComponentConnector::handleAddressQueryResult, shared_from_this(), _1, _2));
-	if (timeoutMilliseconds > 0) {
-		timer = timerFactory->createTimer(timeoutMilliseconds);
-		timer->onTick.connect(boost::bind(&ComponentConnector::handleTimeout, shared_from_this()));
-		timer->start();
-	}
-	addressQuery->run();
+    assert(!currentConnection);
+    assert(!timer);
+    assert(!addressQuery);
+    addressQuery = resolver->createAddressQuery(hostname);
+    addressQuery->onResult.connect(boost::bind(&ComponentConnector::handleAddressQueryResult, shared_from_this(), _1, _2));
+    if (timeoutMilliseconds > 0) {
+        timer = timerFactory->createTimer(timeoutMilliseconds);
+        timer->onTick.connect(boost::bind(&ComponentConnector::handleTimeout, shared_from_this()));
+        timer->start();
+    }
+    addressQuery->run();
 }
 
 void ComponentConnector::stop() {
-	finish(boost::shared_ptr<Connection>());
+    finish(std::shared_ptr<Connection>());
 }
 
 
 void ComponentConnector::handleAddressQueryResult(const std::vector<HostAddress>& addresses, boost::optional<DomainNameResolveError> error) {
-	addressQuery.reset();
-	if (error || addresses.empty()) {
-		finish(boost::shared_ptr<Connection>());
-	}
-	else {
-		addressQueryResults = std::deque<HostAddress>(addresses.begin(), addresses.end());
-		tryNextAddress();
-	}
+    addressQuery.reset();
+    if (error || addresses.empty()) {
+        finish(std::shared_ptr<Connection>());
+    }
+    else {
+        addressQueryResults = std::deque<HostAddress>(addresses.begin(), addresses.end());
+        tryNextAddress();
+    }
 }
 
 void ComponentConnector::tryNextAddress() {
-	assert(!addressQueryResults.empty());
-	HostAddress address = addressQueryResults.front();
-	addressQueryResults.pop_front();
-	tryConnect(HostAddressPort(address, port));
+    assert(!addressQueryResults.empty());
+    HostAddress address = addressQueryResults.front();
+    addressQueryResults.pop_front();
+    tryConnect(HostAddressPort(address, port));
 }
 
 void ComponentConnector::tryConnect(const HostAddressPort& target) {
-	assert(!currentConnection);
-	currentConnection = connectionFactory->createConnection();
-	currentConnection->onConnectFinished.connect(boost::bind(&ComponentConnector::handleConnectionConnectFinished, shared_from_this(), _1));
-	currentConnection->connect(target);
+    assert(!currentConnection);
+    currentConnection = connectionFactory->createConnection();
+    currentConnection->onConnectFinished.connect(boost::bind(&ComponentConnector::handleConnectionConnectFinished, shared_from_this(), _1));
+    currentConnection->connect(target);
 }
 
 void ComponentConnector::handleConnectionConnectFinished(bool error) {
-	currentConnection->onConnectFinished.disconnect(boost::bind(&ComponentConnector::handleConnectionConnectFinished, shared_from_this(), _1));
-	if (error) {
-		currentConnection.reset();
-		if (!addressQueryResults.empty()) {
-			tryNextAddress();
-		}
-		else {
-			finish(boost::shared_ptr<Connection>());
-		}
-	}
-	else {
-		finish(currentConnection);
-	}
+    currentConnection->onConnectFinished.disconnect(boost::bind(&ComponentConnector::handleConnectionConnectFinished, shared_from_this(), _1));
+    if (error) {
+        currentConnection.reset();
+        if (!addressQueryResults.empty()) {
+            tryNextAddress();
+        }
+        else {
+            finish(std::shared_ptr<Connection>());
+        }
+    }
+    else {
+        finish(currentConnection);
+    }
 }
 
-void ComponentConnector::finish(boost::shared_ptr<Connection> connection) {
-	if (timer) {
-		timer->stop();
-		timer->onTick.disconnect(boost::bind(&ComponentConnector::handleTimeout, shared_from_this()));
-		timer.reset();
-	}
-	if (addressQuery) {
-		addressQuery->onResult.disconnect(boost::bind(&ComponentConnector::handleAddressQueryResult, shared_from_this(), _1, _2));
-		addressQuery.reset();
-	}
-	if (currentConnection) {
-		currentConnection->onConnectFinished.disconnect(boost::bind(&ComponentConnector::handleConnectionConnectFinished, shared_from_this(), _1));
-		currentConnection.reset();
-	}
-	onConnectFinished(connection);
+void ComponentConnector::finish(std::shared_ptr<Connection> connection) {
+    if (timer) {
+        timer->stop();
+        timer->onTick.disconnect(boost::bind(&ComponentConnector::handleTimeout, shared_from_this()));
+        timer.reset();
+    }
+    if (addressQuery) {
+        addressQuery->onResult.disconnect(boost::bind(&ComponentConnector::handleAddressQueryResult, shared_from_this(), _1, _2));
+        addressQuery.reset();
+    }
+    if (currentConnection) {
+        currentConnection->onConnectFinished.disconnect(boost::bind(&ComponentConnector::handleConnectionConnectFinished, shared_from_this(), _1));
+        currentConnection.reset();
+    }
+    onConnectFinished(connection);
 }
 
 void ComponentConnector::handleTimeout() {
-	finish(boost::shared_ptr<Connection>());
+    finish(std::shared_ptr<Connection>());
 }
 
 }