Rework tray icon activation behavior yet again

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

diff --git a/src/qtui/systemtray.h b/src/qtui/systemtray.h
index 7192b3f..dc31edc 100644 (file)
--- a/src/qtui/systemtray.h
+++ b/src/qtui/systemtray.h
@@ -68,9 +68,7 @@ public:
   virtual inline bool isSystemTrayAvailable() const;
 
   void setAlert(bool alerted);
   virtual inline bool isSystemTrayAvailable() const;
 
   void setAlert(bool alerted);

-  virtual inline void setInhibitActivation();

   virtual inline bool isVisible() const { return false; }
   virtual inline bool isVisible() const { return false; }

-  inline bool isActivationInhibited() const;

 
   QWidget *associatedWidget() const;
 
 
   QWidget *associatedWidget() const;
 


@@ -100,16 +98,12 @@ protected:
   inline QMenu *trayMenu() const;
   void setTrayMenu(QMenu *);
 
   inline QMenu *trayMenu() const;
   void setTrayMenu(QMenu *);
 

-  virtual bool eventFilter(QObject *obj, QEvent *event);
-

 private slots:
 
 private:
   Mode _mode;
   State _state;
 
 private slots:
 
 private:
   Mode _mode;
   State _state;
 

-  bool _inhibitActivation;
-

   QString _toolTipTitle, _toolTipSubTitle;
   Icon _passiveIcon, _activeIcon, _needsAttentionIcon;
 
   QString _toolTipTitle, _toolTipSubTitle;
   Icon _passiveIcon, _activeIcon, _needsAttentionIcon;
 


@@ -121,8 +115,6 @@ private:
 
 bool SystemTray::isSystemTrayAvailable() const { return false; }
 bool SystemTray::isAlerted() const { return state() == NeedsAttention; }
 
 bool SystemTray::isSystemTrayAvailable() const { return false; }
 bool SystemTray::isAlerted() const { return state() == NeedsAttention; }

-void SystemTray::setInhibitActivation() { _inhibitActivation = true; }
-bool SystemTray::isActivationInhibited() const { return _inhibitActivation; }

 SystemTray::Mode SystemTray::mode() const { return _mode; }
 SystemTray::State SystemTray::state() const { return _state; }
 QMenu *SystemTray::trayMenu() const { return _trayMenu; }
 SystemTray::Mode SystemTray::mode() const { return _mode; }
 SystemTray::State SystemTray::state() const { return _state; }
 QMenu *SystemTray::trayMenu() const { return _trayMenu; }