From 011aeb131ed904d948b69d6444ff58cdbfd4990c Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Wed, 23 Nov 2016 02:02:53 +0300 Subject: Examples: Remove a redundant virtual specifier for overriders It's a good practice to use override without virtual: https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rh-override Change-Id: I5c2d73600e6c706424589c0487133c03a4ef3629 Reviewed-by: Friedemann Kleint --- examples/widgets/animation/appchooser/main.cpp | 6 +++--- examples/widgets/animation/moveblocks/main.cpp | 10 +++++----- examples/widgets/animation/states/main.cpp | 2 +- examples/widgets/animation/stickman/graphicsview.h | 2 +- examples/widgets/animation/stickman/lifecycle.cpp | 4 ++-- examples/widgets/animation/stickman/rectbutton.h | 6 +++--- examples/widgets/animation/stickman/stickman.h | 4 ++-- examples/widgets/animation/sub-attaq/boat.h | 2 +- examples/widgets/animation/sub-attaq/boat_p.h | 6 +++--- examples/widgets/animation/sub-attaq/states.h | 6 +++--- examples/widgets/animation/sub-attaq/submarine.h | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) (limited to 'examples/widgets/animation') diff --git a/examples/widgets/animation/appchooser/main.cpp b/examples/widgets/animation/appchooser/main.cpp index c9821450c9..71c869f6a2 100644 --- a/examples/widgets/animation/appchooser/main.cpp +++ b/examples/widgets/animation/appchooser/main.cpp @@ -67,12 +67,12 @@ public: painter->drawPixmap(QPointF(), p); } - virtual void mousePressEvent(QGraphicsSceneMouseEvent *) override + void mousePressEvent(QGraphicsSceneMouseEvent *) override { emit clicked(); } - virtual void setGeometry(const QRectF &rect) override + void setGeometry(const QRectF &rect) override { QGraphicsWidget::setGeometry(rect); @@ -98,7 +98,7 @@ public: { } - virtual void resizeEvent(QResizeEvent *) override + void resizeEvent(QResizeEvent *) override { fitInView(sceneRect(), Qt::KeepAspectRatio); } diff --git a/examples/widgets/animation/moveblocks/main.cpp b/examples/widgets/animation/moveblocks/main.cpp index f85211ef88..a9b95808a5 100644 --- a/examples/widgets/animation/moveblocks/main.cpp +++ b/examples/widgets/animation/moveblocks/main.cpp @@ -98,14 +98,14 @@ public: protected: //![14] - virtual bool eventTest(QEvent *event) override + bool eventTest(QEvent *event) override { return (event->type() == QEvent::Type(StateSwitchEvent::StateSwitchType)) && (static_cast(event)->rand() == m_rand); } //![14] - virtual void onTransition(QEvent *) override {} + void onTransition(QEvent *) override {} private: int m_rand; @@ -122,7 +122,7 @@ public: //![10] //![11] - virtual void onEntry(QEvent *) override + void onEntry(QEvent *) override { int n; while ((n = (qrand() % m_stateCount + 1)) == m_lastIndex) @@ -130,7 +130,7 @@ public: m_lastIndex = n; machine()->postEvent(new StateSwitchEvent(n)); } - virtual void onExit(QEvent *) override {} + void onExit(QEvent *) override {} //![11] //![12] @@ -174,7 +174,7 @@ public: } protected: - virtual void resizeEvent(QResizeEvent *event) override + void resizeEvent(QResizeEvent *event) override { fitInView(scene()->sceneRect()); QGraphicsView::resizeEvent(event); diff --git a/examples/widgets/animation/states/main.cpp b/examples/widgets/animation/states/main.cpp index a3c7256933..14d193c301 100644 --- a/examples/widgets/animation/states/main.cpp +++ b/examples/widgets/animation/states/main.cpp @@ -79,7 +79,7 @@ public: { } - virtual void resizeEvent(QResizeEvent *) override + void resizeEvent(QResizeEvent *) override { fitInView(sceneRect(), Qt::KeepAspectRatio); } diff --git a/examples/widgets/animation/stickman/graphicsview.h b/examples/widgets/animation/stickman/graphicsview.h index 4b9b8fc028..56396bb780 100644 --- a/examples/widgets/animation/stickman/graphicsview.h +++ b/examples/widgets/animation/stickman/graphicsview.h @@ -61,7 +61,7 @@ public: GraphicsView(QWidget *parent = 0); protected: - virtual void resizeEvent(QResizeEvent *event) override; + void resizeEvent(QResizeEvent *event) override; void keyPressEvent(QKeyEvent *) override; signals: diff --git a/examples/widgets/animation/stickman/lifecycle.cpp b/examples/widgets/animation/stickman/lifecycle.cpp index 0ece4f3932..253af22b2d 100644 --- a/examples/widgets/animation/stickman/lifecycle.cpp +++ b/examples/widgets/animation/stickman/lifecycle.cpp @@ -70,7 +70,7 @@ public: setTargetState(target); } - virtual bool eventTest(QEvent *e) override + bool eventTest(QEvent *e) override { if (QSignalTransition::eventTest(e)) { QVariant key = static_cast(e)->arguments().at(0); @@ -95,7 +95,7 @@ public: startTimer(1000); } - virtual bool eventTest(QEvent *e) override + bool eventTest(QEvent *e) override { return QEventTransition::eventTest(e) && ((qrand() % 50) == 0); } diff --git a/examples/widgets/animation/stickman/rectbutton.h b/examples/widgets/animation/stickman/rectbutton.h index 864a2c179e..ab47bad0f7 100644 --- a/examples/widgets/animation/stickman/rectbutton.h +++ b/examples/widgets/animation/stickman/rectbutton.h @@ -60,13 +60,13 @@ public: RectButton(QString buttonText); ~RectButton(); - virtual QRectF boundingRect() const override; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; protected: QString m_ButtonText; - virtual void mousePressEvent (QGraphicsSceneMouseEvent *event) override; + void mousePressEvent (QGraphicsSceneMouseEvent *event) override; signals: void clicked(); diff --git a/examples/widgets/animation/stickman/stickman.h b/examples/widgets/animation/stickman/stickman.h index b5fbd14872..f2311a0358 100644 --- a/examples/widgets/animation/stickman/stickman.h +++ b/examples/widgets/animation/stickman/stickman.h @@ -69,8 +69,8 @@ public: StickMan(); ~StickMan(); - virtual QRectF boundingRect() const override; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; int nodeCount() const; Node *node(int idx) const; diff --git a/examples/widgets/animation/sub-attaq/boat.h b/examples/widgets/animation/sub-attaq/boat.h index 24b004a108..a75e2b1474 100644 --- a/examples/widgets/animation/sub-attaq/boat.h +++ b/examples/widgets/animation/sub-attaq/boat.h @@ -86,7 +86,7 @@ public: void updateBoatMovement(); - virtual int type() const override; + int type() const override; signals: void boatDestroyed(); diff --git a/examples/widgets/animation/sub-attaq/boat_p.h b/examples/widgets/animation/sub-attaq/boat_p.h index 5cad6bde96..de11ff9555 100644 --- a/examples/widgets/animation/sub-attaq/boat_p.h +++ b/examples/widgets/animation/sub-attaq/boat_p.h @@ -81,7 +81,7 @@ public: { } protected: - virtual bool eventTest(QEvent *event) override + bool eventTest(QEvent *event) override { if (!QKeyEventTransition::eventTest(event)) return false; @@ -100,7 +100,7 @@ public: { } protected: - virtual bool eventTest(QEvent *event) override + bool eventTest(QEvent *event) override { if (!QKeyEventTransition::eventTest(event)) return false; @@ -131,7 +131,7 @@ public: { } protected: - virtual bool eventTest(QEvent *event) override + bool eventTest(QEvent *event) override { if (!QKeyEventTransition::eventTest(event)) return false; diff --git a/examples/widgets/animation/sub-attaq/states.h b/examples/widgets/animation/sub-attaq/states.h index 1d50abbf02..cd68e319c2 100644 --- a/examples/widgets/animation/sub-attaq/states.h +++ b/examples/widgets/animation/sub-attaq/states.h @@ -152,7 +152,7 @@ class UpdateScoreTransition : public QSignalTransition public: UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); protected: - virtual bool eventTest(QEvent *event) override; + bool eventTest(QEvent *event) override; private: PlayState * game; GraphicsScene *scene; @@ -164,7 +164,7 @@ class WinTransition : public QSignalTransition public: WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target); protected: - virtual bool eventTest(QEvent *event) override; + bool eventTest(QEvent *event) override; private: PlayState * game; GraphicsScene *scene; @@ -176,7 +176,7 @@ private: public: CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key); protected: - virtual bool eventTest(QEvent *event) override; + bool eventTest(QEvent *event) override; private: PlayState *game; }; diff --git a/examples/widgets/animation/sub-attaq/submarine.h b/examples/widgets/animation/sub-attaq/submarine.h index abfdca6195..d145c9cbee 100644 --- a/examples/widgets/animation/sub-attaq/submarine.h +++ b/examples/widgets/animation/sub-attaq/submarine.h @@ -81,7 +81,7 @@ public: void launchTorpedo(int speed); void destroy(); - virtual int type() const override; + int type() const override; QGraphicsRotation *rotation() const { return graphicsRotation; } -- cgit v1.2.3