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 /Swiften/Whiteboard | |
| 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 'Swiften/Whiteboard')
| -rw-r--r-- | Swiften/Whiteboard/WhiteboardSession.h | 13 | ||||
| -rw-r--r-- | Swiften/Whiteboard/WhiteboardSessionManager.h | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/Swiften/Whiteboard/WhiteboardSession.h b/Swiften/Whiteboard/WhiteboardSession.h index 63d9670..0871f94 100644 --- a/Swiften/Whiteboard/WhiteboardSession.h +++ b/Swiften/Whiteboard/WhiteboardSession.h @@ -14,9 +14,10 @@ #include <memory> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/IDGenerator.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/Whiteboard/WhiteboardElement.h> #include <Swiften/Elements/Whiteboard/WhiteboardOperation.h> #include <Swiften/JID/JID.h> @@ -41,11 +42,11 @@ namespace Swift { const JID& getTo() const; public: - boost::signal< void(const WhiteboardElement::ref element)> onElementReceived; - boost::signal< void(const WhiteboardOperation::ref operation)> onOperationReceived; - boost::signal< void(const JID& contact)> onSessionTerminated; - boost::signal< void(const JID& contact)> onRequestAccepted; - boost::signal< void(const JID& contact)> onRequestRejected; + boost::signals2::signal< void(const WhiteboardElement::ref element)> onElementReceived; + boost::signals2::signal< void(const WhiteboardOperation::ref operation)> onOperationReceived; + boost::signals2::signal< void(const JID& contact)> onSessionTerminated; + boost::signals2::signal< void(const JID& contact)> onRequestAccepted; + boost::signals2::signal< void(const JID& contact)> onRequestRejected; private: virtual void handleIncomingOperation(WhiteboardOperation::ref operation) = 0; diff --git a/Swiften/Whiteboard/WhiteboardSessionManager.h b/Swiften/Whiteboard/WhiteboardSessionManager.h index 44ce14a..4f14665 100644 --- a/Swiften/Whiteboard/WhiteboardSessionManager.h +++ b/Swiften/Whiteboard/WhiteboardSessionManager.h @@ -14,8 +14,9 @@ #include <map> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Client/StanzaChannel.h> #include <Swiften/JID/JID.h> #include <Swiften/Queries/IQRouter.h> @@ -39,7 +40,7 @@ namespace Swift { WhiteboardSession::ref requestSession(const JID& to); public: - boost::signal< void (IncomingWhiteboardSession::ref)> onSessionRequest; + boost::signals2::signal< void (IncomingWhiteboardSession::ref)> onSessionRequest; private: JID getFullJID(const JID& bareJID); |