Swiftdiff options
| 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/ChatWindow.h | |
| parent | 3c560e31b0f168da917e8d566db01fd1cd997d86 (diff) | |
| download | swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.zip swift-2b560b129b7a31fc8cc07f618e763c95a22bf832.tar.bz2 | |
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
Diffstat (limited to 'Swift/Controllers/UIInterfaces/ChatWindow.h')
| -rw-r--r-- | Swift/Controllers/UIInterfaces/ChatWindow.h | 58 |
1 files changed, 29 insertions, 29 deletions
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; }; } |