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/Component | |
| 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/Component')
| -rw-r--r-- | Swiften/Component/ComponentConnector.h | 7 | ||||
| -rw-r--r-- | Swiften/Component/ComponentSession.h | 9 | ||||
| -rw-r--r-- | Swiften/Component/CoreComponent.h | 15 |
3 files changed, 17 insertions, 14 deletions
diff --git a/Swiften/Component/ComponentConnector.h b/Swiften/Component/ComponentConnector.h index 831851a..ab36901 100644 --- a/Swiften/Component/ComponentConnector.h +++ b/Swiften/Component/ComponentConnector.h @@ -10,8 +10,9 @@ #include <memory> #include <string> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Network/Connection.h> #include <Swiften/Network/DomainNameResolveError.h> #include <Swiften/Network/HostAddressPort.h> @@ -23,7 +24,7 @@ namespace Swift { class ConnectionFactory; class TimerFactory; - class SWIFTEN_API ComponentConnector : public boost::bsignals::trackable, public std::enable_shared_from_this<ComponentConnector> { + class SWIFTEN_API ComponentConnector : public boost::signals2::trackable, public std::enable_shared_from_this<ComponentConnector> { public: typedef std::shared_ptr<ComponentConnector> ref; @@ -36,7 +37,7 @@ namespace Swift { void start(); void stop(); - boost::signal<void (std::shared_ptr<Connection>)> onConnectFinished; + boost::signals2::signal<void (std::shared_ptr<Connection>)> onConnectFinished; private: ComponentConnector(const std::string& hostname, int port, DomainNameResolver*, ConnectionFactory*, TimerFactory*); diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h index 97f5378..9d963a1 100644 --- a/Swiften/Component/ComponentSession.h +++ b/Swiften/Component/ComponentSession.h @@ -9,9 +9,10 @@ #include <memory> #include <string> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/Error.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/Stanza.h> #include <Swiften/Elements/ToplevelElement.h> #include <Swiften/JID/JID.h> @@ -56,9 +57,9 @@ namespace Swift { void sendStanza(std::shared_ptr<Stanza>); public: - boost::signal<void ()> onInitialized; - boost::signal<void (std::shared_ptr<Swift::Error>)> onFinished; - boost::signal<void (std::shared_ptr<Stanza>)> onStanzaReceived; + boost::signals2::signal<void ()> onInitialized; + boost::signals2::signal<void (std::shared_ptr<Swift::Error>)> onFinished; + boost::signals2::signal<void (std::shared_ptr<Stanza>)> onStanzaReceived; private: ComponentSession(const JID& jid, const std::string& secret, std::shared_ptr<SessionStream>, CryptoProvider*); diff --git a/Swiften/Component/CoreComponent.h b/Swiften/Component/CoreComponent.h index 3368671..669be97 100644 --- a/Swiften/Component/CoreComponent.h +++ b/Swiften/Component/CoreComponent.h @@ -9,10 +9,11 @@ #include <memory> #include <string> +#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/Component/ComponentConnector.h> #include <Swiften/Component/ComponentError.h> #include <Swiften/Component/ComponentSession.h> @@ -73,13 +74,13 @@ namespace Swift { } public: - boost::signal<void (const ComponentError&)> onError; - boost::signal<void ()> onConnected; - boost::signal<void (const SafeByteArray&)> onDataRead; - boost::signal<void (const SafeByteArray&)> onDataWritten; + boost::signals2::signal<void (const ComponentError&)> onError; + boost::signals2::signal<void ()> onConnected; + boost::signals2::signal<void (const SafeByteArray&)> onDataRead; + boost::signals2::signal<void (const SafeByteArray&)> onDataWritten; - boost::signal<void (std::shared_ptr<Message>)> onMessageReceived; - boost::signal<void (std::shared_ptr<Presence>) > onPresenceReceived; + boost::signals2::signal<void (std::shared_ptr<Message>)> onMessageReceived; + boost::signals2::signal<void (std::shared_ptr<Presence>) > onPresenceReceived; private: void handleConnectorFinished(std::shared_ptr<Connection>); |