8 files changed, 22 insertions, 15 deletions
diff --git a/Swiften/Queries/GenericRequest.h b/Swiften/Queries/GenericRequest.h
index 2795a54..312ecf2 100644
--- a/Swiften/Queries/GenericRequest.h
+++ b/Swiften/Queries/GenericRequest.h
@@ -6,8 +6,9 @@
 
 #pragma once
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Queries/Request.h>
 
 namespace Swift {
@@ -74,6 +75,6 @@ namespace Swift {
             /**
              * Signal emitted when a reply to the iq has been received. Contains a payload if one was present, and an error if one was present.
              */
-            boost::signal<void (std::shared_ptr<PAYLOAD_TYPE>, ErrorPayload::ref)> onResponse;
+            boost::signals2::signal<void (std::shared_ptr<PAYLOAD_TYPE>, ErrorPayload::ref)> onResponse;
     };
 }
diff --git a/Swiften/Queries/IQChannel.h b/Swiften/Queries/IQChannel.h
index 2974ecc..fe32d89 100644
--- a/Swiften/Queries/IQChannel.h
+++ b/Swiften/Queries/IQChannel.h
@@ -9,8 +9,9 @@
 #include <memory>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/IQ.h>
 
 namespace Swift {
@@ -23,6 +24,6 @@ namespace Swift {
 
             virtual bool isAvailable() const = 0;
 
-            boost::signal<void (std::shared_ptr<IQ>)> onIQReceived;
+            boost::signals2::signal<void (std::shared_ptr<IQ>)> onIQReceived;
     };
 }
diff --git a/Swiften/Queries/PubSubRequest.h b/Swiften/Queries/PubSubRequest.h
index 888b531..b439748 100644
--- a/Swiften/Queries/PubSubRequest.h
+++ b/Swiften/Queries/PubSubRequest.h
@@ -8,8 +8,9 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ContainerPayload.h>
 #include <Swiften/Elements/PubSub.h>
 #include <Swiften/Elements/PubSubAffiliations.h>
@@ -86,6 +87,6 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void (std::shared_ptr<ResponseType>, ErrorPayload::ref)> onResponse;
+            boost::signals2::signal<void (std::shared_ptr<ResponseType>, ErrorPayload::ref)> onResponse;
     };
 }
diff --git a/Swiften/Queries/RawRequest.h b/Swiften/Queries/RawRequest.h
index 90290e8..76c84f9 100644
--- a/Swiften/Queries/RawRequest.h
+++ b/Swiften/Queries/RawRequest.h
@@ -9,8 +9,9 @@
 #include <memory>
 #include <typeinfo>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Elements/RawXMLPayload.h>
 #include <Swiften/Queries/Request.h>
@@ -27,7 +28,7 @@ namespace Swift {
                 return ref(new RawRequest(type, recipient, data, router));
             }
 
-            boost::signal<void (const std::string&)> onResponse;
+            boost::signals2::signal<void (const std::string&)> onResponse;
 
         private:
             RawRequest(IQ::Type type, const JID& receiver, const std::string& data, IQRouter* router) : Request(type, receiver, std::make_shared<RawXMLPayload>(data), router) {
diff --git a/Swiften/Queries/Requests/GetPrivateStorageRequest.h b/Swiften/Queries/Requests/GetPrivateStorageRequest.h
index e5904fe..5fb0de5 100644
--- a/Swiften/Queries/Requests/GetPrivateStorageRequest.h
+++ b/Swiften/Queries/Requests/GetPrivateStorageRequest.h
@@ -8,8 +8,9 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Elements/PrivateStorage.h>
 #include <Swiften/Queries/Request.h>
@@ -39,6 +40,6 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void (std::shared_ptr<PAYLOAD_TYPE>, ErrorPayload::ref)> onResponse;
+            boost::signals2::signal<void (std::shared_ptr<PAYLOAD_TYPE>, ErrorPayload::ref)> onResponse;
     };
 }
diff --git a/Swiften/Queries/Requests/SetPrivateStorageRequest.h b/Swiften/Queries/Requests/SetPrivateStorageRequest.h
index 7cc47fb..f1dc77a 100644
--- a/Swiften/Queries/Requests/SetPrivateStorageRequest.h
+++ b/Swiften/Queries/Requests/SetPrivateStorageRequest.h
@@ -8,8 +8,9 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Elements/PrivateStorage.h>
 #include <Swiften/Queries/Request.h>
@@ -33,6 +34,6 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void (ErrorPayload::ref)> onResponse;
+            boost::signals2::signal<void (ErrorPayload::ref)> onResponse;
     };
 }
diff --git a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
index e2ed751..1cf28c5 100644
--- a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
+++ b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
@@ -8,8 +8,9 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/InBandRegistrationPayload.h>
 #include <Swiften/Queries/Request.h>
 
@@ -31,6 +32,6 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void (std::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
+            boost::signals2::signal<void (std::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
     };
 }
diff --git a/Swiften/Queries/UnitTest/RequestTest.cpp b/Swiften/Queries/UnitTest/RequestTest.cpp
index 56daffa..b46f1d4 100644
--- a/Swiften/Queries/UnitTest/RequestTest.cpp
+++ b/Swiften/Queries/UnitTest/RequestTest.cpp
@@ -66,7 +66,7 @@ class RequestTest : public CppUnit::TestFixture {
                 }
 
             public:
-                boost::signal<void (std::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
+                boost::signals2::signal<void (std::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
         };
 
     public: