summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-05 13:17:19 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-05 19:42:39 (GMT)
commit2b560b129b7a31fc8cc07f618e763c95a22bf832 (patch)
tree73e72cdc758b79d01485dc28dcedd48b26859ae8 /Swift/Controllers/UIInterfaces/HistoryWindow.h
parent3c560e31b0f168da917e8d566db01fd1cd997d86 (diff)
downloadswift-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/UIInterfaces/HistoryWindow.h')
-rw-r--r--Swift/Controllers/UIInterfaces/HistoryWindow.h20
1 files changed, 13 insertions, 7 deletions
diff --git a/Swift/Controllers/UIInterfaces/HistoryWindow.h b/Swift/Controllers/UIInterfaces/HistoryWindow.h
index db1a4b1..413d9d6 100644
--- a/Swift/Controllers/UIInterfaces/HistoryWindow.h
+++ b/Swift/Controllers/UIInterfaces/HistoryWindow.h
@@ -4,6 +4,12 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <Swift/Controllers/Roster/Roster.h>
@@ -23,12 +29,12 @@ namespace Swift {
virtual std::string getSearchBoxText() = 0;
virtual boost::gregorian::date getLastVisibleDate() = 0;
- boost::signal<void (RosterItem*)> onSelectedContactChanged;
- boost::signal<void (const std::string&)> onReturnPressed;
- boost::signal<void (const boost::gregorian::date&)> onScrollReachedTop;
- boost::signal<void (const boost::gregorian::date&)> onScrollReachedBottom;
- boost::signal<void ()> onPreviousButtonClicked;
- boost::signal<void ()> onNextButtonClicked;
- boost::signal<void (const boost::gregorian::date&)> onCalendarClicked;
+ boost::signals2::signal<void (RosterItem*)> onSelectedContactChanged;
+ boost::signals2::signal<void (const std::string&)> onReturnPressed;
+ boost::signals2::signal<void (const boost::gregorian::date&)> onScrollReachedTop;
+ boost::signals2::signal<void (const boost::gregorian::date&)> onScrollReachedBottom;
+ boost::signals2::signal<void ()> onPreviousButtonClicked;
+ boost::signals2::signal<void ()> onNextButtonClicked;
+ boost::signals2::signal<void (const boost::gregorian::date&)> onCalendarClicked;
};
}