From 4c9361124dd9d8ca2a4358f091bf7face986ac2f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 23 Nov 2020 16:44:16 +0100 Subject: [PATCH] Fix compile warnings about missing overrides Add missing overrides. Remove validateCurrentPage() completely, since it didn't do anything useful. This method is not overridden in any superclass up to QWizard. Task-number: QTCREATORBUG-24098 Change-Id: Iffa335c471469c56e830b6160da49359fc5d6bc2 Reviewed-by: Eike Ziller --- src/plugins/designer/cpp/formclasswizard.h | 5 +++-- src/plugins/designer/cpp/formclasswizarddialog.cpp | 5 ----- src/plugins/designer/cpp/formclasswizarddialog.h | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h index 8dc4868a5e5..a80d87c2142 100644 --- a/src/plugins/designer/cpp/formclasswizard.h +++ b/src/plugins/designer/cpp/formclasswizard.h @@ -44,9 +44,10 @@ public: QString formSuffix() const; private: - Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const; + Core::BaseFileWizard *create(QWidget *parent, + const Core::WizardDialogParameters ¶meters) const override; - Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; + Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const override; }; } // namespace Internal diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp index 66956b99a76..99023a51852 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.cpp +++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp @@ -62,11 +62,6 @@ void FormClassWizardDialog::setPath(const QString &p) m_classPage->setPath(p); } -bool FormClassWizardDialog::validateCurrentPage() -{ - return QWizard::validateCurrentPage(); -} - void FormClassWizardDialog::initializePage(int id) { Core::BaseFileWizard::initializePage(id); diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h index 69b3deff45f..ab7680c513c 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.h +++ b/src/plugins/designer/cpp/formclasswizarddialog.h @@ -50,10 +50,8 @@ public: Designer::FormClassWizardParameters parameters() const; - bool validateCurrentPage(); - protected: - void initializePage(int id); + void initializePage(int id) override; private: FormTemplateWizardPage *m_formPage = nullptr;