1 files changed, 37 insertions, 37 deletions
diff --git a/Swiften/Network/ChainedConnector.h b/Swiften/Network/ChainedConnector.h
index 9bcc961..a00d7e5 100644
--- a/Swiften/Network/ChainedConnector.h
+++ b/Swiften/Network/ChainedConnector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,49 +7,49 @@
 #pragma once
 
 #include <deque>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/Error.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
-	class Connection;
-	class Connector;
-	class ConnectionFactory;
-	class TimerFactory;
-	class DomainNameResolver;
-
-	class SWIFTEN_API ChainedConnector {
-		public:
-			ChainedConnector(const std::string& hostname, int port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver*, const std::vector<ConnectionFactory*>&, TimerFactory*);
-			~ChainedConnector();
-
-			void setTimeoutMilliseconds(int milliseconds);
-			void start();
-			void stop();
-
-			boost::signal<void (boost::shared_ptr<Connection>, boost::shared_ptr<Error>)> onConnectFinished;
-
-		private:
-			void finish(boost::shared_ptr<Connection> connection, boost::shared_ptr<Error>);
-			void tryNextConnectionFactory();
-			void handleConnectorFinished(boost::shared_ptr<Connection>, boost::shared_ptr<Error>);
-
-		private:
-			std::string hostname;
-			int port;
-			boost::optional<std::string> serviceLookupPrefix;
-			DomainNameResolver* resolver;
-			std::vector<ConnectionFactory*> connectionFactories;
-			TimerFactory* timerFactory;
-			int timeoutMilliseconds;
-			std::deque<ConnectionFactory*> connectionFactoryQueue;
-			boost::shared_ptr<Connector> currentConnector;
-			boost::shared_ptr<Error> lastError;
-	};
+    class Connection;
+    class Connector;
+    class ConnectionFactory;
+    class TimerFactory;
+    class DomainNameResolver;
+
+    class SWIFTEN_API ChainedConnector {
+        public:
+            ChainedConnector(const std::string& hostname, int port, const boost::optional<std::string>& serviceLookupPrefix, DomainNameResolver*, const std::vector<ConnectionFactory*>&, TimerFactory*);
+            ~ChainedConnector();
+
+            void setTimeoutMilliseconds(int milliseconds);
+            void start();
+            void stop();
+
+            boost::signals2::signal<void (std::shared_ptr<Connection>, std::shared_ptr<Error>)> onConnectFinished;
+
+        private:
+            void finish(std::shared_ptr<Connection> connection, std::shared_ptr<Error>);
+            void tryNextConnectionFactory();
+            void handleConnectorFinished(std::shared_ptr<Connection>, std::shared_ptr<Error>);
+
+        private:
+            std::string hostname;
+            int port;
+            boost::optional<std::string> serviceLookupPrefix;
+            DomainNameResolver* resolver;
+            std::vector<ConnectionFactory*> connectionFactories;
+            TimerFactory* timerFactory;
+            int timeoutMilliseconds;
+            std::deque<ConnectionFactory*> connectionFactoryQueue;
+            std::shared_ptr<Connector> currentConnector;
+            std::shared_ptr<Error> lastError;
+    };
 }