10 files changed, 40 insertions, 32 deletions
diff --git a/Swiften/Client/BlockList.h b/Swiften/Client/BlockList.h
index c200f20..7a54626 100644
--- a/Swiften/Client/BlockList.h
+++ b/Swiften/Client/BlockList.h
@@ -8,8 +8,9 @@
 
 #include <vector>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
@@ -30,8 +31,8 @@ namespace Swift {
             bool isBlocked(const JID& jid) const;
 
         public:
-            boost::signal<void ()> onStateChanged;
-            boost::signal<void (const JID&)> onItemAdded;
-            boost::signal<void (const JID&)> onItemRemoved;
+            boost::signals2::signal<void ()> onStateChanged;
+            boost::signals2::signal<void (const JID&)> onItemAdded;
+            boost::signals2::signal<void (const JID&)> onItemRemoved;
     };
 }
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 9c51065..af7da5d 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -169,7 +169,7 @@ namespace Swift {
             /**
              * This signal is emitted when a JID changes presence.
              */
-            boost::signal<void (std::shared_ptr<Presence>)> onPresenceChange;
+            boost::signals2::signal<void (std::shared_ptr<Presence>)> onPresenceChange;
 
         private:
             Storages* getStorages() const;
diff --git a/Swiften/Client/ClientBlockListManager.h b/Swiften/Client/ClientBlockListManager.h
index 44e3ee1..5fc1335 100644
--- a/Swiften/Client/ClientBlockListManager.h
+++ b/Swiften/Client/ClientBlockListManager.h
@@ -8,8 +8,9 @@
 
 #include <memory>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Client/BlockList.h>
 #include <Swiften/Client/BlockListImpl.h>
 #include <Swiften/Elements/BlockListPayload.h>
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h
index 7309218..ad1b78c 100644
--- a/Swiften/Client/ClientSession.h
+++ b/Swiften/Client/ClientSession.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/ToplevelElement.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Session/SessionStream.h>
@@ -138,11 +139,11 @@ namespace Swift {
             }
 
         public:
-            boost::signal<void ()> onNeedCredentials;
-            boost::signal<void ()> onInitialized;
-            boost::signal<void (std::shared_ptr<Swift::Error>)> onFinished;
-            boost::signal<void (std::shared_ptr<Stanza>)> onStanzaReceived;
-            boost::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked;
+            boost::signals2::signal<void ()> onNeedCredentials;
+            boost::signals2::signal<void ()> onInitialized;
+            boost::signals2::signal<void (std::shared_ptr<Swift::Error>)> onFinished;
+            boost::signals2::signal<void (std::shared_ptr<Stanza>)> onStanzaReceived;
+            boost::signals2::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked;
 
         private:
             ClientSession(
diff --git a/Swiften/Client/ClientXMLTracer.h b/Swiften/Client/ClientXMLTracer.h
index ccecb41..ad28fe2 100644
--- a/Swiften/Client/ClientXMLTracer.h
+++ b/Swiften/Client/ClientXMLTracer.h
@@ -24,7 +24,7 @@ namespace Swift {
         private:
             XMLBeautifier *beautifier;
             bool bosh;
-            boost::bsignals::scoped_connection onDataReadConnection;
-            boost::bsignals::scoped_connection onDataWrittenConnection;
+            boost::signals2::scoped_connection onDataReadConnection;
+            boost::signals2::scoped_connection onDataWrittenConnection;
     };
 }
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index a1e4681..27031c0 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -9,9 +9,10 @@
 #include <memory>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Client/ClientError.h>
 #include <Swiften/Client/ClientOptions.h>
 #include <Swiften/Entity/Entity.h>
@@ -149,13 +150,13 @@ namespace Swift {
              * If the connection was due to a non-recoverable error, the type
              * of error will be passed as a parameter.
              */
-            boost::signal<void (const boost::optional<ClientError>&)> onDisconnected;
+            boost::signals2::signal<void (const boost::optional<ClientError>&)> onDisconnected;
 
             /**
              * Emitted when the client is connected and authenticated,
              * and stanzas can be sent.
              */
-            boost::signal<void ()> onConnected;
+            boost::signals2::signal<void ()> onConnected;
 
             /**
              * Emitted when the client receives data.
@@ -163,7 +164,7 @@ namespace Swift {
              * This signal is emitted before the XML data is parsed,
              * so this data is unformatted.
              */
-            boost::signal<void (const SafeByteArray&)> onDataRead;
+            boost::signals2::signal<void (const SafeByteArray&)> onDataRead;
 
             /**
              * Emitted when the client sends data.
@@ -171,17 +172,17 @@ namespace Swift {
              * This signal is emitted after the XML was serialized, and
              * is unformatted.
              */
-            boost::signal<void (const SafeByteArray&)> onDataWritten;
+            boost::signals2::signal<void (const SafeByteArray&)> onDataWritten;
 
             /**
              * Emitted when a message is received.
              */
-            boost::signal<void (std::shared_ptr<Message>)> onMessageReceived;
+            boost::signals2::signal<void (std::shared_ptr<Message>)> onMessageReceived;
 
             /**
              * Emitted when a presence stanza is received.
              */
-            boost::signal<void (std::shared_ptr<Presence>) > onPresenceReceived;
+            boost::signals2::signal<void (std::shared_ptr<Presence>) > onPresenceReceived;
 
             /**
              * Emitted when the server acknowledges receipt of a
@@ -189,7 +190,7 @@ namespace Swift {
              *
              * \see getStreamManagementEnabled()
              */
-            boost::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked;
+            boost::signals2::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked;
 
         protected:
             std::shared_ptr<ClientSession> getSession() const {
diff --git a/Swiften/Client/NickManager.h b/Swiften/Client/NickManager.h
index 4769bad..c5f0e58 100644
--- a/Swiften/Client/NickManager.h
+++ b/Swiften/Client/NickManager.h
@@ -8,8 +8,9 @@
 
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
     class SWIFTEN_API NickManager {
@@ -19,6 +20,6 @@ namespace Swift {
             virtual std::string getOwnNick() const = 0;
             virtual void setOwnNick(const std::string& nick) = 0;
 
-            boost::signal<void (const std::string&)> onOwnNickChanged;
+            boost::signals2::signal<void (const std::string&)> onOwnNickChanged;
     };
 }
diff --git a/Swiften/Client/NickResolver.h b/Swiften/Client/NickResolver.h
index 0e46411..a19c244 100644
--- a/Swiften/Client/NickResolver.h
+++ b/Swiften/Client/NickResolver.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/Elements/VCard.h>
 #include <Swiften/JID/JID.h>
 
@@ -26,7 +27,7 @@ namespace Swift {
 
             std::string jidToNick(const JID& jid);
 
-            boost::signal<void (const JID&, const std::string& /*previousNick*/)> onNickChanged;
+            boost::signals2::signal<void (const JID&, const std::string& /*previousNick*/)> onNickChanged;
 
         private:
             void handleVCardReceived(const JID& jid, VCard::ref vCard);
diff --git a/Swiften/Client/StanzaChannel.h b/Swiften/Client/StanzaChannel.h
index 933d39d..930bae1 100644
--- a/Swiften/Client/StanzaChannel.h
+++ b/Swiften/Client/StanzaChannel.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/Message.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Queries/IQChannel.h>
@@ -24,9 +25,9 @@ namespace Swift {
             virtual bool getStreamManagementEnabled() const = 0;
             virtual std::vector<Certificate::ref> getPeerCertificateChain() const = 0;
 
-            boost::signal<void (bool /* isAvailable */)> onAvailableChanged;
-            boost::signal<void (std::shared_ptr<Message>)> onMessageReceived;
-            boost::signal<void (std::shared_ptr<Presence>) > onPresenceReceived;
-            boost::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked;
+            boost::signals2::signal<void (bool /* isAvailable */)> onAvailableChanged;
+            boost::signals2::signal<void (std::shared_ptr<Message>)> onMessageReceived;
+            boost::signals2::signal<void (std::shared_ptr<Presence>) > onPresenceReceived;
+            boost::signals2::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked;
     };
 }
diff --git a/Swiften/Client/XMLBeautifier.h b/Swiften/Client/XMLBeautifier.h
index a765bc5..8da935a 100644
--- a/Swiften/Client/XMLBeautifier.h
+++ b/Swiften/Client/XMLBeautifier.h
@@ -16,8 +16,9 @@
 #include <stack>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Parser/XMLParser.h>
 #include <Swiften/Parser/XMLParserClient.h>
 #include <Swiften/Parser/XMLParserFactory.h>