1 files changed, 45 insertions, 44 deletions
diff --git a/Swiften/FileTransfer/IBBSendSession.h b/Swiften/FileTransfer/IBBSendSession.h
index af8cc12..e45532d 100644
--- a/Swiften/FileTransfer/IBBSendSession.h
+++ b/Swiften/FileTransfer/IBBSendSession.h
@@ -1,16 +1,17 @@
 /*
- * 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 <memory>
+
 #include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Elements/IBB.h>
 #include <Swiften/FileTransfer/FileTransferError.h>
@@ -18,53 +19,53 @@
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
-	class IQRouter;
-	class IBBRequest;
+    class IQRouter;
+    class IBBRequest;
 
-	class SWIFTEN_API IBBSendSession {
-		public:
-			IBBSendSession(
-					const std::string& id, 
-					const JID& from, 
-					const JID& to, 
-					boost::shared_ptr<ReadBytestream> bytestream, 
-					IQRouter* router);
-			~IBBSendSession();
+    class SWIFTEN_API IBBSendSession {
+        public:
+            IBBSendSession(
+                    const std::string& id,
+                    const JID& from,
+                    const JID& to,
+                    std::shared_ptr<ReadBytestream> bytestream,
+                    IQRouter* router);
+            ~IBBSendSession();
 
-			void start();
-			void stop();
+            void start();
+            void stop();
 
-			const JID& getSender() const {
-				return from;
-			}
+            const JID& getSender() const {
+                return from;
+            }
 
-			const JID& getReceiver() const {
-				return to;
-			}
+            const JID& getReceiver() const {
+                return to;
+            }
 
-			void setBlockSize(unsigned int blockSize) {
-				this->blockSize = blockSize;
-			}
+            void setBlockSize(unsigned int blockSize) {
+                this->blockSize = blockSize;
+            }
 
-			boost::signal<void (boost::optional<FileTransferError>)> onFinished;
-			boost::signal<void (size_t)> onBytesSent;
+            boost::signals2::signal<void (boost::optional<FileTransferError>)> onFinished;
+            boost::signals2::signal<void (size_t)> onBytesSent;
 
-		private:
-			void handleIBBResponse(IBB::ref, ErrorPayload::ref);
-			void finish(boost::optional<FileTransferError>);
-			void sendMoreData();
-			void handleDataAvailable();
+        private:
+            void handleIBBResponse(IBB::ref, ErrorPayload::ref);
+            void finish(boost::optional<FileTransferError>);
+            void sendMoreData();
+            void handleDataAvailable();
 
-		private:
-			std::string id;
-			JID from;
-			JID to;
-			boost::shared_ptr<ReadBytestream> bytestream;
-			IQRouter* router;
-			unsigned int blockSize;
-			int sequenceNumber;
-			bool active;
-			bool waitingForData;
-			boost::shared_ptr<IBBRequest> currentRequest;
-	};
+        private:
+            std::string id;
+            JID from;
+            JID to;
+            std::shared_ptr<ReadBytestream> bytestream;
+            IQRouter* router;
+            unsigned int blockSize;
+            int sequenceNumber;
+            bool active;
+            bool waitingForData;
+            std::shared_ptr<IBBRequest> currentRequest;
+    };
 }