From 40a54bf565079c007eada8755b9ff7224754949d Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Jun 2016 10:12:35 +0200 Subject: Examples: Replace 'Q_DECL_OVERRIDE' by 'override' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Examples should demonstrate best practice, and we can use the keyword directly nowadays. Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4 Reviewed-by: Topi Reiniö --- examples/widgets/dialogs/classwizard/classwizard.h | 8 ++++---- examples/widgets/dialogs/licensewizard/licensewizard.h | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/widgets/dialogs') diff --git a/examples/widgets/dialogs/classwizard/classwizard.h b/examples/widgets/dialogs/classwizard/classwizard.h index 8be08f180c..fee0f6df66 100644 --- a/examples/widgets/dialogs/classwizard/classwizard.h +++ b/examples/widgets/dialogs/classwizard/classwizard.h @@ -69,7 +69,7 @@ class ClassWizard : public QWizard public: ClassWizard(QWidget *parent = 0); - void accept() Q_DECL_OVERRIDE; + void accept() override; }; //! [0] @@ -117,7 +117,7 @@ public: CodeStylePage(QWidget *parent = 0); protected: - void initializePage() Q_DECL_OVERRIDE; + void initializePage() override; private: QCheckBox *commentCheckBox; @@ -138,7 +138,7 @@ public: OutputFilesPage(QWidget *parent = 0); protected: - void initializePage() Q_DECL_OVERRIDE; + void initializePage() override; private: QLabel *outputDirLabel; @@ -157,7 +157,7 @@ public: ConclusionPage(QWidget *parent = 0); protected: - void initializePage() Q_DECL_OVERRIDE; + void initializePage() override; private: QLabel *label; diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.h b/examples/widgets/dialogs/licensewizard/licensewizard.h index 4e7e6feb09..c7709d88b3 100644 --- a/examples/widgets/dialogs/licensewizard/licensewizard.h +++ b/examples/widgets/dialogs/licensewizard/licensewizard.h @@ -88,7 +88,7 @@ class IntroPage : public QWizardPage public: IntroPage(QWidget *parent = 0); - int nextId() const Q_DECL_OVERRIDE; + int nextId() const override; private: QLabel *topLabel; @@ -105,7 +105,7 @@ class EvaluatePage : public QWizardPage public: EvaluatePage(QWidget *parent = 0); - int nextId() const Q_DECL_OVERRIDE; + int nextId() const override; private: QLabel *nameLabel; @@ -122,7 +122,7 @@ class RegisterPage : public QWizardPage public: RegisterPage(QWidget *parent = 0); - int nextId() const Q_DECL_OVERRIDE; + int nextId() const override; private: QLabel *nameLabel; @@ -138,7 +138,7 @@ class DetailsPage : public QWizardPage public: DetailsPage(QWidget *parent = 0); - int nextId() const Q_DECL_OVERRIDE; + int nextId() const override; private: QLabel *companyLabel; @@ -157,9 +157,9 @@ class ConclusionPage : public QWizardPage public: ConclusionPage(QWidget *parent = 0); - void initializePage() Q_DECL_OVERRIDE; - int nextId() const Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void initializePage() override; + int nextId() const override; + void setVisible(bool visible) override; private slots: void printButtonClicked(); -- cgit v1.2.3