Replace QSignalMapper with new-style lambda signals

diff --git a/src/qtui/settingspages/itemviewsettingspage.cpp b/src/qtui/settingspages/itemviewsettingspage.cpp
index 02453c7..e4136e0 100644 (file)
--- 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)
 
 ItemViewSettingsPage::ItemViewSettingsPage(QWidget* parent)
     : SettingsPage(tr("Interface"), tr("Chat & Nick Lists"), parent)

-    , _mapper(new QSignalMapper(this))

 {
     ui.setupUi(this);
 
 {
     ui.setupUi(this);
 


@@ -43,11 +42,11 @@ ItemViewSettingsPage::ItemViewSettingsPage(QWidget* parent)
 
     ui.bufferViewPreview->expandAll();
 
 
     ui.bufferViewPreview->expandAll();
 

-    foreach (ColorButton* button, findChildren<ColorButton*>()) {
-        connect(button, &ColorButton::colorChanged, _mapper, selectOverload<>(&QSignalMapper::map));
-        _mapper->setMapping(button, button);
+    for (ColorButton* button : findChildren<ColorButton*>()) {
+        connect(button, &ColorButton::colorChanged, button, [this, button]() {
+            updateBufferViewPreview(button);
+        });

     }
     }

-    connect(_mapper, selectOverload<QWidget*>(&QSignalMapper::mapped), this, &ItemViewSettingsPage::updateBufferViewPreview);

 
     initAutoWidgets();
 }
 
     initAutoWidgets();
 }

diff --git a/src/qtui/settingspages/itemviewsettingspage.h b/src/qtui/settingspages/itemviewsettingspage.h
index 8b141e2..794a7e3 100644 (file)
--- a/src/qtui/settingspages/itemviewsettingspage.h
+++ b/src/qtui/settingspages/itemviewsettingspage.h
@@ -46,7 +46,6 @@ private slots:
 
 private:
     Ui::ItemViewSettingsPage ui;
 
 private:
     Ui::ItemViewSettingsPage ui;

-    QSignalMapper* _mapper;

     QTreeWidgetItem *_networkItem, *_defaultBufferItem, *_inactiveBufferItem, *_activeBufferItem, *_unreadBufferItem, *_highlightedBufferItem;
 
     inline QString settingsKey() const override { return QString("ItemViews"); }
     QTreeWidgetItem *_networkItem, *_defaultBufferItem, *_inactiveBufferItem, *_activeBufferItem, *_unreadBufferItem, *_highlightedBufferItem;
 
     inline QString settingsKey() const override { return QString("ItemViews"); }