qtui: Refactor the system tray implementations

[quassel.git] / src / qtui / legacysystemtray.h

diff --git a/src/qtui/legacysystemtray.h b/src/qtui/legacysystemtray.h
index c4af3df..15134b1 100644 (file)
--- a/src/qtui/legacysystemtray.h
+++ b/src/qtui/legacysystemtray.h
@@ -18,11 +18,12 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef LEGACYSYSTEMTRAY_H_
-#define LEGACYSYSTEMTRAY_H_
+#pragma once
 
 #ifndef QT_NO_SYSTEMTRAYICON
 
+#include <QString>
+
 #ifdef HAVE_KDE4
 #  include <KSystemTrayIcon>
 #else
@@ -39,32 +40,24 @@ class LegacySystemTray : public SystemTray
 
 public:
     explicit LegacySystemTray(QWidget *parent);
-    virtual ~LegacySystemTray() {}
-    virtual void init();
 
-    virtual bool isVisible() const;
-    virtual inline bool isSystemTrayAvailable() const;
+    bool isSystemTrayAvailable() const override;
 
 public slots:
-    virtual void setState(State state);
-    virtual void setVisible(bool visible = true);
-    virtual void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0);
-    virtual void closeMessage(uint notificationId);
+    void showMessage(const QString &title, const QString &message, MessageIcon icon = Information, int msTimeout = 10000, uint notificationId = 0) override;
+    void closeMessage(uint notificationId) override;
 
-protected slots:
+private slots:
+    void onModeChanged(Mode mode);
+    void onStateChanged(State state);
+    void onVisibilityChanged(bool isVisible);
 
-protected:
-    virtual void setMode(Mode mode);
+    void onBlinkTimeout();
+    void onActivated(QSystemTrayIcon::ActivationReason);
+    void onMessageClicked();
 
-private:
     void updateIcon();
-
-private slots:
-    void on_blinkTimeout();
-    void on_activated(QSystemTrayIcon::ActivationReason);
-    void on_messageClicked();
-
-    void syncLegacyIcon();
+    void updateToolTip();
 
 private:
     QTimer _blinkTimer;
@@ -81,13 +74,7 @@ private:
 
 // inlines
 
-bool LegacySystemTray::isSystemTrayAvailable() const
-{
-    return mode() == Legacy ? QSystemTrayIcon::isSystemTrayAvailable()
-           : SystemTray::isSystemTrayAvailable();
-}
 
 
-#endif /* QT_NO_SYSTEMTRAYICON */
 
-#endif /* LEGACYSYSTEMTRAY_H_ */
+#endif /* QT_NO_SYSTEMTRAYICON */