5 files changed, 10 insertions, 11 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index dd4e95c..65c2892 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -16,9 +16,9 @@
 
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/FileTransfer/FileReadBytestream.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 #include <Swiften/FileTransfer/OutgoingJingleFileTransfer.h>
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h
index 01d65e7..38dde0e 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.h
+++ b/Swift/Controllers/FileTransfer/FileTransferController.h
@@ -56,8 +56,8 @@ public:
     int getProgress() const;
     boost::uintmax_t getSize() const;
 
-    boost::signal<void ()> onStateChanged;
-    boost::signal<void ()> onProgressChange;
+    boost::signals2::signal<void ()> onStateChanged;
+    boost::signals2::signal<void ()> onProgressChange;
 
 private:
     void handleFileTransferStateChange(FileTransfer::State);
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
index a53b000..af2831c 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
@@ -14,9 +14,9 @@
 
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Base/foreach.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.h b/Swift/Controllers/FileTransfer/FileTransferOverview.h
index a55727c..c311cb7 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.h
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,7 +14,7 @@
 
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swift/Controllers/FileTransfer/FileTransferController.h>
 
@@ -33,8 +33,8 @@ public:
     void clearFinished();
     bool isClearable() const;
 
-    boost::signal<void (FileTransferController*)> onNewFileTransferController;
-    boost::signal<void ()> onFileTransferListChanged;
+    boost::signals2::signal<void (FileTransferController*)> onNewFileTransferController;
+    boost::signals2::signal<void ()> onFileTransferListChanged;
 
 private:
     void handleIncomingFileTransfer(IncomingFileTransfer::ref transfer);
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
index 783874a..5fb955c 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
@@ -13,8 +13,7 @@
 #pragma once
 
 #include <boost/cstdint.hpp>
-
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
 
@@ -26,7 +25,7 @@ public:
     void setBytesProcessed(int processedBytes);
 
     int getPercentage() const;
-    boost::signal<void (int)> onProgressPercentage;
+    boost::signals2::signal<void (int)> onProgressPercentage;
 
 private:
     boost::uintmax_t completeBytes;