From 99e8ca10024aa929ae5d577ade09f3e3f9fbd2a6 Mon Sep 17 00:00:00 2001
From: codestation <codestation404@gmail.com>
Date: Sat, 21 Feb 2015 00:32:26 -0430
Subject: [PATCH] Use KMenu for the kdenotification plugin if
 ENABLE_KNOTIFICATIONS isn't enabled

---
 qcma_kdenotifier.pro              | 1 +
 src/gui/mainwidget.cpp            | 6 ------
 src/gui/mainwidget.h              | 3 ---
 src/indicator/kdenotifiertray.cpp | 4 ++--
 src/indicator/qtrayicon.h         | 7 -------
 5 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/qcma_kdenotifier.pro b/qcma_kdenotifier.pro
index ae2a90e..d613758 100644
--- a/qcma_kdenotifier.pro
+++ b/qcma_kdenotifier.pro
@@ -10,6 +10,7 @@ INCLUDEPATH += src/
 greaterThan(QT_MAJOR_VERSION, 4): ENABLE_KNOTIFICATIONS {
     message("Enabling KDE5 notifications")
     QT += KNotifications
+    DEFINES += ENABLE_KNOTIFICATIONS=1
 } else {
     LIBS += -lkdeui
 }
diff --git a/src/gui/mainwidget.cpp b/src/gui/mainwidget.cpp
index 36054d5..e69ed0f 100644
--- a/src/gui/mainwidget.cpp
+++ b/src/gui/mainwidget.cpp
@@ -156,15 +156,9 @@ void MainWidget::connectSignals()
 
 void MainWidget::setTrayTooltip(QString message)
 {
-#ifndef ENABLE_KDE_NOTIFIER
     if(trayIcon) {
         trayIcon->setToolTip(message);
     }
-#else
-    if(notifierItem) {
-        notifierItem->setToolTipSubTitle(message);
-    }
-#endif
 }
 
 void MainWidget::openManager()
diff --git a/src/gui/mainwidget.h b/src/gui/mainwidget.h
index c515fb9..b290c51 100644
--- a/src/gui/mainwidget.h
+++ b/src/gui/mainwidget.h
@@ -30,9 +30,6 @@
 #include <QWidget>
 
 #include <QSystemTrayIcon>
-#ifdef ENABLE_KDE_NOTIFIER
-#include "kdenotifier.h"
-#endif
 
 #ifdef Q_OS_LINUX
 #include <QDBusConnection>
diff --git a/src/indicator/kdenotifiertray.cpp b/src/indicator/kdenotifiertray.cpp
index 3f58296..76e2acc 100644
--- a/src/indicator/kdenotifiertray.cpp
+++ b/src/indicator/kdenotifiertray.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "kdenotifiertray.h"
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+#ifndef ENABLE_KNOTIFICATIONS
 #include <kmenu.h>
 #else
 #include <QMenu>
@@ -45,7 +45,7 @@ void KDENotifierTray::init()
     connect(about_qt, SIGNAL(triggered()), this, SIGNAL(showAboutQt()));
     connect(quit, SIGNAL(triggered()), this, SIGNAL(stopServer()));
 
-#if QT_VERSION < 0x050000
+#ifndef ENABLE_KNOTIFICATIONS
     KMenu *tray_icon_menu = new KMenu(this);
 #else
     QMenu *tray_icon_menu = new QMenu(this);
diff --git a/src/indicator/qtrayicon.h b/src/indicator/qtrayicon.h
index ea31229..14392e2 100644
--- a/src/indicator/qtrayicon.h
+++ b/src/indicator/qtrayicon.h
@@ -47,14 +47,7 @@ private:
     QAction *about;
     QAction *about_qt;
 
-#ifndef ENABLE_KDE_NOTIFIER
     QSystemTrayIcon *m_tray_icon;
-#else
-    KDENotifier *m_notifier_item;
-#endif
-
-public slots:
-
 };
 
 #endif // QTRAYICON_H