3 files changed, 17 insertions, 14 deletions
diff --git a/Swiften/Component/ComponentConnector.h b/Swiften/Component/ComponentConnector.h
index 831851a..ab36901 100644
--- a/Swiften/Component/ComponentConnector.h
+++ b/Swiften/Component/ComponentConnector.h
@@ -10,8 +10,9 @@
 #include <memory>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Network/Connection.h>
 #include <Swiften/Network/DomainNameResolveError.h>
 #include <Swiften/Network/HostAddressPort.h>
@@ -23,7 +24,7 @@ namespace Swift {
     class ConnectionFactory;
     class TimerFactory;
 
-    class SWIFTEN_API ComponentConnector : public boost::bsignals::trackable, public std::enable_shared_from_this<ComponentConnector> {
+    class SWIFTEN_API ComponentConnector : public boost::signals2::trackable, public std::enable_shared_from_this<ComponentConnector> {
         public:
             typedef std::shared_ptr<ComponentConnector> ref;
 
@@ -36,7 +37,7 @@ namespace Swift {
             void start();
             void stop();
 
-            boost::signal<void (std::shared_ptr<Connection>)> onConnectFinished;
+            boost::signals2::signal<void (std::shared_ptr<Connection>)> onConnectFinished;
 
         private:
             ComponentConnector(const std::string& hostname, int port, DomainNameResolver*, ConnectionFactory*, TimerFactory*);
diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h
index 97f5378..9d963a1 100644
--- a/Swiften/Component/ComponentSession.h
+++ b/Swiften/Component/ComponentSession.h
@@ -9,9 +9,10 @@
 #include <memory>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/Error.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/Stanza.h>
 #include <Swiften/Elements/ToplevelElement.h>
 #include <Swiften/JID/JID.h>
@@ -56,9 +57,9 @@ namespace Swift {
             void sendStanza(std::shared_ptr<Stanza>);
 
         public:
-            boost::signal<void ()> onInitialized;
-            boost::signal<void (std::shared_ptr<Swift::Error>)> onFinished;
-            boost::signal<void (std::shared_ptr<Stanza>)> onStanzaReceived;
+            boost::signals2::signal<void ()> onInitialized;
+            boost::signals2::signal<void (std::shared_ptr<Swift::Error>)> onFinished;
+            boost::signals2::signal<void (std::shared_ptr<Stanza>)> onStanzaReceived;
 
         private:
             ComponentSession(const JID& jid, const std::string& secret, std::shared_ptr<SessionStream>, CryptoProvider*);
diff --git a/Swiften/Component/CoreComponent.h b/Swiften/Component/CoreComponent.h
index 3368671..669be97 100644
--- a/Swiften/Component/CoreComponent.h
+++ b/Swiften/Component/CoreComponent.h
@@ -9,10 +9,11 @@
 #include <memory>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/Error.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Component/ComponentConnector.h>
 #include <Swiften/Component/ComponentError.h>
 #include <Swiften/Component/ComponentSession.h>
@@ -73,13 +74,13 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void (const ComponentError&)> onError;
-            boost::signal<void ()> onConnected;
-            boost::signal<void (const SafeByteArray&)> onDataRead;
-            boost::signal<void (const SafeByteArray&)> onDataWritten;
+            boost::signals2::signal<void (const ComponentError&)> onError;
+            boost::signals2::signal<void ()> onConnected;
+            boost::signals2::signal<void (const SafeByteArray&)> onDataRead;
+            boost::signals2::signal<void (const SafeByteArray&)> onDataWritten;
 
-            boost::signal<void (std::shared_ptr<Message>)> onMessageReceived;
-            boost::signal<void (std::shared_ptr<Presence>) > onPresenceReceived;
+            boost::signals2::signal<void (std::shared_ptr<Message>)> onMessageReceived;
+            boost::signals2::signal<void (std::shared_ptr<Presence>) > onPresenceReceived;
 
         private:
             void handleConnectorFinished(std::shared_ptr<Connection>);