Migrate to Boost.Signals2 from Boost.Signals

Boost.Signals was deprecated and is not improved further. This patch removes Boost.Signals from 3rdParty and adds Boost.Signals2 and its dependencies. Also removed the Qt signals compatibility file Swiften/Base/boost_bsignals.h. Test-Information: Build and ran unit tests on OS X 10.11.4. Confirmed successful login using Swift client. Change-Id: Ie6e3b2d15aac2462cda95401582f5287a479fb54
author: Tobias Markmann <tm@ayena.de> 2016-04-05 13:17:19 (GMT)
committer: Tobias Markmann <tm@ayena.de> 2016-04-05 19:42:39 (GMT)
commit: 2b560b129b7a31fc8cc07f618e763c95a22bf832 (patch)
tree: 73e72cdc758b79d01485dc28dcedd48b26859ae8 /Swift
parent: 3c560e31b0f168da917e8d566db01fd1cd997d86 (diff)
download: swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip
swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2
59 files changed, 234 insertions, 201 deletions
diff --git a/Swift/Controllers/AdHocController.h b/Swift/Controllers/AdHocController.h
index 33b22f8..a6a5c70 100644
--- a/Swift/Controllers/AdHocController.h
+++ b/Swift/Controllers/AdHocController.h
@@ -19,7 +19,7 @@ class AdHocController {
 public:
     AdHocController(AdHocCommandWindowFactory* factory, std::shared_ptr<OutgoingAdHocCommandSession> command);
     ~AdHocController();
-    boost::signal<void ()> onDeleting;
+    boost::signals2::signal<void ()> onDeleting;
     void setOnline(bool online);
 private:
     void handleWindowClosed();
diff --git a/Swift/Controllers/AdHocManager.h b/Swift/Controllers/AdHocManager.h
index 3a908ec..20e5db7 100644
--- a/Swift/Controllers/AdHocManager.h
+++ b/Swift/Controllers/AdHocManager.h
@@ -4,17 +4,21 @@
  * See the COPYING file for more information.
  */
 
+#pragma once
+
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/JID/JID.h>
+#include <boost/signals2.hpp>
+
+#include <Swiften/Client/Client.h>
+#include <Swiften/Disco/GetDiscoItemsRequest.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Elements/ErrorPayload.h>
-#include <Swiften/Disco/GetDiscoItemsRequest.h>
-#include <Swiften/Client/Client.h>
-#include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swiften/JID/JID.h>
+
 #include <Swift/Controllers/AdHocController.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
 
 namespace Swift {
 class IQRouter;
@@ -31,7 +35,7 @@ public:
 private:
     void handleServerDiscoItemsResponse(std::shared_ptr<DiscoItems>, ErrorPayload::ref error);
     void handleUIEvent(std::shared_ptr<UIEvent> event);
-    boost::signal<void (const AdHocController&)> onControllerComplete;
+    boost::signals2::signal<void (const AdHocController&)> onControllerComplete;
     JID jid_;
     IQRouter* iqRouter_;
     UIEventStream* uiEventStream_;
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>
diff --git a/Swift/Controllers/EventNotifier.h b/Swift/Controllers/EventNotifier.h
index e9c1466..b44615d 100644
--- a/Swift/Controllers/EventNotifier.h
+++ b/Swift/Controllers/EventNotifier.h
@@ -8,7 +8,8 @@
 
 #include <memory>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
@@ -29,7 +30,7 @@ namespace Swift {
             EventNotifier(EventController* eventController, Notifier* notifier, AvatarManager* avatarManager, NickResolver* nickResolver);
             ~EventNotifier();
 
-            boost::signal<void (const JID&)> onNotificationActivated;
+            boost::signals2::signal<void (const JID&)> onNotificationActivated;
 
         private:
             void handleEventAdded(std::shared_ptr<StanzaEvent>);
diff --git a/Swift/Controllers/EventWindowController.h b/Swift/Controllers/EventWindowController.h
index 7db7c25..aa730d0 100644
--- a/Swift/Controllers/EventWindowController.h
+++ b/Swift/Controllers/EventWindowController.h
@@ -23,7 +23,7 @@ namespace Swift {
             EventController* eventController_;
             EventWindowFactory* windowFactory_;
             EventWindow* window_;
-            boost::bsignals::scoped_connection eventAddedConnection_;
+            boost::signals2::scoped_connection eventAddedConnection_;
     };
 
 }
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index dd4e95c..65c2892 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -16,9 +16,9 @@
 
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/FileTransfer/FileReadBytestream.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 #include <Swiften/FileTransfer/OutgoingJingleFileTransfer.h>
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h
index 01d65e7..38dde0e 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.h
+++ b/Swift/Controllers/FileTransfer/FileTransferController.h
@@ -56,8 +56,8 @@ public:
     int getProgress() const;
     boost::uintmax_t getSize() const;
 
-    boost::signal<void ()> onStateChanged;
-    boost::signal<void ()> onProgressChange;
+    boost::signals2::signal<void ()> onStateChanged;
+    boost::signals2::signal<void ()> onProgressChange;
 
 private:
     void handleFileTransferStateChange(FileTransfer::State);
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
index a53b000..af2831c 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
@@ -14,9 +14,9 @@
 
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Base/foreach.h>
 #include <Swiften/FileTransfer/FileTransferManager.h>
 
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.h b/Swift/Controllers/FileTransfer/FileTransferOverview.h
index a55727c..c311cb7 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.h
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,7 +14,7 @@
 
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swift/Controllers/FileTransfer/FileTransferController.h>
 
@@ -33,8 +33,8 @@ public:
     void clearFinished();
     bool isClearable() const;
 
-    boost::signal<void (FileTransferController*)> onNewFileTransferController;
-    boost::signal<void ()> onFileTransferListChanged;
+    boost::signals2::signal<void (FileTransferController*)> onNewFileTransferController;
+    boost::signals2::signal<void ()> onFileTransferListChanged;
 
 private:
     void handleIncomingFileTransfer(IncomingFileTransfer::ref transfer);
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
index 783874a..5fb955c 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
@@ -13,8 +13,7 @@
 #pragma once
 
 #include <boost/cstdint.hpp>
-
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
 
@@ -26,7 +25,7 @@ public:
     void setBytesProcessed(int processedBytes);
 
     int getPercentage() const;
-    boost::signal<void (int)> onProgressPercentage;
+    boost::signals2::signal<void (int)> onProgressPercentage;
 
 private:
     boost::uintmax_t completeBytes;
diff --git a/Swift/Controllers/HighlightManager.cpp b/Swift/Controllers/HighlightManager.cpp
index 426afc1..fab0ac5 100644
--- a/Swift/Controllers/HighlightManager.cpp
+++ b/Swift/Controllers/HighlightManager.cpp
@@ -13,6 +13,7 @@
 #include <Swift/Controllers/HighlightManager.h>
 
 #include <cassert>
+#include <sstream>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/archive/text_iarchive.hpp>
diff --git a/Swift/Controllers/HighlightManager.h b/Swift/Controllers/HighlightManager.h
index 25503a7..a35e253 100644
--- a/Swift/Controllers/HighlightManager.h
+++ b/Swift/Controllers/HighlightManager.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swift/Controllers/HighlightRule.h>
 
@@ -60,7 +60,7 @@ namespace Swift {
             void storeSettings();
             void loadSettings();
 
-            boost::signal<void (const HighlightAction&)> onHighlight;
+            boost::signals2::signal<void (const HighlightAction&)> onHighlight;
 
         private:
             void handleSettingChanged(const std::string& settingPath);
@@ -73,7 +73,7 @@ namespace Swift {
             bool storingSettings_;
 
             std::shared_ptr<HighlightManager::HighlightRulesList> rules_;
-            boost::bsignals::scoped_connection handleSettingChangedConnection_;
+            boost::signals2::scoped_connection handleSettingChangedConnection_;
     };
 
     typedef std::shared_ptr<const HighlightManager::HighlightRulesList> HighlightRulesListPtr;
diff --git a/Swift/Controllers/HistoryController.h b/Swift/Controllers/HistoryController.h
index f1f613f..af70505 100644
--- a/Swift/Controllers/HistoryController.h
+++ b/Swift/Controllers/HistoryController.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -15,8 +15,8 @@
 #include <vector>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/History/HistoryMessage.h>
 #include <Swiften/History/HistoryStorage.h>
 
@@ -37,7 +37,7 @@ namespace Swift {
 
             boost::posix_time::ptime getLastTimeStampFromMUC(const JID& selfJID, const JID& mucJID);
 
-            boost::signal<void (const HistoryMessage&)> onNewMessage;
+            boost::signals2::signal<void (const HistoryMessage&)> onNewMessage;
 
         private:
             HistoryStorage* localHistory_;
diff --git a/Swift/Controllers/HistoryViewController.h b/Swift/Controllers/HistoryViewController.h
index 0ba681c..4c4d9f9 100644
--- a/Swift/Controllers/HistoryViewController.h
+++ b/Swift/Controllers/HistoryViewController.h
@@ -16,8 +16,8 @@
 #include <set>
 
 #include <boost/bind.hpp>
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/History/HistoryStorage.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Presence/PresenceOracle.h>
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index b5c8d79..5000d51 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -11,7 +11,8 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Client/ClientError.h>
 #include <Swiften/Client/ClientXMLTracer.h>
 #include <Swiften/Elements/CapsInfo.h>
diff --git a/Swift/Controllers/PresenceNotifier.h b/Swift/Controllers/PresenceNotifier.h
index defdd2f..82678be 100644
--- a/Swift/Controllers/PresenceNotifier.h
+++ b/Swift/Controllers/PresenceNotifier.h
@@ -9,8 +9,9 @@
 #include <memory>
 #include <set>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Avatars/AvatarManager.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Network/Timer.h>
@@ -31,7 +32,7 @@ namespace Swift {
 
             void setInitialQuietPeriodMS(int ms);
 
-            boost::signal<void (const JID&)> onNotificationActivated;
+            boost::signals2::signal<void (const JID&)> onNotificationActivated;
 
         private:
             void handlePresenceReceived(std::shared_ptr<Presence>);
diff --git a/Swift/Controllers/Roster/ContactRosterItem.h b/Swift/Controllers/Roster/ContactRosterItem.h
index 5cc722e..2ffec09 100644
--- a/Swift/Controllers/Roster/ContactRosterItem.h
+++ b/Swift/Controllers/Roster/ContactRosterItem.h
@@ -14,8 +14,8 @@
 #include <boost/bind.hpp>
 #include <boost/date_time/posix_time/ptime.hpp>
 #include <boost/filesystem/path.hpp>
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/MUCOccupant.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Elements/StatusShow.h>
@@ -77,7 +77,7 @@ class ContactRosterItem : public RosterItem {
         VCard::ref getVCard() const;
         void setVCard(VCard::ref vcard);
 
-        boost::signal<void ()> onVCardRequested;
+        boost::signals2::signal<void ()> onVCardRequested;
 
     private:
         JID jid_;
diff --git a/Swift/Controllers/Roster/GroupRosterItem.h b/Swift/Controllers/Roster/GroupRosterItem.h
index 760b008..a4e008f 100644
--- a/Swift/Controllers/Roster/GroupRosterItem.h
+++ b/Swift/Controllers/Roster/GroupRosterItem.h
@@ -25,12 +25,12 @@ class GroupRosterItem : public RosterItem {
         GroupRosterItem* removeGroupChild(const std::string& group);
         void removeAll();
         void setDisplayed(RosterItem* item, bool displayed);
-        boost::signal<void ()> onChildrenChanged;
+        boost::signals2::signal<void ()> onChildrenChanged;
         static bool itemLessThanWithStatus(const RosterItem* left, const RosterItem* right);
         static bool itemLessThanWithoutStatus(const RosterItem* left, const RosterItem* right);
         void setExpanded(bool expanded);
         bool isExpanded() const;
-        boost::signal<void (bool)> onExpandedChanged;
+        boost::signals2::signal<void (bool)> onExpandedChanged;
         void setManualSort(const std::string& manualSortValue);
         virtual const std::string& getSortableDisplayName() const;
     private:
diff --git a/Swift/Controllers/Roster/Roster.h b/Swift/Controllers/Roster/Roster.h
index 3bd9ec0..ee5a476 100644
--- a/Swift/Controllers/Roster/Roster.h
+++ b/Swift/Controllers/Roster/Roster.h
@@ -12,7 +12,8 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
@@ -44,12 +45,12 @@ class Roster {
         std::set<JID> getJIDs() const;
 
         std::vector<RosterFilter*> getFilters() {return filters_;}
-        boost::signal<void (GroupRosterItem*)> onChildrenChanged;
-        boost::signal<void (GroupRosterItem*)> onGroupAdded;
-        boost::signal<void (RosterItem*)> onDataChanged;
-        boost::signal<void (JID&)> onVCardUpdateRequested;
-        boost::signal<void (RosterFilter* filter)> onFilterAdded;
-        boost::signal<void (RosterFilter* filter)> onFilterRemoved;
+        boost::signals2::signal<void (GroupRosterItem*)> onChildrenChanged;
+        boost::signals2::signal<void (GroupRosterItem*)> onGroupAdded;
+        boost::signals2::signal<void (RosterItem*)> onDataChanged;
+        boost::signals2::signal<void (JID&)> onVCardUpdateRequested;
+        boost::signals2::signal<void (RosterFilter* filter)> onFilterAdded;
+        boost::signals2::signal<void (RosterFilter* filter)> onFilterRemoved;
         GroupRosterItem* getGroup(const std::string& groupName);
         void setBlockingSupported(bool isSupported);
 
diff --git a/Swift/Controllers/Roster/RosterController.h b/Swift/Controllers/Roster/RosterController.h
index 333a0a5..980c545 100644
--- a/Swift/Controllers/Roster/RosterController.h
+++ b/Swift/Controllers/Roster/RosterController.h
@@ -10,8 +10,9 @@
 #include <set>
 #include <string>
 
+#include <boost/signals2.hpp>
+
 #include <Swiften/Avatars/AvatarManager.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Elements/RosterPayload.h>
@@ -53,8 +54,8 @@ namespace Swift {
             void showRosterWindow();
             void setJID(const JID& jid) { myJID_ = jid; }
             MainWindow* getWindow() {return mainWindow_;}
-            boost::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
-            boost::signal<void ()> onSignOutRequest;
+            boost::signals2::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
+            boost::signals2::signal<void ()> onSignOutRequest;
             void handleOwnVCardChanged(VCard::ref vcard);
             void handleAvatarChanged(const JID& jid);
             void handlePresenceChanged(Presence::ref presence);
@@ -115,11 +116,11 @@ namespace Swift {
             RosterVCardProvider* rosterVCardProvider_;
             std::shared_ptr<ContactRosterItem> ownContact_;
 
-            boost::bsignals::scoped_connection blockingOnStateChangedConnection_;
-            boost::bsignals::scoped_connection blockingOnItemAddedConnection_;
-            boost::bsignals::scoped_connection blockingOnItemRemovedConnection_;
-            boost::bsignals::scoped_connection changeStatusConnection_;
-            boost::bsignals::scoped_connection signOutConnection_;
-            boost::bsignals::scoped_connection uiEventConnection_;
+            boost::signals2::scoped_connection blockingOnStateChangedConnection_;
+            boost::signals2::scoped_connection blockingOnItemAddedConnection_;
+            boost::signals2::scoped_connection blockingOnItemRemovedConnection_;
+            boost::signals2::scoped_connection changeStatusConnection_;
+            boost::signals2::scoped_connection signOutConnection_;
+            boost::signals2::scoped_connection uiEventConnection_;
     };
 }
diff --git a/Swift/Controllers/Roster/RosterItem.h b/Swift/Controllers/Roster/RosterItem.h
index 2c51ae9..b834785 100644
--- a/Swift/Controllers/Roster/RosterItem.h
+++ b/Swift/Controllers/Roster/RosterItem.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
 class GroupRosterItem;
@@ -17,7 +17,7 @@ class RosterItem {
     public:
         RosterItem(const std::string& name, GroupRosterItem* parent);
         virtual ~RosterItem();
-        boost::signal<void ()> onDataChanged;
+        boost::signals2::signal<void ()> onDataChanged;
         GroupRosterItem* getParent() const;
         void setDisplayName(const std::string& name);
         const std::string& getDisplayName() const;
diff --git a/Swift/Controllers/Roster/RosterVCardProvider.h b/Swift/Controllers/Roster/RosterVCardProvider.h
index a697dae..337b0b2 100644
--- a/Swift/Controllers/Roster/RosterVCardProvider.h
+++ b/Swift/Controllers/Roster/RosterVCardProvider.h
@@ -4,11 +4,17 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
-#include <boost/signals/connection.hpp>
+#include <boost/signals2.hpp>
+#include <boost/signals2/connection.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/VCard.h>
 #include <Swiften/JID/JID.h>
 
@@ -30,8 +36,8 @@ class RosterVCardProvider {
         Roster* roster_;
         VCardManager* vcardManager_;
         JID::CompareType compareType_;
-        boost::bsignals::scoped_connection vcardUpdateRequestedConnection;
-        boost::bsignals::scoped_connection vcardChangedConnection;
+        boost::signals2::scoped_connection vcardUpdateRequestedConnection;
+        boost::signals2::scoped_connection vcardChangedConnection;
 };
 
 }
diff --git a/Swift/Controllers/Roster/TableRoster.h b/Swift/Controllers/Roster/TableRoster.h
index 19a4ec6..22c9ca9 100644
--- a/Swift/Controllers/Roster/TableRoster.h
+++ b/Swift/Controllers/Roster/TableRoster.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include <boost/filesystem/path.hpp>
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/StatusShow.h>
 #include <Swiften/JID/JID.h>
 
@@ -61,7 +61,7 @@ namespace Swift {
 
             const Item& getItem(const Index&) const;
 
-            boost::signal<void (const Update&)> onUpdate;
+            boost::signals2::signal<void (const Update&)> onUpdate;
 
         private:
             void handleUpdateTimerTick();
diff --git a/Swift/Controllers/Settings/SettingsProvider.h b/Swift/Controllers/Settings/SettingsProvider.h
index a804235..1e9805a 100644
--- a/Swift/Controllers/Settings/SettingsProvider.h
+++ b/Swift/Controllers/Settings/SettingsProvider.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
 
@@ -65,7 +65,7 @@ class SettingsProvider {
         /**
          * Emitted when a setting is changed.
          */
-        boost::signal<void (const std::string& /*Setting's Path*/)> onSettingChanged;
+        boost::signals2::signal<void (const std::string& /*Setting's Path*/)> onSettingChanged;
 };
 
 }
diff --git a/Swift/Controllers/UIEvents/UIEventStream.h b/Swift/Controllers/UIEvents/UIEventStream.h
index 977f1d3..e6e3f80 100644
--- a/Swift/Controllers/UIEvents/UIEventStream.h
+++ b/Swift/Controllers/UIEvents/UIEventStream.h
@@ -8,14 +8,14 @@
 
 #include <memory>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swift/Controllers/UIEvents/UIEvent.h>
 
 namespace Swift {
     class UIEventStream {
         public:
-            boost::signal<void (std::shared_ptr<UIEvent>)> onUIEvent;
+            boost::signals2::signal<void (std::shared_ptr<UIEvent>)> onUIEvent;
 
             void send(std::shared_ptr<UIEvent> event) {
                 onUIEvent(event);
diff --git a/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h b/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h
index 06d3988..ceb1531 100644
--- a/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h
+++ b/Swift/Controllers/UIInterfaces/AdHocCommandWindow.h
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
     class AdHocCommandWindow {
         public:
             virtual ~AdHocCommandWindow() {}
             virtual void setOnline(bool /*online*/) {}
-            boost::signal<void ()> onClosing;
+            boost::signals2::signal<void ()> onClosing;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h b/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h
index ebfa0c4..58b45d0 100644
--- a/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h
+++ b/Swift/Controllers/UIInterfaces/BlockListEditorWidget.h
@@ -14,7 +14,8 @@
 
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
@@ -34,7 +35,7 @@ namespace Swift {
 
             virtual std::vector<JID> getCurrentBlockList() const = 0;
 
-            boost::signal<void (const std::vector<JID>& /* blockedJID */)> onSetNewBlockList;
+            boost::signals2::signal<void (const std::vector<JID>& /* blockedJID */)> onSetNewBlockList;
     };
 
 }
diff --git a/Swift/Controllers/UIInterfaces/ChatListWindow.h b/Swift/Controllers/UIInterfaces/ChatListWindow.h
index 5d470cc..c84d130 100644
--- a/Swift/Controllers/UIInterfaces/ChatListWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatListWindow.h
@@ -12,8 +12,8 @@
 #include <set>
 
 #include <boost/filesystem/path.hpp>
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/StatusShow.h>
 #include <Swiften/MUC/MUCBookmark.h>
@@ -93,9 +93,9 @@ namespace Swift {
             virtual void clearBookmarks() = 0;
             virtual void setOnline(bool isOnline) = 0;
 
-            boost::signal<void (const MUCBookmark&)> onMUCBookmarkActivated;
-            boost::signal<void (const Chat&)> onRecentActivated;
-            boost::signal<void (const JID&)> onWhiteboardActivated;
-            boost::signal<void ()> onClearRecentsRequested;
+            boost::signals2::signal<void (const MUCBookmark&)> onMUCBookmarkActivated;
+            boost::signals2::signal<void (const Chat&)> onRecentActivated;
+            boost::signals2::signal<void (const JID&)> onWhiteboardActivated;
+            boost::signals2::signal<void ()> onClearRecentsRequested;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 28bf543..2636bda 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -13,9 +13,9 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/Tristate.h>
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ChatState.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Elements/MUCOccupant.h>
@@ -218,40 +218,40 @@ namespace Swift {
              */
             virtual void showRoomConfigurationForm(Form::ref) = 0;
 
-            boost::signal<void ()> onClosed;
-            boost::signal<void ()> onAllMessagesRead;
-            boost::signal<void (const std::string&, bool isCorrection)> onSendMessageRequest;
-            boost::signal<void ()> onSendCorrectionMessageRequest;
-            boost::signal<void ()> onUserTyping;
-            boost::signal<void ()> onUserCancelsTyping;
-            boost::signal<void ()> onAlertButtonClicked;
-            boost::signal<void (ContactRosterItem*)> onOccupantSelectionChanged;
-            boost::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected;
-            boost::signal<void (const std::string&)> onChangeSubjectRequest;
-            boost::signal<void ()> onBookmarkRequest;
-            boost::signal<void (Form::ref)> onConfigureRequest;
-            boost::signal<void ()> onDestroyRequest;
-            boost::signal<void (const std::vector<JID>&)> onInviteToChat;
-            boost::signal<void ()> onConfigurationFormCancelled;
-            boost::signal<void ()> onGetAffiliationsRequest;
-            boost::signal<void (MUCOccupant::Affiliation, const JID&)> onSetAffiliationRequest;
-            boost::signal<void (const std::vector<std::pair<MUCOccupant::Affiliation, JID> >& changes)> onChangeAffiliationsRequest;
-            boost::signal<void ()> onLogCleared;
+            boost::signals2::signal<void ()> onClosed;
+            boost::signals2::signal<void ()> onAllMessagesRead;
+            boost::signals2::signal<void (const std::string&, bool isCorrection)> onSendMessageRequest;
+            boost::signals2::signal<void ()> onSendCorrectionMessageRequest;
+            boost::signals2::signal<void ()> onUserTyping;
+            boost::signals2::signal<void ()> onUserCancelsTyping;
+            boost::signals2::signal<void ()> onAlertButtonClicked;
+            boost::signals2::signal<void (ContactRosterItem*)> onOccupantSelectionChanged;
+            boost::signals2::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected;
+            boost::signals2::signal<void (const std::string&)> onChangeSubjectRequest;
+            boost::signals2::signal<void ()> onBookmarkRequest;
+            boost::signals2::signal<void (Form::ref)> onConfigureRequest;
+            boost::signals2::signal<void ()> onDestroyRequest;
+            boost::signals2::signal<void (const std::vector<JID>&)> onInviteToChat;
+            boost::signals2::signal<void ()> onConfigurationFormCancelled;
+            boost::signals2::signal<void ()> onGetAffiliationsRequest;
+            boost::signals2::signal<void (MUCOccupant::Affiliation, const JID&)> onSetAffiliationRequest;
+            boost::signals2::signal<void (const std::vector<std::pair<MUCOccupant::Affiliation, JID> >& changes)> onChangeAffiliationsRequest;
+            boost::signals2::signal<void ()> onLogCleared;
 
             // File transfer related
-            boost::signal<void (std::string /* id */)> onFileTransferCancel;
-            boost::signal<void (std::string /* id */, std::string /* description */)> onFileTransferStart;
-            boost::signal<void (std::string /* id */, std::string /* path */)> onFileTransferAccept;
-            boost::signal<void (std::string /* path */)> onSendFileRequest;
+            boost::signals2::signal<void (std::string /* id */)> onFileTransferCancel;
+            boost::signals2::signal<void (std::string /* id */, std::string /* description */)> onFileTransferStart;
+            boost::signals2::signal<void (std::string /* id */, std::string /* path */)> onFileTransferAccept;
+            boost::signals2::signal<void (std::string /* path */)> onSendFileRequest;
 
             //Whiteboard related
-            boost::signal<void ()> onWhiteboardSessionAccept;
-            boost::signal<void ()> onWhiteboardSessionCancel;
-            boost::signal<void ()> onWhiteboardWindowShow;
+            boost::signals2::signal<void ()> onWhiteboardSessionAccept;
+            boost::signals2::signal<void ()> onWhiteboardSessionCancel;
+            boost::signals2::signal<void ()> onWhiteboardWindowShow;
 
             // Blocking Command related
-            boost::signal<void ()> onBlockUserRequest;
-            boost::signal<void ()> onUnblockUserRequest;
+            boost::signals2::signal<void ()> onBlockUserRequest;
+            boost::signals2::signal<void ()> onUnblockUserRequest;
     };
 }
 
diff --git a/Swift/Controllers/UIInterfaces/ContactEditWindow.h b/Swift/Controllers/UIInterfaces/ContactEditWindow.h
index 9aa2dcb..1e311c5 100644
--- a/Swift/Controllers/UIInterfaces/ContactEditWindow.h
+++ b/Swift/Controllers/UIInterfaces/ContactEditWindow.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
     class JID;
@@ -29,7 +29,7 @@ namespace Swift {
             virtual void show() = 0;
             virtual void hide() = 0;
 
-            boost::signal<void ()> onRemoveContactRequest;
-            boost::signal<void (const std::string& /* name */, const std::set<std::string>& /* groups */)> onChangeContactRequest;
+            boost::signals2::signal<void ()> onRemoveContactRequest;
+            boost::signals2::signal<void (const std::string& /* name */, const std::set<std::string>& /* groups */)> onChangeContactRequest;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h b/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h
index 8cca4f9..cae54dc 100644
--- a/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h
+++ b/Swift/Controllers/UIInterfaces/HighlightEditorWindow.h
@@ -1,11 +1,15 @@
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
+#pragma once
+
 #include <vector>
-#include <Swiften/Base/boost_bsignals.h>
+
+#include <boost/signals2.hpp>
+
 #include <Swift/Controllers/Contact.h>
 
 namespace Swift {
@@ -21,7 +25,7 @@ public:
     virtual void setContactSuggestions(const std::vector<Contact::ref>& suggestions) = 0;
 
 public:
-    boost::signal<void (const std::string&)> onContactSuggestionsRequested;
+    boost::signals2::signal<void (const std::string&)> onContactSuggestionsRequested;
 };
 
 }
diff --git a/Swift/Controllers/UIInterfaces/HistoryWindow.h b/Swift/Controllers/UIInterfaces/HistoryWindow.h
index db1a4b1..413d9d6 100644
--- a/Swift/Controllers/UIInterfaces/HistoryWindow.h
+++ b/Swift/Controllers/UIInterfaces/HistoryWindow.h
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <Swift/Controllers/Roster/Roster.h>
@@ -23,12 +29,12 @@ namespace Swift {
             virtual std::string getSearchBoxText() = 0;
             virtual boost::gregorian::date getLastVisibleDate() = 0;
 
-            boost::signal<void (RosterItem*)> onSelectedContactChanged;
-            boost::signal<void (const std::string&)> onReturnPressed;
-            boost::signal<void (const boost::gregorian::date&)> onScrollReachedTop;
-            boost::signal<void (const boost::gregorian::date&)> onScrollReachedBottom;
-            boost::signal<void ()> onPreviousButtonClicked;
-            boost::signal<void ()> onNextButtonClicked;
-            boost::signal<void (const boost::gregorian::date&)> onCalendarClicked;
+            boost::signals2::signal<void (RosterItem*)> onSelectedContactChanged;
+            boost::signals2::signal<void (const std::string&)> onReturnPressed;
+            boost::signals2::signal<void (const boost::gregorian::date&)> onScrollReachedTop;
+            boost::signals2::signal<void (const boost::gregorian::date&)> onScrollReachedBottom;
+            boost::signals2::signal<void ()> onPreviousButtonClicked;
+            boost::signals2::signal<void ()> onNextButtonClicked;
+            boost::signals2::signal<void (const boost::gregorian::date&)> onCalendarClicked;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/JoinMUCWindow.h b/Swift/Controllers/UIInterfaces/JoinMUCWindow.h
index 4d6cea1..7a71195 100644
--- a/Swift/Controllers/UIInterfaces/JoinMUCWindow.h
+++ b/Swift/Controllers/UIInterfaces/JoinMUCWindow.h
@@ -9,7 +9,8 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/JID/JID.h>
 
 namespace Swift {
@@ -21,6 +22,6 @@ namespace Swift {
             virtual void setMUC(const std::string& nick) = 0;
             virtual void show() = 0;
 
-            boost::signal<void ()> onSearchMUC;
+            boost::signals2::signal<void ()> onSearchMUC;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/LoginWindow.h b/Swift/Controllers/UIInterfaces/LoginWindow.h
index 4518469..d11aadb 100644
--- a/Swift/Controllers/UIInterfaces/LoginWindow.h
+++ b/Swift/Controllers/UIInterfaces/LoginWindow.h
@@ -9,7 +9,8 @@
 #include <memory>
 #include <string>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Client/ClientOptions.h>
 #include <Swiften/TLS/Certificate.h>
 #include <Swiften/TLS/CertificateWithKey.h>
@@ -28,14 +29,14 @@ namespace Swift {
             virtual void addAvailableAccount(const std::string& defaultJID, const std::string& defaultPassword, const std::string& defaultCertificate, const ClientOptions& options) = 0;
             virtual void removeAvailableAccount(const std::string& jid) = 0;
             /** The certificate is what is used for login, the certificatePath is used for remembering paths to populate the loginwindow with*/
-            boost::signal<void (const std::string&, const std::string&, const std::string& /*CertificatePath*/, CertificateWithKey::ref /* clientCertificate */, const ClientOptions& /*options*/, bool /* remember password*/, bool /* login automatically */)> onLoginRequest;
+            boost::signals2::signal<void (const std::string&, const std::string&, const std::string& /*CertificatePath*/, CertificateWithKey::ref /* clientCertificate */, const ClientOptions& /*options*/, bool /* remember password*/, bool /* login automatically */)> onLoginRequest;
             virtual void setLoginAutomatically(bool loginAutomatically) = 0;
             virtual void quit() = 0;
             /** Blocking request whether a cert should be permanently trusted.*/
             virtual bool askUserToTrustCertificatePermanently(const std::string& message, const std::vector<Certificate::ref>& certificateChain) = 0;
 
-            boost::signal<void ()> onCancelLoginRequest;
-            boost::signal<void ()> onQuitRequest;
-            boost::signal<void (const std::string&)> onPurgeSavedLoginRequest;
+            boost::signals2::signal<void ()> onCancelLoginRequest;
+            boost::signals2::signal<void ()> onQuitRequest;
+            boost::signals2::signal<void (const std::string&)> onPurgeSavedLoginRequest;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
index d6c0065..045c2df 100644
--- a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
+++ b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
@@ -10,8 +10,8 @@
 #include <vector>
 
 #include <boost/optional.hpp>
+#include <boost/signals2.hpp>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/Chat/MUCSearchController.h>
@@ -29,7 +29,7 @@ namespace Swift {
 
             virtual void show() = 0;
 
-            boost::signal<void (const JID&)> onSearchService;
-            boost::signal<void (const boost::optional<JID>&)> onFinished;
+            boost::signals2::signal<void (const JID&)> onSearchService;
+            boost::signals2::signal<void (const boost::optional<JID>&)> onFinished;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h
index ed225d8..bfd8c67 100644
--- a/Swift/Controllers/UIInterfaces/MainWindow.h
+++ b/Swift/Controllers/UIInterfaces/MainWindow.h
@@ -9,7 +9,8 @@
 #include <memory>
 #include <string>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Elements/StatusShow.h>
 #include <Swiften/JID/JID.h>
@@ -43,9 +44,9 @@ namespace Swift {
             virtual void setStreamEncryptionStatus(bool tlsInPlaceAndValid) = 0;
             virtual void openCertificateDialog(const std::vector<Certificate::ref>& chain) = 0;
 
-            boost::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
-            boost::signal<void ()> onSignOutRequest;
-            boost::signal<void ()> onShowCertificateRequest;
+            boost::signals2::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
+            boost::signals2::signal<void ()> onSignOutRequest;
+            boost::signals2::signal<void ()> onShowCertificateRequest;
 
         private:
             bool canDelete_;
diff --git a/Swift/Controllers/UIInterfaces/ProfileWindow.h b/Swift/Controllers/UIInterfaces/ProfileWindow.h
index 27b0d1a..c2bcdae 100644
--- a/Swift/Controllers/UIInterfaces/ProfileWindow.h
+++ b/Swift/Controllers/UIInterfaces/ProfileWindow.h
@@ -8,7 +8,8 @@
 
 #include <memory>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Elements/VCard.h>
 
 namespace Swift {
@@ -29,7 +30,7 @@ namespace Swift {
             virtual void show() = 0;
             virtual void hide() = 0;
 
-            boost::signal<void (VCard::ref)> onVCardChangeRequest;
-            boost::signal<void (const JID&)> onWindowAboutToBeClosed;
+            boost::signals2::signal<void (VCard::ref)> onVCardChangeRequest;
+            boost::signals2::signal<void (const JID&)> onWindowAboutToBeClosed;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/UserSearchWindow.h b/Swift/Controllers/UIInterfaces/UserSearchWindow.h
index 55bd117..be17dc0 100644
--- a/Swift/Controllers/UIInterfaces/UserSearchWindow.h
+++ b/Swift/Controllers/UIInterfaces/UserSearchWindow.h
@@ -9,7 +9,8 @@
 #include <string>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/Chat/UserSearchController.h>
@@ -45,12 +46,12 @@ namespace Swift {
 
             virtual void show() = 0;
 
-            boost::signal<void (const JID&)> onFormRequested;
-            boost::signal<void (std::shared_ptr<SearchPayload>, const JID&)> onSearchRequested;
-            boost::signal<void (const JID&)> onNameSuggestionRequested;
-            boost::signal<void (const std::string&)> onContactSuggestionsRequested;
-            boost::signal<void (const std::vector<JID>&)> onJIDUpdateRequested;
-            boost::signal<void (const std::vector<JID>&)> onJIDAddRequested;
-            boost::signal<void (const JID&)> onJIDEditFieldChanged;
+            boost::signals2::signal<void (const JID&)> onFormRequested;
+            boost::signals2::signal<void (std::shared_ptr<SearchPayload>, const JID&)> onSearchRequested;
+            boost::signals2::signal<void (const JID&)> onNameSuggestionRequested;
+            boost::signals2::signal<void (const std::string&)> onContactSuggestionsRequested;
+            boost::signals2::signal<void (const std::vector<JID>&)> onJIDUpdateRequested;
+            boost::signals2::signal<void (const std::vector<JID>&)> onJIDAddRequested;
+            boost::signals2::signal<void (const JID&)> onJIDEditFieldChanged;
     };
 }
diff --git a/Swift/Controllers/UIInterfaces/WhiteboardWindow.h b/Swift/Controllers/UIInterfaces/WhiteboardWindow.h
index 28348df..a904ee1 100644
--- a/Swift/Controllers/UIInterfaces/WhiteboardWindow.h
+++ b/Swift/Controllers/UIInterfaces/WhiteboardWindow.h
@@ -14,7 +14,7 @@
 
 #include <string>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
     class WhiteboardSession;
diff --git a/Swift/Controllers/WhiteboardManager.h b/Swift/Controllers/WhiteboardManager.h
index a5ca933..3ef14ab 100644
--- a/Swift/Controllers/WhiteboardManager.h
+++ b/Swift/Controllers/WhiteboardManager.h
@@ -36,10 +36,10 @@ namespace Swift {
         WhiteboardWindow* createNewWhiteboardWindow(const JID& contact, WhiteboardSession::ref session);
 
     public:
-        boost::signal< void (const JID&, bool senderIsSelf)> onSessionRequest;
-        boost::signal< void (const JID&)> onSessionTerminate;
-        boost::signal< void (const JID&)> onRequestAccepted;
-        boost::signal< void (const JID&)> onRequestRejected;
+        boost::signals2::signal< void (const JID&, bool senderIsSelf)> onSessionRequest;
+        boost::signals2::signal< void (const JID&)> onSessionTerminate;
+        boost::signals2::signal< void (const JID&)> onRequestAccepted;
+        boost::signals2::signal< void (const JID&)> onRequestRejected;
 
     private:
         void handleUIEvent(std::shared_ptr<UIEvent> event);
@@ -58,7 +58,7 @@ namespace Swift {
         WhiteboardWindowFactory* whiteboardWindowFactory_;
         UIEventStream* uiEventStream_;
         NickResolver* nickResolver_;
-        boost::bsignals::scoped_connection uiEventConnection_;
+        boost::signals2::scoped_connection uiEventConnection_;
         WhiteboardSessionManager* whiteboardSessionManager_;
     };
 }
diff --git a/Swift/Controllers/XMLConsoleController.h b/Swift/Controllers/XMLConsoleController.h
index 16278a3..56202b4 100644
--- a/Swift/Controllers/XMLConsoleController.h
+++ b/Swift/Controllers/XMLConsoleController.h
@@ -9,9 +9,9 @@
 #include <memory>
 
 #include <boost/bind.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/SafeByteArray.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 
diff --git a/Swift/Controllers/XMPPEvents/ErrorEvent.h b/Swift/Controllers/XMPPEvents/ErrorEvent.h
index f3888cb..c0b5e52 100644
--- a/Swift/Controllers/XMPPEvents/ErrorEvent.h
+++ b/Swift/Controllers/XMPPEvents/ErrorEvent.h
@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
diff --git a/Swift/Controllers/XMPPEvents/EventController.h b/Swift/Controllers/XMPPEvents/EventController.h
index 1e198cb..8a095d9 100644
--- a/Swift/Controllers/XMPPEvents/EventController.h
+++ b/Swift/Controllers/XMPPEvents/EventController.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <vector>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swift/Controllers/XMPPEvents/MessageEvent.h>
 #include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
@@ -22,8 +22,8 @@ namespace Swift {
             ~EventController();
 
             void handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEvent);
-            boost::signal<void (int)> onEventQueueLengthChange;
-            boost::signal<void (std::shared_ptr<StanzaEvent>)> onEventQueueEventAdded;
+            boost::signals2::signal<void (int)> onEventQueueLengthChange;
+            boost::signals2::signal<void (std::shared_ptr<StanzaEvent>)> onEventQueueEventAdded;
             const EventList& getEvents() const {return events_;}
             void disconnectAll();
             void clear();
diff --git a/Swift/Controllers/XMPPEvents/StanzaEvent.h b/Swift/Controllers/XMPPEvents/StanzaEvent.h
index 0ddcdbe..56c4ea3 100644
--- a/Swift/Controllers/XMPPEvents/StanzaEvent.h
+++ b/Swift/Controllers/XMPPEvents/StanzaEvent.h
@@ -9,8 +9,7 @@
 #include <memory>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
-
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
     class StanzaEvent {
@@ -20,7 +19,7 @@ namespace Swift {
             void conclude() {concluded_ = true; onConclusion();}
             /** Do not call this directly from outside the class.
              * If you connect to this signal, you *must* disconnect from it manually. */
-            boost::signal<void()> onConclusion;
+            boost::signals2::signal<void()> onConclusion;
             bool getConcluded() {return concluded_;}
             boost::posix_time::ptime getTime() {return time_;}
         private:
diff --git a/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h b/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
index 85d3722..8e3fd32 100644
--- a/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
+++ b/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
@@ -10,7 +10,8 @@
 #include <memory>
 #include <string>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
+
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
@@ -22,8 +23,8 @@ namespace Swift {
             virtual ~SubscriptionRequestEvent(){}
             const JID& getJID() const {return jid_;}
             const std::string& getReason() const {return reason_;}
-            boost::signal<void()> onAccept;
-            boost::signal<void()> onDecline;
+            boost::signals2::signal<void()> onAccept;
+            boost::signals2::signal<void()> onDecline;
             void accept() {
                 onAccept();
                 conclude();
diff --git a/Swift/Controllers/XMPPURIController.h b/Swift/Controllers/XMPPURIController.h
index 4d2fb5c..941441f 100644
--- a/Swift/Controllers/XMPPURIController.h
+++ b/Swift/Controllers/XMPPURIController.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 namespace Swift {
     class URIHandler;
@@ -20,8 +20,8 @@ namespace Swift {
             XMPPURIController(URIHandler* uriHandler, UIEventStream* uiEventStream);
             ~XMPPURIController();
 
-            boost::signal<void (const JID&)> onStartChat;
-            boost::signal<void (const JID&)> onJoinMUC;
+            boost::signals2::signal<void (const JID&)> onStartChat;
+            boost::signals2::signal<void (const JID&)> onJoinMUC;
 
         private:
             void handleURI(const std::string&);
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp
index d070391..24d6dd1 100644
--- a/Swift/QtUI/QtFileTransferListItemModel.cpp
+++ b/Swift/QtUI/QtFileTransferListItemModel.cpp
@@ -14,9 +14,9 @@
 
 #include <boost/bind.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/FileSize.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 #include <Swift/Controllers/FileTransfer/FileTransferController.h>
 #include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
diff --git a/Swift/QtUI/QtMUCConfigurationWindow.h b/Swift/QtUI/QtMUCConfigurationWindow.h
index c8835e4..da3e12a 100644
--- a/Swift/QtUI/QtMUCConfigurationWindow.h
+++ b/Swift/QtUI/QtMUCConfigurationWindow.h
@@ -6,11 +6,12 @@
 
 #pragma once
 
+#include <boost/signals2.hpp>
+
 #include <QLabel>
 #include <QPushButton>
 #include <QWidget>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/Form.h>
 
 class QBoxLayout;
@@ -23,8 +24,8 @@ namespace Swift {
         public:
             QtMUCConfigurationWindow(Form::ref form);
             virtual ~QtMUCConfigurationWindow();
-            boost::signal<void (Form::ref)> onFormComplete;
-            boost::signal<void ()> onFormCancelled;
+            boost::signals2::signal<void (Form::ref)> onFormComplete;
+            boost::signals2::signal<void ()> onFormCancelled;
         private slots:
             void handleCancelClicked();
             void handleOKClicked();
diff --git a/Swift/QtUI/Roster/QtOccupantListWidget.h b/Swift/QtUI/Roster/QtOccupantListWidget.h
index 78be276..0f80943 100644
--- a/Swift/QtUI/Roster/QtOccupantListWidget.h
+++ b/Swift/QtUI/Roster/QtOccupantListWidget.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
+#include <boost/signals2.hpp>
 
 #include <Swift/Controllers/UIInterfaces/ChatWindow.h>
 
@@ -21,7 +21,7 @@ class QtOccupantListWidget : public QtTreeWidget {
         QtOccupantListWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget privateMessageTarget, QWidget* parent = nullptr);
         virtual ~QtOccupantListWidget();
         void setAvailableOccupantActions(const std::vector<ChatWindow::OccupantAction>& actions);
-        boost::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected;
+        boost::signals2::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected;
     protected:
         void contextMenuEvent(QContextMenuEvent* event);
     private:
diff --git a/Swift/QtUI/Roster/QtTreeWidget.h b/Swift/QtUI/Roster/QtTreeWidget.h
index c3ed5a2..b22f6bb 100644
--- a/Swift/QtUI/Roster/QtTreeWidget.h
+++ b/Swift/QtUI/Roster/QtTreeWidget.h
@@ -39,7 +39,7 @@ class QtTreeWidget : public QTreeView {
         void setOnline(bool isOnline);
 
     public:
-        boost::signal<void (RosterItem*)> onSomethingSelectedChanged;
+        boost::signals2::signal<void (RosterItem*)> onSomethingSelectedChanged;
 
     private slots:
         void handleItemActivated(const QModelIndex&);
diff --git a/Swift/QtUI/UserSearch/ContactListModel.h b/Swift/QtUI/UserSearch/ContactListModel.h
index 9b61484..026b01b 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.h
+++ b/Swift/QtUI/UserSearch/ContactListModel.h
@@ -15,11 +15,10 @@
 #include <vector>
 
 #include <boost/bind.hpp>
+#include <boost/signals2.hpp>
 
 #include <QAbstractItemModel>
 
-#include <Swiften/Base/boost_bsignals.h>
-
 #include <Swift/Controllers/Contact.h>
 
 #include <Swift/QtUI/ChatList/ChatListGroupItem.h>
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index e9a26ea..d20c285 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -13,14 +13,13 @@
 #include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h>
 
 #include <boost/bind.hpp>
+#include <boost/signals2.hpp>
 
 #include <QAbstractItemView>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QKeyEvent>
 
-#include <Swiften/Base/boost_bsignals.h>
-
 #include <Swift/Controllers/Settings/SettingsProvider.h>
 
 #include <Swift/QtUI/QtSwiftUtil.h>
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
index 2077d55..402667d 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
@@ -12,11 +12,11 @@
 
 #pragma once
 
+#include <boost/signals2.hpp>
+
 #include <QLineEdit>
 #include <QTreeView>
 
-#include <Swiften/Base/boost_bsignals.h>
-
 #include <Swift/Controllers/Contact.h>
 
 namespace Swift {
@@ -37,7 +37,7 @@ class QtSuggestingJIDInput : public QLineEdit {
 
         void clear();
 
-        boost::signal<void (const Contact::ref&)> onUserSelected;
+        boost::signals2::signal<void (const Contact::ref&)> onUserSelected;
 
     signals:
         void editingDone();
diff --git a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
index 601d6ac..96b6031 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
@@ -7,11 +7,11 @@
 #include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>
 
 #include <boost/bind.hpp>
+#include <boost/signals2.hpp>
 
 #include <QLabel>
 #include <QVBoxLayout>
 
-#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 
 #include <Swift/QtUI/QtContactEditWidget.h>
author	Tobias Markmann <tm@ayena.de>	2016-04-05 13:17:19 (GMT)
committer	Tobias Markmann <tm@ayena.de>	2016-04-05 19:42:39 (GMT)
commit	2b560b129b7a31fc8cc07f618e763c95a22bf832 (patch)
tree	73e72cdc758b79d01485dc28dcedd48b26859ae8 /Swift
parent	3c560e31b0f168da917e8d566db01fd1cd997d86 (diff)
download	swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2