diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-14 03:20:58 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-12-14 12:28:34 +0000 |
commit | 8df4b1deec1296b562dacb6a0b5c84ed7fdb08cf (patch) | |
tree | f46cf70c39eb2bdeb8e57620ee93647f3d7a7bc7 /src/assistant/qhelpconverter | |
parent | 380c6abac71d8d300e088943cf5ce757b378775e (diff) | |
download | qttools-8df4b1deec1296b562dacb6a0b5c84ed7fdb08cf.tar.gz |
Assistant: Add missing override and remove redundant virtual
Change-Id: I29ad763c013b9a41862c45a7e39b34d9c856ab04
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Diffstat (limited to 'src/assistant/qhelpconverter')
-rw-r--r-- | src/assistant/qhelpconverter/conversionwizard.h | 4 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/filespage.h | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/filterpage.h | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/generalpage.h | 4 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/inputpage.h | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/outputpage.h | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/assistant/qhelpconverter/conversionwizard.h b/src/assistant/qhelpconverter/conversionwizard.h index 401212f55..9c86f3e04 100644 --- a/src/assistant/qhelpconverter/conversionwizard.h +++ b/src/assistant/qhelpconverter/conversionwizard.h @@ -61,9 +61,9 @@ private: enum Pages {Input_Page, General_Page, Filter_Page, Identifier_Page, Path_Page, Files_Page, Output_Page, Finish_Page}; - void initializePage(int id); + void initializePage(int id) override; QStringList getUnreferencedFiles(const QStringList &files); - bool eventFilter(QObject *obj, QEvent *e); + bool eventFilter(QObject *obj, QEvent *e) override; AdpReader m_adpReader; InputPage *m_inputPage; diff --git a/src/assistant/qhelpconverter/filespage.h b/src/assistant/qhelpconverter/filespage.h index 2da2657ec..3e0d6af3e 100644 --- a/src/assistant/qhelpconverter/filespage.h +++ b/src/assistant/qhelpconverter/filespage.h @@ -48,7 +48,7 @@ private slots: void removeAllFiles(); private: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; Ui::FilesPage m_ui; QStringList m_files; diff --git a/src/assistant/qhelpconverter/filterpage.h b/src/assistant/qhelpconverter/filterpage.h index 757851bea..f6bf7797d 100644 --- a/src/assistant/qhelpconverter/filterpage.h +++ b/src/assistant/qhelpconverter/filterpage.h @@ -54,7 +54,7 @@ private slots: void removeFilter(); private: - bool validatePage(); + bool validatePage() override; Ui::FilterPage m_ui; QStringList m_filterAttributes; diff --git a/src/assistant/qhelpconverter/generalpage.h b/src/assistant/qhelpconverter/generalpage.h index 5c547cfd7..b52cdffb7 100644 --- a/src/assistant/qhelpconverter/generalpage.h +++ b/src/assistant/qhelpconverter/generalpage.h @@ -42,8 +42,8 @@ public: GeneralPage(QWidget *parent = 0); private: - bool validatePage(); - bool isComplete() const; + bool validatePage() override; + bool isComplete() const override; Ui::GeneralPage m_ui; }; diff --git a/src/assistant/qhelpconverter/inputpage.h b/src/assistant/qhelpconverter/inputpage.h index 2f5b5b145..a52be283a 100644 --- a/src/assistant/qhelpconverter/inputpage.h +++ b/src/assistant/qhelpconverter/inputpage.h @@ -47,7 +47,7 @@ private slots: void getFileName(); private: - bool validatePage(); + bool validatePage() override; Ui::InputPage m_ui; AdpReader *m_adpReader; diff --git a/src/assistant/qhelpconverter/outputpage.h b/src/assistant/qhelpconverter/outputpage.h index d11bd4b5d..ac7ae9683 100644 --- a/src/assistant/qhelpconverter/outputpage.h +++ b/src/assistant/qhelpconverter/outputpage.h @@ -44,8 +44,8 @@ public: void setCollectionComponentEnabled(bool enabled); private: - bool isComplete() const; - bool validatePage(); + bool isComplete() const override; + bool validatePage() override; bool checkFile(const QString &fileName, const QString &title); |