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/Disco | |
| 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/Disco')
| -rw-r--r-- | Swiften/Disco/CapsManager.h | 5 | ||||
| -rw-r--r-- | Swiften/Disco/CapsProvider.h | 5 | ||||
| -rw-r--r-- | Swiften/Disco/DiscoServiceWalker.h | 9 | ||||
| -rw-r--r-- | Swiften/Disco/EntityCapsManager.h | 5 | ||||
| -rw-r--r-- | Swiften/Disco/EntityCapsProvider.h | 5 |
5 files changed, 17 insertions, 12 deletions
diff --git a/Swiften/Disco/CapsManager.h b/Swiften/Disco/CapsManager.h index e5d80aa..e57730e 100644 --- a/Swiften/Disco/CapsManager.h +++ b/Swiften/Disco/CapsManager.h @@ -9,8 +9,9 @@ #include <map> #include <set> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Disco/CapsProvider.h> #include <Swiften/Elements/CapsInfo.h> #include <Swiften/Elements/DiscoInfo.h> @@ -24,7 +25,7 @@ namespace Swift { class CapsStorage; class CryptoProvider; - class SWIFTEN_API CapsManager : public CapsProvider, public boost::bsignals::trackable { + class SWIFTEN_API CapsManager : public CapsProvider, public boost::signals2::trackable { public: CapsManager(CapsStorage*, StanzaChannel*, IQRouter*, CryptoProvider*); diff --git a/Swiften/Disco/CapsProvider.h b/Swiften/Disco/CapsProvider.h index 9cba027..b9e2d21 100644 --- a/Swiften/Disco/CapsProvider.h +++ b/Swiften/Disco/CapsProvider.h @@ -6,8 +6,9 @@ #pragma once +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/CapsInfo.h> #include <Swiften/Elements/DiscoInfo.h> @@ -20,6 +21,6 @@ namespace Swift { virtual DiscoInfo::ref getCaps(const std::string&) const = 0; - boost::signal<void (const std::string&)> onCapsAvailable; + boost::signals2::signal<void (const std::string&)> onCapsAvailable; }; } diff --git a/Swiften/Disco/DiscoServiceWalker.h b/Swiften/Disco/DiscoServiceWalker.h index 43bd910..f7e1e6d 100644 --- a/Swiften/Disco/DiscoServiceWalker.h +++ b/Swiften/Disco/DiscoServiceWalker.h @@ -11,8 +11,9 @@ #include <string> #include <vector> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Disco/GetDiscoInfoRequest.h> #include <Swiften/Disco/GetDiscoItemsRequest.h> #include <Swiften/Elements/DiscoInfo.h> @@ -47,13 +48,13 @@ namespace Swift { } /** Emitted for each service found. */ - boost::signal<void(const JID&, std::shared_ptr<DiscoInfo>)> onServiceFound; + boost::signals2::signal<void(const JID&, std::shared_ptr<DiscoInfo>)> onServiceFound; /** Emitted when walking is aborted. */ - boost::signal<void()> onWalkAborted; + boost::signals2::signal<void()> onWalkAborted; /** Emitted when walking is complete.*/ - boost::signal<void()> onWalkComplete; + boost::signals2::signal<void()> onWalkComplete; private: void walkNode(const JID& jid); diff --git a/Swiften/Disco/EntityCapsManager.h b/Swiften/Disco/EntityCapsManager.h index 00b685b..4236326 100644 --- a/Swiften/Disco/EntityCapsManager.h +++ b/Swiften/Disco/EntityCapsManager.h @@ -8,8 +8,9 @@ #include <map> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Disco/EntityCapsProvider.h> #include <Swiften/Elements/DiscoInfo.h> #include <Swiften/Elements/ErrorPayload.h> @@ -25,7 +26,7 @@ namespace Swift { * This information is provided in the form of service discovery * information. */ - class SWIFTEN_API EntityCapsManager : public EntityCapsProvider, public boost::bsignals::trackable { + class SWIFTEN_API EntityCapsManager : public EntityCapsProvider, public boost::signals2::trackable { public: EntityCapsManager(CapsProvider*, StanzaChannel*); diff --git a/Swiften/Disco/EntityCapsProvider.h b/Swiften/Disco/EntityCapsProvider.h index 34984ca..5f4af18 100644 --- a/Swiften/Disco/EntityCapsProvider.h +++ b/Swiften/Disco/EntityCapsProvider.h @@ -6,8 +6,9 @@ #pragma once +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/DiscoInfo.h> #include <Swiften/JID/JID.h> @@ -29,6 +30,6 @@ namespace Swift { /** * Emitted when the capabilities of a JID changes. */ - boost::signal<void (const JID&)> onCapsChanged; + boost::signals2::signal<void (const JID&)> onCapsChanged; }; } |