7 files changed, 36 insertions, 28 deletions
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();