From 2c52bee29d4636bcdce407ac91b353d34d89258c Mon Sep 17 00:00:00 2001 From: IceN9ne Date: Wed, 28 Nov 2018 22:00:54 -0500 Subject: Use override where possible and remove unnecessary usages of the virtual keyword. --- src/modules/options/OptionsDialog.h | 6 +++--- src/modules/options/OptionsWidget_identity.h | 8 ++++---- src/modules/options/OptionsWidget_sound.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/modules/options') diff --git a/src/modules/options/OptionsDialog.h b/src/modules/options/OptionsDialog.h index 182438de8..8af5e1048 100644 --- a/src/modules/options/OptionsDialog.h +++ b/src/modules/options/OptionsDialog.h @@ -93,9 +93,9 @@ private slots: protected: void apply(bool bDialogAboutToClose); - virtual void closeEvent(QCloseEvent * e); - virtual void keyPressEvent(QKeyEvent * e); - virtual void showEvent(QShowEvent * e); + void closeEvent(QCloseEvent * e) override; + void keyPressEvent(QKeyEvent * e) override; + void showEvent(QShowEvent * e) override; bool recursiveSearch(OptionsDialogTreeWidgetItem * pItem, const QStringList & lKeywords); void clearSearch(); bool searchInSelectors(KviOptionsWidget * pWidget, const QStringList & lKeywords); diff --git a/src/modules/options/OptionsWidget_identity.h b/src/modules/options/OptionsWidget_identity.h index 6193ad09a..f06a02db0 100644 --- a/src/modules/options/OptionsWidget_identity.h +++ b/src/modules/options/OptionsWidget_identity.h @@ -70,7 +70,7 @@ protected: QString m_szAvatarName; protected: - virtual void closeEvent(QCloseEvent * e); + void closeEvent(QCloseEvent * e) override; const QString & avatarName() { return m_szAvatarName; }; protected slots: void okClicked(); @@ -94,7 +94,7 @@ protected: QString m_szUrl; protected: - virtual void closeEvent(QCloseEvent * e); + void closeEvent(QCloseEvent * e) override; const QString & localFileName() { return m_szLocalFileName; }; const QString & errorMessage() { return m_szErrorMessage; }; protected slots: @@ -161,7 +161,7 @@ protected slots: void setNickAlternatives(); protected: - virtual void commit(); + void commit() override; }; #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAvatar KviIconManager::Avatar @@ -186,7 +186,7 @@ protected slots: void chooseAvatar(); protected: - virtual void commit(); + void commit() override; }; #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_identityAdvanced KviIconManager::Gui diff --git a/src/modules/options/OptionsWidget_sound.h b/src/modules/options/OptionsWidget_sound.h index 06f7c2920..82e1abb8e 100644 --- a/src/modules/options/OptionsWidget_sound.h +++ b/src/modules/options/OptionsWidget_sound.h @@ -72,8 +72,8 @@ protected: protected: void soundFillBox(); void mediaFillBox(); - virtual void commit(); - virtual void showEvent(QShowEvent * e); + void commit() override; + void showEvent(QShowEvent * e) override; protected slots: void soundTest(); void soundAutoDetect(); -- cgit v1.3.1-10-gc9f91