6 files changed, 28 insertions, 26 deletions
diff --git a/Swift/Controllers/Chat/ChatController.h b/Swift/Controllers/Chat/ChatController.h
index d5553bc..3291190 100644
--- a/Swift/Controllers/Chat/ChatController.h
+++ b/Swift/Controllers/Chat/ChatController.h
@@ -105,9 +105,9 @@ namespace Swift {
             std::string lastWbID_;
 
             ClientBlockListManager* clientBlockListManager_;
-            boost::bsignals::scoped_connection blockingOnStateChangedConnection_;
-            boost::bsignals::scoped_connection blockingOnItemAddedConnection_;
-            boost::bsignals::scoped_connection blockingOnItemRemovedConnection_;
+            boost::signals2::scoped_connection blockingOnStateChangedConnection_;
+            boost::signals2::scoped_connection blockingOnItemAddedConnection_;
+            boost::signals2::scoped_connection blockingOnItemRemovedConnection_;
 
             boost::optional<ChatWindow::AlertID> deliveryReceiptAlert_;
             boost::optional<ChatWindow::AlertID> blockedContactAlert_;
diff --git a/Swift/Controllers/Chat/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h
index 2bdfe93..309d2fe 100644
--- a/Swift/Controllers/Chat/ChatControllerBase.h
+++ b/Swift/Controllers/Chat/ChatControllerBase.h
@@ -14,9 +14,9 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Elements/SecurityLabelsCatalog.h>
@@ -47,7 +47,7 @@ namespace Swift {
     class ChatMessageParser;
     class AutoAcceptMUCInviteDecider;
 
-    class ChatControllerBase : public boost::bsignals::trackable {
+    class ChatControllerBase : public boost::signals2::trackable {
         public:
             virtual ~ChatControllerBase();
             void showChatWindow();
@@ -61,15 +61,15 @@ namespace Swift {
             void setEnabled(bool enabled);
             virtual void setToJID(const JID& jid) {toJID_ = jid;}
             /** Used for determining when something is recent.*/
-            boost::signal<void (const std::string& /*activity*/)> onActivity;
-            boost::signal<void ()> onUnreadCountChanged;
-            boost::signal<void ()> onWindowClosed;
+            boost::signals2::signal<void (const std::string& /*activity*/)> onActivity;
+            boost::signals2::signal<void ()> onUnreadCountChanged;
+            boost::signals2::signal<void ()> onWindowClosed;
             int getUnreadCount();
             const JID& getToJID() {return toJID_;}
             void handleCapsChanged(const JID& jid);
             void setCanStartImpromptuChats(bool supportsImpromptu);
             virtual ChatWindow* detachChatWindow();
-            boost::signal<void(ChatWindow* /*window to reuse*/, const std::vector<JID>& /*invite people*/, const std::string& /*reason*/)> onConvertToMUC;
+            boost::signals2::signal<void(ChatWindow* /*window to reuse*/, const std::vector<JID>& /*invite people*/, const std::string& /*reason*/)> onConvertToMUC;
 
         protected:
             ChatControllerBase(const JID& self, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, const JID &toJID, PresenceOracle* presenceOracle, AvatarManager* avatarManager, bool useDelayForLatency, UIEventStream* eventStream, EventController* eventController, TimerFactory* timerFactory, EntityCapsProvider* entityCapsProvider, HistoryController* historyController, MUCRegistry* mucRegistry, HighlightManager* highlightManager, std::shared_ptr<ChatMessageParser> chatMessageParser, AutoAcceptMUCInviteDecider* autoAcceptMUCInviteDecider);
diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h
index 1b97be8..da85949 100644
--- a/Swift/Controllers/Chat/ChatsManager.h
+++ b/Swift/Controllers/Chat/ChatsManager.h
@@ -71,7 +71,7 @@ namespace Swift {
             std::vector<ChatListWindow::Chat> getRecentChats() const;
             virtual std::vector<Contact::ref> getContacts(bool withMUCNicks);
 
-            boost::signal<void (bool supportsImpromptu)> onImpromptuMUCServiceDiscovered;
+            boost::signals2::signal<void (bool supportsImpromptu)> onImpromptuMUCServiceDiscovered;
 
         private:
             class SingleChatWindowFactoryAdapter : public ChatWindowFactory {
@@ -156,7 +156,7 @@ namespace Swift {
             std::shared_ptr<DiscoInfo> serverDiscoInfo_;
             ChatListWindow* chatListWindow_;
             JoinMUCWindow* joinMUCWindow_;
-            boost::bsignals::scoped_connection uiEventConnection_;
+            boost::signals2::scoped_connection uiEventConnection_;
             bool useDelayForLatency_;
             TimerFactory* timerFactory_;
             MUCRegistry* mucRegistry_;
diff --git a/Swift/Controllers/Chat/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index b2e2698..ec3f0c4 100644
--- a/Swift/Controllers/Chat/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -11,10 +11,10 @@
 #include <set>
 #include <string>
 
-#include <boost/signals/connection.hpp>
+#include <boost/signals2.hpp>
+#include <boost/signals2/connection.hpp>
 
 #include <Swiften/Base/Override.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/MUCOccupant.h>
 #include <Swiften/Elements/Message.h>
@@ -56,10 +56,10 @@ namespace Swift {
         public:
             MUCController(const JID& self, MUC::ref muc, const boost::optional<std::string>& password, const std::string &nick, StanzaChannel* stanzaChannel, IQRouter* iqRouter, ChatWindowFactory* chatWindowFactory, PresenceOracle* presenceOracle, AvatarManager* avatarManager, UIEventStream* events, bool useDelayForLatency, TimerFactory* timerFactory, EventController* eventController, EntityCapsProvider* entityCapsProvider, XMPPRoster* roster, HistoryController* historyController, MUCRegistry* mucRegistry, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, std::shared_ptr<ChatMessageParser> chatMessageParser, bool isImpromptu, AutoAcceptMUCInviteDecider* autoAcceptMUCInviteDecider, VCardManager* vcardManager, MUCBookmarkManager* mucBookmarkManager);
             virtual ~MUCController();
-            boost::signal<void ()> onUserLeft;
-            boost::signal<void ()> onUserJoined;
-            boost::signal<void ()> onImpromptuConfigCompleted;
-            boost::signal<void (const std::string&, const std::string& )> onUserNicknameChanged;
+            boost::signals2::signal<void ()> onUserLeft;
+            boost::signals2::signal<void ()> onUserJoined;
+            boost::signals2::signal<void ()> onImpromptuConfigCompleted;
+            boost::signals2::signal<void (const std::string&, const std::string& )> onUserNicknameChanged;
             virtual void setOnline(bool online) SWIFTEN_OVERRIDE;
             virtual void setAvailableServerFeatures(std::shared_ptr<DiscoInfo> info) SWIFTEN_OVERRIDE;
             void rejoin();
@@ -156,7 +156,7 @@ namespace Swift {
             bool lastWasPresence_;
             bool shouldJoinOnReconnect_;
             bool doneGettingHistory_;
-            boost::bsignals::scoped_connection avatarChangedConnection_;
+            boost::signals2::scoped_connection avatarChangedConnection_;
             std::shared_ptr<Timer> loginCheckTimer_;
             std::set<std::string> currentOccupants_;
             std::vector<NickJoinPart> joinParts_;
@@ -171,15 +171,15 @@ namespace Swift {
             std::string lastJoinMessageUID_;
 
             ClientBlockListManager* clientBlockListManager_;
-            boost::bsignals::scoped_connection blockingOnStateChangedConnection_;
-            boost::bsignals::scoped_connection blockingOnItemAddedConnection_;
-            boost::bsignals::scoped_connection blockingOnItemRemovedConnection_;
+            boost::signals2::scoped_connection blockingOnStateChangedConnection_;
+            boost::signals2::scoped_connection blockingOnItemAddedConnection_;
+            boost::signals2::scoped_connection blockingOnItemRemovedConnection_;
 
             boost::optional<ChatWindow::AlertID> blockedContactAlert_;
 
             MUCBookmarkManager* mucBookmarkManager_;
-            boost::bsignals::scoped_connection mucBookmarkManagerBookmarkAddedConnection_;
-            boost::bsignals::scoped_connection mucBookmarkManagerBookmarkRemovedConnection_;
+            boost::signals2::scoped_connection mucBookmarkManagerBookmarkAddedConnection_;
+            boost::signals2::scoped_connection mucBookmarkManagerBookmarkRemovedConnection_;
     };
 }
 
diff --git a/Swift/Controllers/Chat/MUCSearchController.h b/Swift/Controllers/Chat/MUCSearchController.h
index 99da8d0..f853bcd 100644
--- a/Swift/Controllers/Chat/MUCSearchController.h
+++ b/Swift/Controllers/Chat/MUCSearchController.h
@@ -11,7 +11,8 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Elements/ErrorPayload.h>
@@ -92,7 +93,7 @@ namespace Swift {
             void openSearchWindow();
 
         public:
-            boost::signal<void (const JID&)> onMUCSelected;
+            boost::signals2::signal<void (const JID&)> onMUCSelected;
 
         private:
             void handleSearchService(const JID& jid);
diff --git a/Swift/Controllers/Chat/UserSearchController.h b/Swift/Controllers/Chat/UserSearchController.h
index 1c2f40a..4658301 100644
--- a/Swift/Controllers/Chat/UserSearchController.h
+++ b/Swift/Controllers/Chat/UserSearchController.h
@@ -11,7 +11,8 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Elements/ErrorPayload.h>