X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Flegacysystemtray.cpp;h=3fbe1dcac2129556ac91b31315e12a866591dd71;hp=40cd2ed8f756fd6567420f9f440896675263b074;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=b7447afe8e836376776dac26704e227a678d2913

diff --git a/src/qtui/legacysystemtray.cpp b/src/qtui/legacysystemtray.cpp
index 40cd2ed8..3fbe1dca 100644
--- a/src/qtui/legacysystemtray.cpp
+++ b/src/qtui/legacysystemtray.cpp
@@ -28,32 +28,26 @@
 
 LegacySystemTray::LegacySystemTray(QWidget *parent)
     : SystemTray(parent)
+    , _trayIcon{new QSystemTrayIcon(associatedWidget())}
 {
-#ifndef HAVE_KDE4
-    _trayIcon = new QSystemTrayIcon(associatedWidget());
-#else
-    _trayIcon = new KSystemTrayIcon(associatedWidget());
-    // We don't want to trigger a minimize if a highlight is pending, so we brutally remove the internal connection for that
-    disconnect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
-        _trayIcon, SLOT(activateOrHide(QSystemTrayIcon::ActivationReason)));
-#endif
+
 #ifndef Q_OS_MAC
-    connect(_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
-        SLOT(onActivated(QSystemTrayIcon::ActivationReason)));
+    connect(_trayIcon, &QSystemTrayIcon::activated,
+        this, &LegacySystemTray::onActivated);
 #endif
-    connect(_trayIcon, SIGNAL(messageClicked()),
-        SLOT(onMessageClicked()));
+    connect(_trayIcon, &QSystemTrayIcon::messageClicked,
+        this, &LegacySystemTray::onMessageClicked);
 
     _trayIcon->setContextMenu(trayMenu());
     _trayIcon->setVisible(false);
 
     setMode(Mode::Legacy);
 
-    connect(this, SIGNAL(visibilityChanged(bool)), this, SLOT(onVisibilityChanged(bool)));
-    connect(this, SIGNAL(modeChanged(Mode)), this, SLOT(onModeChanged(Mode)));
-    connect(this, SIGNAL(toolTipChanged(QString, QString)), SLOT(updateToolTip()));
-    connect(this, SIGNAL(iconsChanged()), this, SLOT(updateIcon()));
-    connect(this, SIGNAL(currentIconNameChanged()), this, SLOT(updateIcon()));
+    connect(this, &SystemTray::visibilityChanged, this, &LegacySystemTray::onVisibilityChanged);
+    connect(this, &SystemTray::modeChanged, this, &LegacySystemTray::onModeChanged);
+    connect(this, &SystemTray::toolTipChanged, this, &LegacySystemTray::updateToolTip);
+    connect(this, &SystemTray::iconsChanged, this, &LegacySystemTray::updateIcon);
+    connect(this, &SystemTray::currentIconNameChanged, this, &LegacySystemTray::updateIcon);
 
     updateIcon();
     updateToolTip();