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/painting/affine/xform.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/widgets/painting/affine') diff --git a/examples/widgets/painting/affine/xform.h b/examples/widgets/painting/affine/xform.h index 11c8fbde90..f2eed99b4f 100644 --- a/examples/widgets/painting/affine/xform.h +++ b/examples/widgets/painting/affine/xform.h @@ -80,14 +80,14 @@ public: enum XFormType { VectorType, PixmapType, TextType }; XFormView(QWidget *parent); - void paint(QPainter *) Q_DECL_OVERRIDE; + void paint(QPainter *) override; void drawVectorType(QPainter *painter); void drawPixmapType(QPainter *painter); void drawTextType(QPainter *painter); - QSize sizeHint() const Q_DECL_OVERRIDE { return QSize(500, 500); } + QSize sizeHint() const override { return QSize(500, 500); } - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; HoverPoints *hoverPoints() { return pts; } bool animation() const { return timer.isActive(); } @@ -124,9 +124,9 @@ signals: void shearChanged(int shear); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; #ifndef QT_NO_WHEELEVENT - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif private: -- cgit v1.2.3