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/animation/animatedtiles/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/widgets/animation/animatedtiles') diff --git a/examples/widgets/animation/animatedtiles/main.cpp b/examples/widgets/animation/animatedtiles/main.cpp index 2202f6194b..0511fe8162 100644 --- a/examples/widgets/animation/animatedtiles/main.cpp +++ b/examples/widgets/animation/animatedtiles/main.cpp @@ -75,19 +75,19 @@ public: setCacheMode(DeviceCoordinateCache); } - QRectF boundingRect() const Q_DECL_OVERRIDE + QRectF boundingRect() const override { return QRectF(-65, -65, 130, 130); } - QPainterPath shape() const Q_DECL_OVERRIDE + QPainterPath shape() const override { QPainterPath path; path.addEllipse(boundingRect()); return path; } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) Q_DECL_OVERRIDE + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) override { bool down = option->state & QStyle::State_Sunken; QRectF r = boundingRect(); @@ -112,13 +112,13 @@ signals: void pressed(); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE + void mousePressEvent(QGraphicsSceneMouseEvent *) override { emit pressed(); update(); } - void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE + void mouseReleaseEvent(QGraphicsSceneMouseEvent *) override { update(); } @@ -133,7 +133,7 @@ public: View(QGraphicsScene *scene) : QGraphicsView(scene) { } protected: - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE + void resizeEvent(QResizeEvent *event) override { QGraphicsView::resizeEvent(event); fitInView(sceneRect(), Qt::KeepAspectRatio); -- cgit v1.2.3