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/QtUI | |
| 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/QtUI')
| -rw-r--r-- | Swift/QtUI/QtFileTransferListItemModel.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/QtMUCConfigurationWindow.h | 7 | ||||
| -rw-r--r-- | Swift/QtUI/Roster/QtOccupantListWidget.h | 4 | ||||
| -rw-r--r-- | Swift/QtUI/Roster/QtTreeWidget.h | 2 | ||||
| -rw-r--r-- | Swift/QtUI/UserSearch/ContactListModel.h | 3 | ||||
| -rw-r--r-- | Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp | 3 | ||||
| -rw-r--r-- | Swift/QtUI/UserSearch/QtSuggestingJIDInput.h | 6 | ||||
| -rw-r--r-- | Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp | 2 |
8 files changed, 14 insertions, 15 deletions
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp index d070391..24d6dd1 100644 --- a/Swift/QtUI/QtFileTransferListItemModel.cpp +++ b/Swift/QtUI/QtFileTransferListItemModel.cpp @@ -14,9 +14,9 @@ #include <boost/bind.hpp> #include <boost/cstdint.hpp> +#include <boost/signals2.hpp> #include <Swiften/Base/FileSize.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swift/Controllers/FileTransfer/FileTransferController.h> #include <Swift/Controllers/FileTransfer/FileTransferOverview.h> diff --git a/Swift/QtUI/QtMUCConfigurationWindow.h b/Swift/QtUI/QtMUCConfigurationWindow.h index c8835e4..da3e12a 100644 --- a/Swift/QtUI/QtMUCConfigurationWindow.h +++ b/Swift/QtUI/QtMUCConfigurationWindow.h @@ -6,11 +6,12 @@ #pragma once +#include <boost/signals2.hpp> + #include <QLabel> #include <QPushButton> #include <QWidget> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Elements/Form.h> class QBoxLayout; @@ -23,8 +24,8 @@ namespace Swift { public: QtMUCConfigurationWindow(Form::ref form); virtual ~QtMUCConfigurationWindow(); - boost::signal<void (Form::ref)> onFormComplete; - boost::signal<void ()> onFormCancelled; + boost::signals2::signal<void (Form::ref)> onFormComplete; + boost::signals2::signal<void ()> onFormCancelled; private slots: void handleCancelClicked(); void handleOKClicked(); diff --git a/Swift/QtUI/Roster/QtOccupantListWidget.h b/Swift/QtUI/Roster/QtOccupantListWidget.h index 78be276..0f80943 100644 --- a/Swift/QtUI/Roster/QtOccupantListWidget.h +++ b/Swift/QtUI/Roster/QtOccupantListWidget.h @@ -6,7 +6,7 @@ #pragma once -#include <Swiften/Base/boost_bsignals.h> +#include <boost/signals2.hpp> #include <Swift/Controllers/UIInterfaces/ChatWindow.h> @@ -21,7 +21,7 @@ class QtOccupantListWidget : public QtTreeWidget { QtOccupantListWidget(UIEventStream* eventStream, SettingsProvider* settings, MessageTarget privateMessageTarget, QWidget* parent = nullptr); virtual ~QtOccupantListWidget(); void setAvailableOccupantActions(const std::vector<ChatWindow::OccupantAction>& actions); - boost::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected; + boost::signals2::signal<void (ChatWindow::OccupantAction, ContactRosterItem*)> onOccupantActionSelected; protected: void contextMenuEvent(QContextMenuEvent* event); private: diff --git a/Swift/QtUI/Roster/QtTreeWidget.h b/Swift/QtUI/Roster/QtTreeWidget.h index c3ed5a2..b22f6bb 100644 --- a/Swift/QtUI/Roster/QtTreeWidget.h +++ b/Swift/QtUI/Roster/QtTreeWidget.h @@ -39,7 +39,7 @@ class QtTreeWidget : public QTreeView { void setOnline(bool isOnline); public: - boost::signal<void (RosterItem*)> onSomethingSelectedChanged; + boost::signals2::signal<void (RosterItem*)> onSomethingSelectedChanged; private slots: void handleItemActivated(const QModelIndex&); 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> |