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 /Swift/Controllers/AdHocManager.h | |
| 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 'Swift/Controllers/AdHocManager.h')
| -rw-r--r-- | Swift/Controllers/AdHocManager.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Swift/Controllers/AdHocManager.h b/Swift/Controllers/AdHocManager.h index 3a908ec..20e5db7 100644 --- a/Swift/Controllers/AdHocManager.h +++ b/Swift/Controllers/AdHocManager.h @@ -4,17 +4,21 @@ * See the COPYING file for more information. */ +#pragma once + #include <vector> -#include <Swiften/Base/boost_bsignals.h> -#include <Swiften/JID/JID.h> +#include <boost/signals2.hpp> + +#include <Swiften/Client/Client.h> +#include <Swiften/Disco/GetDiscoItemsRequest.h> #include <Swiften/Elements/DiscoInfo.h> #include <Swiften/Elements/DiscoItems.h> #include <Swiften/Elements/ErrorPayload.h> -#include <Swiften/Disco/GetDiscoItemsRequest.h> -#include <Swiften/Client/Client.h> -#include <Swift/Controllers/UIEvents/UIEvent.h> +#include <Swiften/JID/JID.h> + #include <Swift/Controllers/AdHocController.h> +#include <Swift/Controllers/UIEvents/UIEvent.h> namespace Swift { class IQRouter; @@ -31,7 +35,7 @@ public: private: void handleServerDiscoItemsResponse(std::shared_ptr<DiscoItems>, ErrorPayload::ref error); void handleUIEvent(std::shared_ptr<UIEvent> event); - boost::signal<void (const AdHocController&)> onControllerComplete; + boost::signals2::signal<void (const AdHocController&)> onControllerComplete; JID jid_; IQRouter* iqRouter_; UIEventStream* uiEventStream_; |