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/Controllers/UIInterfaces
parent: 3c560e31b0f168da917e8d566db01fd1cd997d86 (diff)
download: swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip
swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2
14 files changed, 94 insertions, 78 deletions
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;
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/Controllers/UIInterfaces
parent	3c560e31b0f168da917e8d566db01fd1cd997d86 (diff)
download	swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2