diff options
| author | 2016-08-11 22:31:03 -0400 | |
|---|---|---|
| committer | 2016-08-11 22:31:03 -0400 | |
| commit | 81510bfd272349278748ac553bc6f1c2a7d8a41d (patch) | |
| tree | 4ca0c47b0a7b61c83e41a26d9fc8a4bafbaf5f8a /src/modules | |
| parent | KviWindow: Remove if checks on delete (diff) | |
| download | KVIrc-81510bfd272349278748ac553bc6f1c2a7d8a41d.tar.gz KVIrc-81510bfd272349278748ac553bc6f1c2a7d8a41d.tar.bz2 KVIrc-81510bfd272349278748ac553bc6f1c2a7d8a41d.zip | |
KviTrayIcon: Get rid of the die() method
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.cpp | 5 | ||||
| -rw-r--r-- | src/modules/trayicon/libkvitrayicon.h | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp index 1516ccabc..52af34a64 100644 --- a/src/modules/trayicon/libkvitrayicon.cpp +++ b/src/modules/trayicon/libkvitrayicon.cpp @@ -159,11 +159,6 @@ void KviTrayIconWidget::executeInternalCommand(bool) g_pMainWindow->executeInternalCommand(iCmd); } -void KviTrayIconWidget::die() -{ - delete this; -} - void KviTrayIconWidget::flashingTimerShot() { m_bFlashed = !m_bFlashed; diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h index 0fefb08b5..48c27ddc3 100644 --- a/src/modules/trayicon/libkvitrayicon.h +++ b/src/modules/trayicon/libkvitrayicon.h @@ -38,12 +38,12 @@ class QPixmap; class QTimer; class QMenu; -class KviTrayIconWidget : public QSystemTrayIcon, public KviTrayIcon +class KviTrayIconWidget final : public QSystemTrayIcon, public KviTrayIcon { Q_OBJECT public: KviTrayIconWidget(); - ~KviTrayIconWidget(); + ~KviTrayIconWidget() override; protected: KviDynamicToolTip m_Tip; @@ -68,13 +68,12 @@ protected: unsigned int m_iOther; public: - virtual void refresh(); - virtual void die(); + void refresh() override; void updateIcon(); protected: void grabActivityInfo(); - virtual bool event(QEvent * e); + bool event(QEvent * e) override; protected slots: void fillContextPopup(); void toggleParentFrame(); |
