8 files changed, 27 insertions, 23 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;
     };
 }
diff --git a/Swiften/LinkLocal/IncomingLinkLocalSession.h b/Swiften/LinkLocal/IncomingLinkLocalSession.h
index b3f0866..9760bb7 100644
--- a/Swiften/LinkLocal/IncomingLinkLocalSession.h
+++ b/Swiften/LinkLocal/IncomingLinkLocalSession.h
@@ -8,8 +8,9 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Network/Connection.h>
 #include <Swiften/Session/Session.h>
@@ -30,7 +31,7 @@ namespace Swift {
                     PayloadSerializerCollection* payloadSerializers,
                     XMLParserFactory* xmlParserFactory);
 
-            boost::signal<void ()> onSessionStarted;
+            boost::signals2::signal<void ()> onSessionStarted;
 
         private:
             void handleElement(std::shared_ptr<ToplevelElement>);
diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h
index a55d1b6..2c49185 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.h
+++ b/Swiften/LinkLocal/LinkLocalConnector.h
@@ -9,8 +9,9 @@
 #include <memory>
 #include <vector>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/LinkLocal/LinkLocalService.h>
 #include <Swiften/Network/Connection.h>
 
@@ -47,7 +48,7 @@ namespace Swift {
                 return connection;
             }
 
-            boost::signal<void (bool)> onConnectFinished;
+            boost::signals2::signal<void (bool)> onConnectFinished;
 
         private:
             void handleHostnameResolved(const boost::optional<HostAddress>& address);
@@ -57,9 +58,9 @@ namespace Swift {
             LinkLocalService service;
             std::shared_ptr<DNSSDQuerier> querier;
             std::shared_ptr<DNSSDResolveHostnameQuery> resolveQuery;
-            boost::bsignals::connection resolveQueryHostNameResolvedConnection;
+            boost::signals2::connection resolveQueryHostNameResolvedConnection;
             std::shared_ptr<Connection> connection;
-            boost::bsignals::connection connectionConnectFinishedConnection;
+            boost::signals2::connection connectionConnectFinishedConnection;
             std::vector<std::shared_ptr<ToplevelElement> > queuedElements;
     };
 }
diff --git a/Swiften/LinkLocal/LinkLocalServiceBrowser.h b/Swiften/LinkLocal/LinkLocalServiceBrowser.h
index 2b0545e..c59a4d0 100644
--- a/Swiften/LinkLocal/LinkLocalServiceBrowser.h
+++ b/Swiften/LinkLocal/LinkLocalServiceBrowser.h
@@ -12,9 +12,9 @@
 #include <vector>
 
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDQuerier.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h>
 #include <Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h>
@@ -49,11 +49,11 @@ namespace Swift {
                 return querier;
             }
 
-            boost::signal<void (const LinkLocalService&)> onServiceAdded;
-            boost::signal<void (const LinkLocalService&)> onServiceChanged;
-            boost::signal<void (const LinkLocalService&)> onServiceRemoved;
-            boost::signal<void (const DNSSDServiceID&)> onServiceRegistered;
-            boost::signal<void (bool)> onStopped;
+            boost::signals2::signal<void (const LinkLocalService&)> onServiceAdded;
+            boost::signals2::signal<void (const LinkLocalService&)> onServiceChanged;
+            boost::signals2::signal<void (const LinkLocalService&)> onServiceRemoved;
+            boost::signals2::signal<void (const DNSSDServiceID&)> onServiceRegistered;
+            boost::signals2::signal<void (bool)> onStopped;
 
         private:
             void handleServiceAdded(const DNSSDServiceID&);
diff --git a/Swiften/LinkLocal/OutgoingLinkLocalSession.h b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
index 2f08ed3..34f7af9 100644
--- a/Swiften/LinkLocal/OutgoingLinkLocalSession.h
+++ b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
@@ -9,8 +9,9 @@
 #include <memory>
 #include <vector>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Session/Session.h>