X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsystemtray.cpp;h=c85e7bf22df7c4f1b8ed3a7e47da1b24ac441497;hp=c84055084f54b83bcaf11e3a13573cec9b1925d3;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=adb89541c8583c2e0aca8893287b081c801ae7be

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index c8405508..c85e7bf2 100644
--- a/src/qtui/systemtray.cpp
+++ b/src/qtui/systemtray.cpp
@@ -18,22 +18,17 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "systemtray.h"
+
 #include <QApplication>
 #include <QMenu>
 
-#include "systemtray.h"
-
 #include "action.h"
 #include "actioncollection.h"
 #include "client.h"
+#include "icon.h"
 #include "qtui.h"
 
-#ifdef HAVE_KDE4
-#  include <KMenu>
-#  include <KWindowInfo>
-#  include <KWindowSystem>
-#endif
-
 SystemTray::SystemTray(QWidget *parent)
     : QObject(parent),
     _associatedWidget(parent)
@@ -45,21 +40,11 @@ SystemTray::SystemTray(QWidget *parent)
     UiStyleSettings{}.initAndNotify("Icons/InvertTray", this, SLOT(invertTrayIconChanged(QVariant)), false);
 
     ActionCollection *coll = QtUi::actionCollection("General");
-    _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, SLOT(minimizeRestore()));
+    _minimizeRestoreAction = new Action(tr("&Minimize"), this, this, &SystemTray::minimizeRestore);
 
-#ifdef HAVE_KDE4
-    KMenu *kmenu;
-    _trayMenu = kmenu = new KMenu();
-    kmenu->addTitle(QIcon::fromTheme(iconName(State::Active)), "Quassel IRC");
-#else
     _trayMenu = new QMenu(associatedWidget());
-#endif
-
     _trayMenu->setTitle("Quassel IRC");
-
-#ifndef HAVE_KDE4
     _trayMenu->setAttribute(Qt::WA_Hover);
-#endif
 
     _trayMenu->addAction(coll->action("ConnectCore"));
     _trayMenu->addAction(coll->action("DisconnectCore"));
@@ -67,13 +52,13 @@ SystemTray::SystemTray(QWidget *parent)
     _trayMenu->addSeparator();
     _trayMenu->addAction(_minimizeRestoreAction);
     _trayMenu->addAction(coll->action("Quit"));
-    connect(_trayMenu, SIGNAL(aboutToShow()), SLOT(trayMenuAboutToShow()));
+    connect(_trayMenu, &QMenu::aboutToShow, this, &SystemTray::trayMenuAboutToShow);
 
-    connect(QtUi::instance(), SIGNAL(iconThemeRefreshed()), this, SIGNAL(iconsChanged()));
+    connect(QtUi::instance(), &QtUi::iconThemeRefreshed, this, &SystemTray::iconsChanged);
 
     _blinkTimer.setInterval(1000);
     _blinkTimer.setSingleShot(false);
-    connect(&_blinkTimer, SIGNAL(timeout()), SLOT(onBlinkTimeout()));
+    connect(&_blinkTimer, &QTimer::timeout, this, &SystemTray::onBlinkTimeout);
 }
 
 
@@ -120,16 +105,6 @@ void SystemTray::setMode(Mode mode)
 {
     if (mode != _mode) {
         _mode = mode;
-#ifdef HAVE_KDE4
-        if (_trayMenu) {
-            if (mode == Mode::Legacy) {
-                _trayMenu->setWindowFlags(Qt::Popup);
-            }
-            else {
-                _trayMenu->setWindowFlags(Qt::Window);
-            }
-        }
-#endif
         emit modeChanged(mode);
     }
 }