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/Client/CoreClient.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 'Swiften/Client/CoreClient.h')
| -rw-r--r-- | Swiften/Client/CoreClient.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h index a1e4681..27031c0 100644 --- a/Swiften/Client/CoreClient.h +++ b/Swiften/Client/CoreClient.h @@ -9,9 +9,10 @@ #include <memory> #include <string> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/SafeByteArray.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Client/ClientError.h> #include <Swiften/Client/ClientOptions.h> #include <Swiften/Entity/Entity.h> @@ -149,13 +150,13 @@ namespace Swift { * If the connection was due to a non-recoverable error, the type * of error will be passed as a parameter. */ - boost::signal<void (const boost::optional<ClientError>&)> onDisconnected; + boost::signals2::signal<void (const boost::optional<ClientError>&)> onDisconnected; /** * Emitted when the client is connected and authenticated, * and stanzas can be sent. */ - boost::signal<void ()> onConnected; + boost::signals2::signal<void ()> onConnected; /** * Emitted when the client receives data. @@ -163,7 +164,7 @@ namespace Swift { * This signal is emitted before the XML data is parsed, * so this data is unformatted. */ - boost::signal<void (const SafeByteArray&)> onDataRead; + boost::signals2::signal<void (const SafeByteArray&)> onDataRead; /** * Emitted when the client sends data. @@ -171,17 +172,17 @@ namespace Swift { * This signal is emitted after the XML was serialized, and * is unformatted. */ - boost::signal<void (const SafeByteArray&)> onDataWritten; + boost::signals2::signal<void (const SafeByteArray&)> onDataWritten; /** * Emitted when a message is received. */ - boost::signal<void (std::shared_ptr<Message>)> onMessageReceived; + boost::signals2::signal<void (std::shared_ptr<Message>)> onMessageReceived; /** * Emitted when a presence stanza is received. */ - boost::signal<void (std::shared_ptr<Presence>) > onPresenceReceived; + boost::signals2::signal<void (std::shared_ptr<Presence>) > onPresenceReceived; /** * Emitted when the server acknowledges receipt of a @@ -189,7 +190,7 @@ namespace Swift { * * \see getStreamManagementEnabled() */ - boost::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked; + boost::signals2::signal<void (std::shared_ptr<Stanza>)> onStanzaAcked; protected: std::shared_ptr<ClientSession> getSession() const { |