1 files changed, 32 insertions, 31 deletions
diff --git a/Swiften/Network/Connection.h b/Swiften/Network/Connection.h
index 39b63d4..85f33a8 100644
--- a/Swiften/Network/Connection.h
+++ b/Swiften/Network/Connection.h
@@ -1,44 +1,45 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
+
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
-	class HostAddressPort;
-
-	class SWIFTEN_API Connection {
-		public:
-			typedef boost::shared_ptr<Connection> ref;
-
-			enum Error {
-				ReadError,
-				WriteError
-			};
-
-			Connection();
-			virtual ~Connection();
-
-			virtual void listen() = 0;
-			virtual void connect(const HostAddressPort& address) = 0;
-			virtual void disconnect() = 0;
-			virtual void write(const SafeByteArray& data) = 0;
-
-			virtual HostAddressPort getLocalAddress() const = 0;
-			virtual HostAddressPort getRemoteAddress() const = 0; 
-
-		public:
-			boost::signal<void (bool /* error */)> onConnectFinished;
-			boost::signal<void (const boost::optional<Error>&)> onDisconnected;
-			boost::signal<void (boost::shared_ptr<SafeByteArray>)> onDataRead;
-			boost::signal<void ()> onDataWritten;
-	};
+    class HostAddressPort;
+
+    class SWIFTEN_API Connection {
+        public:
+            typedef std::shared_ptr<Connection> ref;
+
+            enum Error {
+                ReadError,
+                WriteError
+            };
+
+            Connection();
+            virtual ~Connection();
+
+            virtual void listen() = 0;
+            virtual void connect(const HostAddressPort& address) = 0;
+            virtual void disconnect() = 0;
+            virtual void write(const SafeByteArray& data) = 0;
+
+            virtual HostAddressPort getLocalAddress() const = 0;
+            virtual HostAddressPort getRemoteAddress() const = 0;
+
+        public:
+            boost::signals2::signal<void (bool /* error */)> onConnectFinished;
+            boost::signals2::signal<void (const boost::optional<Error>&)> onDisconnected;
+            boost::signals2::signal<void (std::shared_ptr<SafeByteArray>)> onDataRead;
+            boost::signals2::signal<void ()> onDataWritten;
+    };
 }