From 3640250eae6a30c7fb040c5aa5559b5b5107e661 Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Mon, 5 Aug 2019 12:33:47 +0200 Subject: [PATCH] Replace QSignalMapper with new-style lambda signals --- src/qtui/settingspages/itemviewsettingspage.cpp | 9 ++++----- src/qtui/settingspages/itemviewsettingspage.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qtui/settingspages/itemviewsettingspage.cpp b/src/qtui/settingspages/itemviewsettingspage.cpp index 02453c71..e4136e0c 100644 --- a/src/qtui/settingspages/itemviewsettingspage.cpp +++ b/src/qtui/settingspages/itemviewsettingspage.cpp @@ -28,7 +28,6 @@ ItemViewSettingsPage::ItemViewSettingsPage(QWidget* parent) : SettingsPage(tr("Interface"), tr("Chat & Nick Lists"), parent) - , _mapper(new QSignalMapper(this)) { ui.setupUi(this); @@ -43,11 +42,11 @@ ItemViewSettingsPage::ItemViewSettingsPage(QWidget* parent) ui.bufferViewPreview->expandAll(); - foreach (ColorButton* button, findChildren()) { - connect(button, &ColorButton::colorChanged, _mapper, selectOverload<>(&QSignalMapper::map)); - _mapper->setMapping(button, button); + for (ColorButton* button : findChildren()) { + connect(button, &ColorButton::colorChanged, button, [this, button]() { + updateBufferViewPreview(button); + }); } - connect(_mapper, selectOverload(&QSignalMapper::mapped), this, &ItemViewSettingsPage::updateBufferViewPreview); initAutoWidgets(); } diff --git a/src/qtui/settingspages/itemviewsettingspage.h b/src/qtui/settingspages/itemviewsettingspage.h index 8b141e27..794a7e37 100644 --- a/src/qtui/settingspages/itemviewsettingspage.h +++ b/src/qtui/settingspages/itemviewsettingspage.h @@ -46,7 +46,6 @@ private slots: private: Ui::ItemViewSettingsPage ui; - QSignalMapper* _mapper; QTreeWidgetItem *_networkItem, *_defaultBufferItem, *_inactiveBufferItem, *_activeBufferItem, *_unreadBufferItem, *_highlightedBufferItem; inline QString settingsKey() const override { return QString("ItemViews"); } -- 2.20.1