5 files changed, 17 insertions, 12 deletions
diff --git a/Swiften/Disco/CapsManager.h b/Swiften/Disco/CapsManager.h
index e5d80aa..e57730e 100644
--- a/Swiften/Disco/CapsManager.h
+++ b/Swiften/Disco/CapsManager.h
@@ -9,8 +9,9 @@
 #include <map>
 #include <set>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Disco/CapsProvider.h>
 #include <Swiften/Elements/CapsInfo.h>
 #include <Swiften/Elements/DiscoInfo.h>
@@ -24,7 +25,7 @@ namespace Swift {
     class CapsStorage;
     class CryptoProvider;
 
-    class SWIFTEN_API CapsManager : public CapsProvider, public boost::bsignals::trackable {
+    class SWIFTEN_API CapsManager : public CapsProvider, public boost::signals2::trackable {
         public:
             CapsManager(CapsStorage*, StanzaChannel*, IQRouter*, CryptoProvider*);
 
diff --git a/Swiften/Disco/CapsProvider.h b/Swiften/Disco/CapsProvider.h
index 9cba027..b9e2d21 100644
--- a/Swiften/Disco/CapsProvider.h
+++ b/Swiften/Disco/CapsProvider.h
@@ -6,8 +6,9 @@
 
 #pragma once
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/CapsInfo.h>
 #include <Swiften/Elements/DiscoInfo.h>
 
@@ -20,6 +21,6 @@ namespace Swift {
 
             virtual DiscoInfo::ref getCaps(const std::string&) const = 0;
 
-            boost::signal<void (const std::string&)> onCapsAvailable;
+            boost::signals2::signal<void (const std::string&)> onCapsAvailable;
     };
 }
diff --git a/Swiften/Disco/DiscoServiceWalker.h b/Swiften/Disco/DiscoServiceWalker.h
index 43bd910..f7e1e6d 100644
--- a/Swiften/Disco/DiscoServiceWalker.h
+++ b/Swiften/Disco/DiscoServiceWalker.h
@@ -11,8 +11,9 @@
 #include <string>
 #include <vector>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Disco/GetDiscoInfoRequest.h>
 #include <Swiften/Disco/GetDiscoItemsRequest.h>
 #include <Swiften/Elements/DiscoInfo.h>
@@ -47,13 +48,13 @@ namespace Swift {
             }
 
             /** Emitted for each service found. */
-            boost::signal<void(const JID&, std::shared_ptr<DiscoInfo>)> onServiceFound;
+            boost::signals2::signal<void(const JID&, std::shared_ptr<DiscoInfo>)> onServiceFound;
 
             /** Emitted when walking is aborted. */
-            boost::signal<void()> onWalkAborted;
+            boost::signals2::signal<void()> onWalkAborted;
 
             /** Emitted when walking is complete.*/
-            boost::signal<void()> onWalkComplete;
+            boost::signals2::signal<void()> onWalkComplete;
 
         private:
             void walkNode(const JID& jid);
diff --git a/Swiften/Disco/EntityCapsManager.h b/Swiften/Disco/EntityCapsManager.h
index 00b685b..4236326 100644
--- a/Swiften/Disco/EntityCapsManager.h
+++ b/Swiften/Disco/EntityCapsManager.h
@@ -8,8 +8,9 @@
 
 #include <map>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Disco/EntityCapsProvider.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/ErrorPayload.h>
@@ -25,7 +26,7 @@ namespace Swift {
      * This information is provided in the form of service discovery
      * information.
      */
-    class SWIFTEN_API EntityCapsManager : public EntityCapsProvider, public boost::bsignals::trackable {
+    class SWIFTEN_API EntityCapsManager : public EntityCapsProvider, public boost::signals2::trackable {
         public:
             EntityCapsManager(CapsProvider*, StanzaChannel*);
 
diff --git a/Swiften/Disco/EntityCapsProvider.h b/Swiften/Disco/EntityCapsProvider.h
index 34984ca..5f4af18 100644
--- a/Swiften/Disco/EntityCapsProvider.h
+++ b/Swiften/Disco/EntityCapsProvider.h
@@ -6,8 +6,9 @@
 
 #pragma once
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/JID/JID.h>
 
@@ -29,6 +30,6 @@ namespace Swift {
             /**
              * Emitted when the capabilities of a JID changes.
              */
-            boost::signal<void (const JID&)> onCapsChanged;
+            boost::signals2::signal<void (const JID&)> onCapsChanged;
     };
 }