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/Base | |
| 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/Base')
| -rw-r--r-- | Swiften/Base/boost_bsignals.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/Swiften/Base/boost_bsignals.h b/Swiften/Base/boost_bsignals.h deleted file mode 100644 index 62f7cb3..0000000 --- a/Swiften/Base/boost_bsignals.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2010 Isode Limited. - * All rights reserved. - * See the COPYING file for more information. - */ - -// Work around for the boost::signals / Qt signals keyword clash. -// Based on an example from Frank Hess, improved by Niels Dekker - -#pragma once - -#if defined(signals) && defined(Q_SIGNALS) && !defined(QT_MOC_CPP) -#undef signals -#define signals signals -#endif - -#include <boost/signal.hpp> - -namespace boost { - namespace bsignals = signals; -} - -#if defined(signals) && defined(Q_SIGNALS) && !defined(QT_MOC_CPP) -#undef signals -#define signals Q_SIGNALS -#endif |