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/QtUI/UserSearch
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/QtUI/UserSearch')
-rw-r--r--Swift/QtUI/UserSearch/ContactListModel.h3
-rw-r--r--Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp3
-rw-r--r--Swift/QtUI/UserSearch/QtSuggestingJIDInput.h6
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp2
4 files changed, 6 insertions, 8 deletions
diff --git a/Swift/QtUI/UserSearch/ContactListModel.h b/Swift/QtUI/UserSearch/ContactListModel.h
index 9b61484..026b01b 100644
--- a/Swift/QtUI/UserSearch/ContactListModel.h
+++ b/Swift/QtUI/UserSearch/ContactListModel.h
@@ -15,11 +15,10 @@
#include <vector>
#include <boost/bind.hpp>
+#include <boost/signals2.hpp>
#include <QAbstractItemModel>
-#include <Swiften/Base/boost_bsignals.h>
-
#include <Swift/Controllers/Contact.h>
#include <Swift/QtUI/ChatList/ChatListGroupItem.h>
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index e9a26ea..d20c285 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -13,14 +13,13 @@
#include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h>
#include <boost/bind.hpp>
+#include <boost/signals2.hpp>
#include <QAbstractItemView>
#include <QApplication>
#include <QDesktopWidget>
#include <QKeyEvent>
-#include <Swiften/Base/boost_bsignals.h>
-
#include <Swift/Controllers/Settings/SettingsProvider.h>
#include <Swift/QtUI/QtSwiftUtil.h>
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
index 2077d55..402667d 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.h
@@ -12,11 +12,11 @@
#pragma once
+#include <boost/signals2.hpp>
+
#include <QLineEdit>
#include <QTreeView>
-#include <Swiften/Base/boost_bsignals.h>
-
#include <Swift/Controllers/Contact.h>
namespace Swift {
@@ -37,7 +37,7 @@ class QtSuggestingJIDInput : public QLineEdit {
void clear();
- boost::signal<void (const Contact::ref&)> onUserSelected;
+ boost::signals2::signal<void (const Contact::ref&)> onUserSelected;
signals:
void editingDone();
diff --git a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
index 601d6ac..96b6031 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp
@@ -7,11 +7,11 @@
#include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>
#include <boost/bind.hpp>
+#include <boost/signals2.hpp>
#include <QLabel>
#include <QVBoxLayout>
-#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/JID/JID.h>
#include <Swift/QtUI/QtContactEditWidget.h>