From f2866ecc442264139751fef25cb2d92d32ba0487 Mon Sep 17 00:00:00 2001 From: agilob Date: Thu, 8 Oct 2015 19:15:37 +0100 Subject: [PATCH] remove unused code, better logging for systray, removed KDE5 from enum --- src/widget/systemtrayicon.cpp | 6 +++--- src/widget/systemtrayicon_private.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/widget/systemtrayicon.cpp b/src/widget/systemtrayicon.cpp index 0d0a6f89c..9298516d3 100644 --- a/src/widget/systemtrayicon.cpp +++ b/src/widget/systemtrayicon.cpp @@ -88,16 +88,16 @@ SystemTrayIcon::SystemTrayIcon() g_signal_connect(gtkIcon, "button-release-event", G_CALLBACK(callbackButtonClick), this); } #endif - else if (desktop == "kde" && getenv("KDE_SESSION_VERSION") == QString("5")) + else if (desktop == "kde" && getenv("KDE_SESSION_VERSION") == QStringLiteral("5")) { - qDebug() << "Using the Qt backend"; + qDebug() << "Using the Qt backend on KDE5"; qtIcon = new QSystemTrayIcon; backendType = SystrayBackendType::Qt; connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated); } else { - qDebug() << "Using the Qt backend"; + qDebug() << "Using the Qt backend, because nothing else matches"; qtIcon = new QSystemTrayIcon; backendType = SystrayBackendType::Qt; connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated); diff --git a/src/widget/systemtrayicon_private.h b/src/widget/systemtrayicon_private.h index 0023bf684..4b973d400 100644 --- a/src/widget/systemtrayicon_private.h +++ b/src/widget/systemtrayicon_private.h @@ -63,7 +63,6 @@ extern "C" { enum class SystrayBackendType { Qt, - KDE5, #ifdef ENABLE_SYSTRAY_UNITY_BACKEND Unity, #endif