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/TLS | |
| 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/TLS')
| -rw-r--r-- | Swiften/TLS/CAPICertificate.h | 4 | ||||
| -rw-r--r-- | Swiften/TLS/OpenSSL/OpenSSLContext.h | 2 | ||||
| -rw-r--r-- | Swiften/TLS/Schannel/SchannelContext.h | 2 | ||||
| -rw-r--r-- | Swiften/TLS/TLSContext.h | 11 |
4 files changed, 10 insertions, 9 deletions
diff --git a/Swiften/TLS/CAPICertificate.h b/Swiften/TLS/CAPICertificate.h index 5322a03..0259db5 100644 --- a/Swiften/TLS/CAPICertificate.h +++ b/Swiften/TLS/CAPICertificate.h @@ -13,7 +13,7 @@ #pragma once #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> #include <Swiften/Base/SafeByteArray.h> #include <Swiften/TLS/CertificateWithKey.h> #include <Swiften/Network/Timer.h> @@ -43,7 +43,7 @@ namespace Swift { const std::string& getSmartCardReaderName() const; public: - boost::signal<void ()> onCertificateCardRemoved; + boost::signals2::signal<void ()> onCertificateCardRemoved; private: void setUri (const std::string& capiUri); diff --git a/Swiften/TLS/OpenSSL/OpenSSLContext.h b/Swiften/TLS/OpenSSL/OpenSSLContext.h index 54a8dcb..e75b3c9 100644 --- a/Swiften/TLS/OpenSSL/OpenSSLContext.h +++ b/Swiften/TLS/OpenSSL/OpenSSLContext.h @@ -7,11 +7,11 @@ #pragma once #include <boost/noncopyable.hpp> +#include <boost/signals2.hpp> #include <openssl/ssl.h> #include <Swiften/Base/ByteArray.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/TLS/CertificateWithKey.h> #include <Swiften/TLS/TLSContext.h> diff --git a/Swiften/TLS/Schannel/SchannelContext.h b/Swiften/TLS/Schannel/SchannelContext.h index 4cb086e..a3748fe 100644 --- a/Swiften/TLS/Schannel/SchannelContext.h +++ b/Swiften/TLS/Schannel/SchannelContext.h @@ -12,7 +12,7 @@ #pragma once -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> #include <Swiften/TLS/TLSContext.h> #include <Swiften/TLS/Schannel/SchannelUtil.h> diff --git a/Swiften/TLS/TLSContext.h b/Swiften/TLS/TLSContext.h index b0d9296..79e3485 100644 --- a/Swiften/TLS/TLSContext.h +++ b/Swiften/TLS/TLSContext.h @@ -8,9 +8,10 @@ #include <memory> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/SafeByteArray.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/TLS/Certificate.h> #include <Swiften/TLS/CertificateVerificationError.h> #include <Swiften/TLS/CertificateWithKey.h> @@ -36,9 +37,9 @@ namespace Swift { virtual ByteArray getFinishMessage() const = 0; public: - boost::signal<void (const SafeByteArray&)> onDataForNetwork; - boost::signal<void (const SafeByteArray&)> onDataForApplication; - boost::signal<void (std::shared_ptr<TLSError>)> onError; - boost::signal<void ()> onConnected; + boost::signals2::signal<void (const SafeByteArray&)> onDataForNetwork; + boost::signals2::signal<void (const SafeByteArray&)> onDataForApplication; + boost::signals2::signal<void (std::shared_ptr<TLSError>)> onError; + boost::signals2::signal<void ()> onConnected; }; } |