modernize: Require member function pointers for Settings::notify()

[quassel.git] / src / qtui / systraynotificationbackend.cpp

diff --git a/src/qtui/systraynotificationbackend.cpp b/src/qtui/systraynotificationbackend.cpp
index 138364c..4e024da 100644 (file)
--- a/src/qtui/systraynotificationbackend.cpp
+++ b/src/qtui/systraynotificationbackend.cpp
@@ -37,11 +37,12 @@ SystrayNotificationBackend::SystrayNotificationBackend(QObject *parent)
     : AbstractNotificationBackend(parent)
 {
     NotificationSettings notificationSettings;
-    notificationSettings.initAndNotify("Systray/ShowBubble", this, SLOT(showBubbleChanged(QVariant)), true);
+    notificationSettings.initAndNotify("Systray/ShowBubble", this, &SystrayNotificationBackend::showBubbleChanged, true);
 
-    connect(QtUi::mainWindow()->systemTray(), SIGNAL(messageClicked(uint)), SLOT(notificationActivated(uint)));
-    connect(QtUi::mainWindow()->systemTray(), SIGNAL(activated(SystemTray::ActivationReason)),
-        SLOT(notificationActivated(SystemTray::ActivationReason)));
+    connect(QtUi::mainWindow()->systemTray(), &SystemTray::messageClicked,
+            this, selectOverload<uint>(&SystrayNotificationBackend::onNotificationActivated));
+    connect(QtUi::mainWindow()->systemTray(), &SystemTray::activated,
+            this, selectOverload<SystemTray::ActivationReason>(&SystrayNotificationBackend::onNotificationActivated));
 
     QApplication::instance()->installEventFilter(this);
 
@@ -81,7 +82,7 @@ void SystrayNotificationBackend::close(uint notificationId)
 }
 
 
-void SystrayNotificationBackend::notificationActivated(uint notificationId)
+void SystrayNotificationBackend::onNotificationActivated(uint notificationId)
 {
     if (!_blockActivation) {
         QList<Notification>::iterator i = _notifications.begin();
@@ -98,13 +99,15 @@ void SystrayNotificationBackend::notificationActivated(uint notificationId)
 }
 
 
-void SystrayNotificationBackend::notificationActivated(SystemTray::ActivationReason reason)
+void SystrayNotificationBackend::onNotificationActivated(SystemTray::ActivationReason reason)
 {
     if (reason == SystemTray::Trigger) {
-        if (_notifications.count())
-            notificationActivated(_notifications.last().notificationId);
-        else
+        if (_notifications.count()) {
+            onNotificationActivated(_notifications.last().notificationId);
+        }
+        else {
             GraphicalUi::toggleMainWidget();
+        }
     }
 }
 
@@ -144,7 +147,7 @@ SystrayNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) : Settin
 {
     _showBubbleBox = new QCheckBox(tr("Show a message in a popup"));
     _showBubbleBox->setIcon(icon::get("dialog-information"));
-    connect(_showBubbleBox, SIGNAL(toggled(bool)), this, SLOT(widgetChanged()));
+    connect(_showBubbleBox, &QAbstractButton::toggled, this, &ConfigWidget::widgetChanged);
     auto *layout = new QHBoxLayout(this);
     layout->addWidget(_showBubbleBox);
 }