summaryrefslogtreecommitdiffstats
path: root/examples/widgets/dialogs
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2016-06-15 10:12:35 +0200
committerhjk <hjk@theqtcompany.com>2016-06-15 09:32:30 +0000
commit40a54bf565079c007eada8755b9ff7224754949d (patch)
treeccd3bb45ca7369b79fc54d26955cf5b0dfc8ece1 /examples/widgets/dialogs
parent4d3ffae3d562e5b3b2748a2d92eb4ab2933422e7 (diff)
Examples: Replace 'Q_DECL_OVERRIDE' by 'override'
Examples should demonstrate best practice, and we can use the keyword directly nowadays. Change-Id: I1f122e5caceca17290757ffbaf3d660e7daa9ae4 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'examples/widgets/dialogs')
-rw-r--r--examples/widgets/dialogs/classwizard/classwizard.h8
-rw-r--r--examples/widgets/dialogs/licensewizard/licensewizard.h14
2 files changed, 11 insertions, 11 deletions
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();