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 /SwifTools | |
| 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 'SwifTools')
| -rw-r--r-- | SwifTools/Idle/ActualIdleDetector.h | 2 | ||||
| -rw-r--r-- | SwifTools/Idle/IdleDetector.h | 4 | ||||
| -rw-r--r-- | SwifTools/Notifier/Win32NotifierWindow.h | 6 | ||||
| -rw-r--r-- | SwifTools/URIHandler/URIHandler.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/SwifTools/Idle/ActualIdleDetector.h b/SwifTools/Idle/ActualIdleDetector.h index 44a9649..176eb11 100644 --- a/SwifTools/Idle/ActualIdleDetector.h +++ b/SwifTools/Idle/ActualIdleDetector.h @@ -15,7 +15,7 @@ namespace Swift { class TimerFactory; class Timer; - class ActualIdleDetector : public IdleDetector, public boost::bsignals::trackable { + class ActualIdleDetector : public IdleDetector, public boost::signals2::trackable { public: ActualIdleDetector(IdleQuerier*, TimerFactory*, int refreshRateMilliseconds); ~ActualIdleDetector(); diff --git a/SwifTools/Idle/IdleDetector.h b/SwifTools/Idle/IdleDetector.h index 30276bc..3e9df66 100644 --- a/SwifTools/Idle/IdleDetector.h +++ b/SwifTools/Idle/IdleDetector.h @@ -8,7 +8,7 @@ #include <memory> -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> namespace Swift { class IdleDetector { @@ -28,7 +28,7 @@ namespace Swift { return idle; } - boost::signal<void (bool /* isIdle */)> onIdleChanged; + boost::signals2::signal<void (bool /* isIdle */)> onIdleChanged; void setIdle(bool b) { if (b != idle) { diff --git a/SwifTools/Notifier/Win32NotifierWindow.h b/SwifTools/Notifier/Win32NotifierWindow.h index 3f03825..cff80ec 100644 --- a/SwifTools/Notifier/Win32NotifierWindow.h +++ b/SwifTools/Notifier/Win32NotifierWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -8,7 +8,7 @@ //#include <windows.h> -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> namespace Swift { class Win32NotifierWindow { @@ -17,6 +17,6 @@ namespace Swift { virtual HWND getID() const = 0; - boost::signal<void (MSG*)> onMessageReceived; + boost::signals2::signal<void (MSG*)> onMessageReceived; }; } diff --git a/SwifTools/URIHandler/URIHandler.h b/SwifTools/URIHandler/URIHandler.h index 0f85e64..8aeb11a 100644 --- a/SwifTools/URIHandler/URIHandler.h +++ b/SwifTools/URIHandler/URIHandler.h @@ -8,7 +8,7 @@ #include <string> -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> namespace Swift { class URIHandler { @@ -16,6 +16,6 @@ namespace Swift { URIHandler(); virtual ~URIHandler(); - boost::signal<void (const std::string&)> onURI; + boost::signals2::signal<void (const std::string&)> onURI; }; } |