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/tools/plugandpaint/app/paintarea.h | 10 +++++----- .../plugandpaint/plugins/basictools/basictoolsplugin.h | 16 ++++++++-------- .../plugins/extrafilters/extrafiltersplugin.h | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'examples/widgets/tools/plugandpaint') diff --git a/examples/widgets/tools/plugandpaint/app/paintarea.h b/examples/widgets/tools/plugandpaint/app/paintarea.h index 415e4c0be4..1c8ee1ee1b 100644 --- a/examples/widgets/tools/plugandpaint/app/paintarea.h +++ b/examples/widgets/tools/plugandpaint/app/paintarea.h @@ -76,13 +76,13 @@ public: QImage image() const { return theImage; } QColor brushColor() const { return color; } int brushWidth() const { return thickness; } - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; private: void setupPainter(QPainter &painter); diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h index 6e6d639d12..fd9bb9e5f3 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/basictoolsplugin.h @@ -78,22 +78,22 @@ class BasicToolsPlugin : public QObject, public: //! [1] // BrushInterface - QStringList brushes() const Q_DECL_OVERRIDE; + QStringList brushes() const override; QRect mousePress(const QString &brush, QPainter &painter, - const QPoint &pos) Q_DECL_OVERRIDE; + const QPoint &pos) override; QRect mouseMove(const QString &brush, QPainter &painter, - const QPoint &oldPos, const QPoint &newPos) Q_DECL_OVERRIDE; + const QPoint &oldPos, const QPoint &newPos) override; QRect mouseRelease(const QString &brush, QPainter &painter, - const QPoint &pos) Q_DECL_OVERRIDE; + const QPoint &pos) override; // ShapeInterface - QStringList shapes() const Q_DECL_OVERRIDE; - QPainterPath generateShape(const QString &shape, QWidget *parent) Q_DECL_OVERRIDE; + QStringList shapes() const override; + QPainterPath generateShape(const QString &shape, QWidget *parent) override; // FilterInterface - QStringList filters() const Q_DECL_OVERRIDE; + QStringList filters() const override; QImage filterImage(const QString &filter, const QImage &image, - QWidget *parent) Q_DECL_OVERRIDE; + QWidget *parent) override; //! [3] }; //! [2] //! [3] diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h index 4beac9a7fb..dddde78caa 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/extrafiltersplugin.h @@ -66,9 +66,9 @@ class ExtraFiltersPlugin : public QObject, public FilterInterface Q_INTERFACES(FilterInterface) public: - QStringList filters() const Q_DECL_OVERRIDE; + QStringList filters() const override; QImage filterImage(const QString &filter, const QImage &image, - QWidget *parent) Q_DECL_OVERRIDE; + QWidget *parent) override; }; //! [0] -- cgit v1.2.3