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/Session | |
| 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/Session')
| -rw-r--r-- | Swiften/Session/Session.h | 10 | ||||
| -rw-r--r-- | Swiften/Session/SessionStream.h | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Swiften/Session/Session.h b/Swiften/Session/Session.h index 911bd34..23cc656 100644 --- a/Swiften/Session/Session.h +++ b/Swiften/Session/Session.h @@ -9,10 +9,10 @@ #include <memory> #include <boost/optional.hpp> +#include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/SafeByteArray.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/ToplevelElement.h> #include <Swiften/JID/JID.h> #include <Swiften/Network/Connection.h> @@ -64,10 +64,10 @@ namespace Swift { return remoteJID; } - boost::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived; - boost::signal<void (const boost::optional<SessionError>&)> onSessionFinished; - boost::signal<void (const SafeByteArray&)> onDataWritten; - boost::signal<void (const SafeByteArray&)> onDataRead; + boost::signals2::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived; + boost::signals2::signal<void (const boost::optional<SessionError>&)> onSessionFinished; + boost::signals2::signal<void (const SafeByteArray&)> onDataWritten; + boost::signals2::signal<void (const SafeByteArray&)> onDataRead; protected: void setRemoteJID(const JID& j) { diff --git a/Swiften/Session/SessionStream.h b/Swiften/Session/SessionStream.h index 4b86cee..f56f495 100644 --- a/Swiften/Session/SessionStream.h +++ b/Swiften/Session/SessionStream.h @@ -9,11 +9,11 @@ #include <memory> #include <boost/optional.hpp> +#include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/Error.h> #include <Swiften/Base/SafeByteArray.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/ProtocolHeader.h> #include <Swiften/Elements/ToplevelElement.h> #include <Swiften/TLS/Certificate.h> @@ -74,12 +74,12 @@ namespace Swift { virtual ByteArray getTLSFinishMessage() const = 0; - boost::signal<void (const ProtocolHeader&)> onStreamStartReceived; - boost::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived; - boost::signal<void (std::shared_ptr<Error>)> onClosed; - boost::signal<void ()> onTLSEncrypted; - boost::signal<void (const SafeByteArray&)> onDataRead; - boost::signal<void (const SafeByteArray&)> onDataWritten; + boost::signals2::signal<void (const ProtocolHeader&)> onStreamStartReceived; + boost::signals2::signal<void (std::shared_ptr<ToplevelElement>)> onElementReceived; + boost::signals2::signal<void (std::shared_ptr<Error>)> onClosed; + boost::signals2::signal<void ()> onTLSEncrypted; + boost::signals2::signal<void (const SafeByteArray&)> onDataRead; + boost::signals2::signal<void (const SafeByteArray&)> onDataWritten; protected: CertificateWithKey::ref getTLSCertificate() const { |