diff options
| author | hjk <hjk@theqtcompany.com> | 2016-06-15 10:12:35 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2016-06-15 09:32:30 +0000 |
| commit | 40a54bf565079c007eada8755b9ff7224754949d (patch) | |
| tree | ccd3bb45ca7369b79fc54d26955cf5b0dfc8ece1 /examples/widgets/widgets/icons | |
| parent | 4d3ffae3d562e5b3b2748a2d92eb4ab2933422e7 (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/widgets/icons')
| -rw-r--r-- | examples/widgets/widgets/icons/iconsizespinbox.h | 4 | ||||
| -rw-r--r-- | examples/widgets/widgets/icons/imagedelegate.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/widgets/widgets/icons/iconsizespinbox.h b/examples/widgets/widgets/icons/iconsizespinbox.h index 1bbd2f793f..96a56e75c9 100644 --- a/examples/widgets/widgets/icons/iconsizespinbox.h +++ b/examples/widgets/widgets/icons/iconsizespinbox.h @@ -61,8 +61,8 @@ class IconSizeSpinBox : public QSpinBox public: explicit IconSizeSpinBox(QWidget *parent = Q_NULLPTR); - int valueFromText(const QString &text) const Q_DECL_OVERRIDE; - QString textFromValue(int value) const Q_DECL_OVERRIDE; + int valueFromText(const QString &text) const override; + QString textFromValue(int value) const override; }; //! [0] diff --git a/examples/widgets/widgets/icons/imagedelegate.h b/examples/widgets/widgets/icons/imagedelegate.h index 28822d01fb..928085d85b 100644 --- a/examples/widgets/widgets/icons/imagedelegate.h +++ b/examples/widgets/widgets/icons/imagedelegate.h @@ -64,10 +64,10 @@ public: //! [1] QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; - void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; //! [1] //! [2] private slots: |