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/Jingle | |
| 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/Jingle')
| -rw-r--r-- | Swiften/Jingle/FakeJingleSession.h | 2 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSession.h | 2 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSessionImpl.h | 2 | ||||
| -rw-r--r-- | Swiften/Jingle/JingleSessionManager.h | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Swiften/Jingle/FakeJingleSession.h b/Swiften/Jingle/FakeJingleSession.h index d961d1d..6218544 100644 --- a/Swiften/Jingle/FakeJingleSession.h +++ b/Swiften/Jingle/FakeJingleSession.h @@ -16,12 +16,12 @@ #include <string> #include <vector> +#include <boost/signals2.hpp> #include <boost/variant.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/Override.h> #include <Swiften/Base/SimpleIDGenerator.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/JinglePayload.h> #include <Swiften/JID/JID.h> #include <Swiften/Jingle/JingleContentID.h> diff --git a/Swiften/Jingle/JingleSession.h b/Swiften/Jingle/JingleSession.h index 993e8de..22e6901 100644 --- a/Swiften/Jingle/JingleSession.h +++ b/Swiften/Jingle/JingleSession.h @@ -11,10 +11,10 @@ #include <vector> #include <boost/optional.hpp> +#include <boost/signals2.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/Listenable.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/JinglePayload.h> #include <Swiften/JID/JID.h> diff --git a/Swiften/Jingle/JingleSessionImpl.h b/Swiften/Jingle/JingleSessionImpl.h index 4dd32ed..b42b790 100644 --- a/Swiften/Jingle/JingleSessionImpl.h +++ b/Swiften/Jingle/JingleSessionImpl.h @@ -44,7 +44,7 @@ namespace Swift { private: IQRouter *iqRouter; JID peerJID; - typedef std::map<RequestRef, boost::bsignals::connection > RequestsMap; + typedef std::map<RequestRef, boost::signals2::connection > RequestsMap; RequestsMap pendingRequests; }; } diff --git a/Swiften/Jingle/JingleSessionManager.h b/Swiften/Jingle/JingleSessionManager.h index 0c0f775..f67a0fe 100644 --- a/Swiften/Jingle/JingleSessionManager.h +++ b/Swiften/Jingle/JingleSessionManager.h @@ -9,8 +9,9 @@ #include <map> #include <memory> +#include <boost/signals2.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Jingle/JingleSessionImpl.h> namespace Swift { |