4 files changed, 11 insertions, 10 deletions
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h
index 5502678..f598be1 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h
@@ -6,7 +6,8 @@
 
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/LinkLocal/DNSSD/DNSSDServiceID.h>
 
 namespace Swift {
@@ -17,8 +18,8 @@ namespace Swift {
             virtual void startBrowsing() = 0;
             virtual void stopBrowsing() = 0;
 
-            boost::signal<void (const DNSSDServiceID&)> onServiceAdded;
-            boost::signal<void (const DNSSDServiceID&)> onServiceRemoved;
-            boost::signal<void ()> onError;
+            boost::signals2::signal<void (const DNSSDServiceID&)> onServiceAdded;
+            boost::signals2::signal<void (const DNSSDServiceID&)> onServiceRemoved;
+            boost::signals2::signal<void ()> onError;
     };
 }
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h
index e8e07bd..6639a85 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/ByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDServiceID.h>
 
 namespace Swift {
@@ -21,6 +21,6 @@ namespace Swift {
             virtual void unregisterService() = 0;
             virtual void updateServiceInfo(const ByteArray& info) = 0;
 
-            boost::signal<void (boost::optional<DNSSDServiceID>)> onRegisterFinished;
+            boost::signals2::signal<void (boost::optional<DNSSDServiceID>)> onRegisterFinished;
     };
 }
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h
index a4f818c..f14c248 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Network/HostAddress.h>
 
 namespace Swift {
@@ -19,6 +19,6 @@ namespace Swift {
             virtual void run() = 0;
             virtual void finish() = 0;
 
-            boost::signal<void (const boost::optional<HostAddress>&)> onHostnameResolved;
+            boost::signals2::signal<void (const boost::optional<HostAddress>&)> onHostnameResolved;
     };
 }
diff --git a/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h
index 4d25075..b55447a 100644
--- a/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h
+++ b/Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/ByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDServiceID.h>
 
 namespace Swift {
@@ -29,6 +29,6 @@ namespace Swift {
             virtual void start() = 0;
             virtual void stop() = 0;
 
-            boost::signal<void (const boost::optional<Result>&)> onServiceResolved;
+            boost::signals2::signal<void (const boost::optional<Result>&)> onServiceResolved;
     };
 }