Removed unused headers from mainwindow.cpp. Disable UseTrayIcon if it's not available for the OS.

1 files changed, 7 insertions, 14 deletions

diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index 2b031642..a9fe5784 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -13,7 +13,10 @@
  * it (currently) only Quits.
  * @param parent
  */
-TrayIcon::TrayIcon(QMainWindow *parent) {
+TrayIcon::TrayIcon(QMainWindow *parent)
+    : showAction(nullptr), hideAction(nullptr), minimizeAction(nullptr),
+      maximizeAction(nullptr), restoreAction(nullptr), quitAction(nullptr),
+      sysTrayIcon(nullptr), trayIconMenu(nullptr), isAllocated(false) {
   parentwin = parent;
 
   if (QSystemTrayIcon::isSystemTrayAvailable() == true) {
@@ -29,22 +32,12 @@ TrayIcon::TrayIcon(QMainWindow *parent) {
                      &TrayIcon::iconActivated);
 
     isAllocated = true;
-  } else {
+  }
 #ifdef QT_DEBUG
+  else {
     dbg() << "No tray icon for this OS possibly also not show options?";
-#endif
-
-    isAllocated = false;
-
-    showAction = nullptr;
-    hideAction = nullptr;
-    minimizeAction = nullptr;
-    maximizeAction = nullptr;
-    restoreAction = nullptr;
-    quitAction = nullptr;
-    sysTrayIcon = nullptr;
-    trayIconMenu = nullptr;
   }
+#endif
 }
 
 /**