Examples: Add Q_DECL_OVERRIDE to overridden functions

Q_DECL_OVERRIDE (which expands to 'override' for supported compiler)
helps to declare the intent (that it is an overridden function) and
force compilation error when there is no such virtual function in the
base class.
The examples should show the best practice of having it, as it may save
the programmer quite some time in case of change of API or typo in the
function name or arguments.

This change was done automatically with
clang-modernize -add-override -override-macros

And fixed MSVC compilation by removing inline for TorrentViewDelegate::paint

Change-Id: Ice66ae93fae571266f908703d5b8892b2c1ebb1a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

17 files changed, 66 insertions, 66 deletions

diff --git a/examples/widgets/animation/animatedtiles/main.cpp b/examples/widgets/animation/animatedtiles/main.cpp
index 6eab018929..09e9790646 100644
--- a/examples/widgets/animation/animatedtiles/main.cpp
+++ b/examples/widgets/animation/animatedtiles/main.cpp
@@ -64,19 +64,19 @@ public:
         setCacheMode(DeviceCoordinateCache);
     }
 
-    QRectF boundingRect() const
+    QRectF boundingRect() const Q_DECL_OVERRIDE
     {
         return QRectF(-65, -65, 130, 130);
     }
 
-    QPainterPath shape() const
+    QPainterPath shape() const Q_DECL_OVERRIDE
     {
         QPainterPath path;
         path.addEllipse(boundingRect());
         return path;
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) Q_DECL_OVERRIDE
     {
         bool down = option->state & QStyle::State_Sunken;
         QRectF r = boundingRect();
@@ -101,13 +101,13 @@ signals:
     void pressed();
 
 protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *)
+    void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE
     {
         emit pressed();
         update();
     }
 
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *)
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE
     {
         update();
     }
@@ -122,7 +122,7 @@ public:
     View(QGraphicsScene *scene) : QGraphicsView(scene) { }
 
 protected:
-    void resizeEvent(QResizeEvent *event)
+    void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE
     {
         QGraphicsView::resizeEvent(event);
         fitInView(sceneRect(), Qt::KeepAspectRatio);
diff --git a/examples/widgets/animation/appchooser/main.cpp b/examples/widgets/animation/appchooser/main.cpp
index a65e998b32..652e458411 100644
--- a/examples/widgets/animation/appchooser/main.cpp
+++ b/examples/widgets/animation/appchooser/main.cpp
@@ -52,17 +52,17 @@ public:
     {
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE
     {
         painter->drawPixmap(QPointF(), p);
     }
 
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent * )
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent * ) Q_DECL_OVERRIDE
     {
         emit clicked();
     }
 
-    virtual void setGeometry(const QRectF &rect)
+    virtual void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE
     {
         QGraphicsWidget::setGeometry(rect);
 
@@ -88,7 +88,7 @@ public:
     {
     }
 
-    virtual void resizeEvent(QResizeEvent *)
+    virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE
     {
         fitInView(sceneRect(), Qt::KeepAspectRatio);
     }
diff --git a/examples/widgets/animation/easing/animation.h b/examples/widgets/animation/easing/animation.h
index d12a219abd..296f4c9da1 100644
--- a/examples/widgets/animation/easing/animation.h
+++ b/examples/widgets/animation/easing/animation.h
@@ -67,7 +67,7 @@ public:
         m_path = QPainterPath();
     }
 
-    void updateCurrentTime(int currentTime)
+    void updateCurrentTime(int currentTime) Q_DECL_OVERRIDE
     {
         if (m_pathType == CirclePath) {
             if (m_path.isEmpty()) {
diff --git a/examples/widgets/animation/moveblocks/main.cpp b/examples/widgets/animation/moveblocks/main.cpp
index 6d08381a53..57f13ceebe 100644
--- a/examples/widgets/animation/moveblocks/main.cpp
+++ b/examples/widgets/animation/moveblocks/main.cpp
@@ -70,7 +70,7 @@ class QGraphicsRectWidget : public QGraphicsWidget
 {
 public:
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *,
-               QWidget *)
+               QWidget *) Q_DECL_OVERRIDE
     {
         painter->fillRect(rect(), Qt::blue);
     }
@@ -88,14 +88,14 @@ public:
 
 protected:
 //![14]
-    virtual bool eventTest(QEvent *event)
+    virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE
     {
         return (event->type() == QEvent::Type(StateSwitchEvent::StateSwitchType))
             && (static_cast<StateSwitchEvent *>(event)->rand() == m_rand);
     }
 //![14]
 
-    virtual void onTransition(QEvent *) {}
+    virtual void onTransition(QEvent *) Q_DECL_OVERRIDE {}
 
 private:
     int m_rand;
@@ -112,7 +112,7 @@ public:
 //![10]
 
 //![11]
-    virtual void onEntry(QEvent *)
+    virtual void onEntry(QEvent *) Q_DECL_OVERRIDE
     {
         int n;
         while ((n = (qrand() % m_stateCount + 1)) == m_lastIndex)
@@ -120,7 +120,7 @@ public:
         m_lastIndex = n;
         machine()->postEvent(new StateSwitchEvent(n));
     }
-    virtual void onExit(QEvent *) {}
+    virtual void onExit(QEvent *) Q_DECL_OVERRIDE {}
 //![11]
 
 //![12]
@@ -164,7 +164,7 @@ public:
     }
 
 protected:
-    virtual void resizeEvent(QResizeEvent *event)
+    virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE
     {
         fitInView(scene()->sceneRect());
         QGraphicsView::resizeEvent(event);
diff --git a/examples/widgets/animation/states/main.cpp b/examples/widgets/animation/states/main.cpp
index fc633bd972..8bc8535ece 100644
--- a/examples/widgets/animation/states/main.cpp
+++ b/examples/widgets/animation/states/main.cpp
@@ -48,12 +48,12 @@ public:
     {
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE
     {
         painter->drawPixmap(QPointF(), p);
     }
 
-    QRectF boundingRect() const
+    QRectF boundingRect() const Q_DECL_OVERRIDE
     {
         return QRectF( QPointF(0, 0), p.size());
     }
@@ -69,7 +69,7 @@ public:
     {
     }
 
-    virtual void resizeEvent(QResizeEvent *)
+    virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE
     {
         fitInView(sceneRect(), Qt::KeepAspectRatio);
     }
diff --git a/examples/widgets/animation/stickman/graphicsview.h b/examples/widgets/animation/stickman/graphicsview.h
index 60abb6448f..cdccbbfbd3 100644
--- a/examples/widgets/animation/stickman/graphicsview.h
+++ b/examples/widgets/animation/stickman/graphicsview.h
@@ -51,8 +51,8 @@ public:
     GraphicsView(QWidget *parent = 0);
 
 protected:
-    virtual void resizeEvent(QResizeEvent *event);
-    void keyPressEvent(QKeyEvent *);
+    virtual void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE;
 
 signals:
     void keyPressed(int key);
diff --git a/examples/widgets/animation/stickman/lifecycle.cpp b/examples/widgets/animation/stickman/lifecycle.cpp
index 09ca45e55b..7b089b5459 100644
--- a/examples/widgets/animation/stickman/lifecycle.cpp
+++ b/examples/widgets/animation/stickman/lifecycle.cpp
@@ -60,7 +60,7 @@ public:
         setTargetState(target);
     }
 
-    virtual bool eventTest(QEvent *e)
+    virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE
     {
         if (QSignalTransition::eventTest(e)) {
             QVariant key = static_cast<QStateMachine::SignalEvent*>(e)->arguments().at(0);
@@ -85,7 +85,7 @@ public:
         startTimer(1000);
     }
 
-    virtual bool eventTest(QEvent *e)
+    virtual bool eventTest(QEvent *e) Q_DECL_OVERRIDE
     {
         return QEventTransition::eventTest(e) && ((qrand() % 50) == 0);
     }
diff --git a/examples/widgets/animation/stickman/node.h b/examples/widgets/animation/stickman/node.h
index 9c7cc8d75a..6da83d5474 100644
--- a/examples/widgets/animation/stickman/node.h
+++ b/examples/widgets/animation/stickman/node.h
@@ -50,18 +50,18 @@ public:
     explicit Node(const QPointF &pos, QGraphicsItem *parent = 0);
     ~Node();
 
-    QRectF boundingRect() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    QRectF boundingRect() const Q_DECL_OVERRIDE;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
 
 signals:
     void positionChanged();
 
 protected:
-    QVariant itemChange(GraphicsItemChange change, const QVariant &value);
+    QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE;
 
-    void mousePressEvent(QGraphicsSceneMouseEvent *);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
+    void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE;
 
 private:
     bool m_dragging;
diff --git a/examples/widgets/animation/stickman/rectbutton.h b/examples/widgets/animation/stickman/rectbutton.h
index 16c70fddd4..1cc9be2f97 100644
--- a/examples/widgets/animation/stickman/rectbutton.h
+++ b/examples/widgets/animation/stickman/rectbutton.h
@@ -50,13 +50,13 @@ public:
     RectButton(QString buttonText);
     ~RectButton();
 
-    virtual QRectF boundingRect() const;
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual QRectF boundingRect() const Q_DECL_OVERRIDE;
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
 
 protected:
     QString m_ButtonText;
 
-    virtual void mousePressEvent (QGraphicsSceneMouseEvent *event);
+    virtual void mousePressEvent (QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
 
 signals:
     void clicked();
diff --git a/examples/widgets/animation/stickman/stickman.h b/examples/widgets/animation/stickman/stickman.h
index 08928a48a6..d8538efc52 100644
--- a/examples/widgets/animation/stickman/stickman.h
+++ b/examples/widgets/animation/stickman/stickman.h
@@ -59,8 +59,8 @@ public:
     StickMan();
     ~StickMan();
 
-    virtual QRectF boundingRect() const;
-    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    virtual QRectF boundingRect() const Q_DECL_OVERRIDE;
+    virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE;
 
     int nodeCount() const;
     Node *node(int idx) const;
@@ -82,7 +82,7 @@ public slots:
     void childPositionChanged();
 
 protected:
-    void timerEvent(QTimerEvent *e);
+    void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE;
 
 private:
 
diff --git a/examples/widgets/animation/sub-attaq/boat.h b/examples/widgets/animation/sub-attaq/boat.h
index 82f43572e8..561ba49d27 100644
--- a/examples/widgets/animation/sub-attaq/boat.h
+++ b/examples/widgets/animation/sub-attaq/boat.h
@@ -77,7 +77,7 @@ public:
 
     void updateBoatMovement();
 
-    virtual int type() const;
+    virtual int type() const Q_DECL_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 fc3ba81d63..19c5dad9ba 100644
--- a/examples/widgets/animation/sub-attaq/boat_p.h
+++ b/examples/widgets/animation/sub-attaq/boat_p.h
@@ -72,7 +72,7 @@ public:
     {
     }
 protected:
-    virtual bool eventTest(QEvent *event)
+    virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE
     {
         if (!QKeyEventTransition::eventTest(event))
             return false;
@@ -91,13 +91,13 @@ public:
     {
     }
 protected:
-    virtual bool eventTest(QEvent *event)
+    virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE
     {
         if (!QKeyEventTransition::eventTest(event))
             return false;
         return (boat->currentSpeed() >= 0);
     }
-    void onTransition(QEvent *)
+    void onTransition(QEvent *) Q_DECL_OVERRIDE
     {
         //We decrease the speed if needed
         if (key == Qt::Key_Left && boat->currentDirection() == Boat::Right)
@@ -122,7 +122,7 @@ public:
     {
     }
 protected:
-    virtual bool eventTest(QEvent *event)
+    virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE
     {
         if (!QKeyEventTransition::eventTest(event))
             return false;
@@ -141,7 +141,7 @@ public:
     {
     }
 protected:
-    void onEntry(QEvent *)
+    void onEntry(QEvent *) Q_DECL_OVERRIDE
     {
         boat->setCurrentDirection(Boat::Right);
         boat->updateBoatMovement();
@@ -158,7 +158,7 @@ public:
     {
     }
 protected:
-    void onEntry(QEvent *)
+    void onEntry(QEvent *) Q_DECL_OVERRIDE
     {
         boat->setCurrentDirection(Boat::Left);
         boat->updateBoatMovement();
@@ -175,7 +175,7 @@ public:
     {
     }
 protected:
-    void onEntry(QEvent *)
+    void onEntry(QEvent *) Q_DECL_OVERRIDE
     {
         boat->setCurrentSpeed(0);
         boat->setCurrentDirection(Boat::None);
@@ -193,7 +193,7 @@ public:
     {
     }
 protected:
-    void onEntry(QEvent *)
+    void onEntry(QEvent *) Q_DECL_OVERRIDE
     {
         Bomb *b = new Bomb();
         b->setPos(boat->x()+boat->size().width(),boat->y());
@@ -214,7 +214,7 @@ public:
     {
     }
 protected:
-    void onEntry(QEvent *)
+    void onEntry(QEvent *) Q_DECL_OVERRIDE
     {
         Bomb *b = new Bomb();
         b->setPos(boat->x() - b->size().width(), boat->y());
diff --git a/examples/widgets/animation/sub-attaq/pixmapitem.h b/examples/widgets/animation/sub-attaq/pixmapitem.h
index e093fbd5b5..baca0c1cba 100644
--- a/examples/widgets/animation/sub-attaq/pixmapitem.h
+++ b/examples/widgets/animation/sub-attaq/pixmapitem.h
@@ -54,8 +54,8 @@ public:
     PixmapItem(const QString &fileName, GraphicsScene::Mode mode, QGraphicsItem * parent = 0);
     PixmapItem(const QString &fileName, QGraphicsScene *scene);
     QSizeF size() const;
-    QRectF boundingRect() const;
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+    QRectF boundingRect() const Q_DECL_OVERRIDE;
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE;
 private:
     QPixmap pix;
 };
diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.h b/examples/widgets/animation/sub-attaq/qanimationstate.h
index 68eac43e13..c2b7e12211 100644
--- a/examples/widgets/animation/sub-attaq/qanimationstate.h
+++ b/examples/widgets/animation/sub-attaq/qanimationstate.h
@@ -71,9 +71,9 @@ signals:
     void animationFinished();
 
 protected:
-    void onEntry(QEvent *);
-    void onExit(QEvent *);
-    bool event(QEvent *e);
+    void onEntry(QEvent *) Q_DECL_OVERRIDE;
+    void onExit(QEvent *) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) Q_DECL_OVERRIDE;
 
 private:
     Q_DISABLE_COPY(QAnimationState)
diff --git a/examples/widgets/animation/sub-attaq/states.h b/examples/widgets/animation/sub-attaq/states.h
index 3cd27be9a4..19016cb76e 100644
--- a/examples/widgets/animation/sub-attaq/states.h
+++ b/examples/widgets/animation/sub-attaq/states.h
@@ -63,7 +63,7 @@ public:
     ~PlayState();
 
  protected:
-    void onEntry(QEvent *);
+    void onEntry(QEvent *) Q_DECL_OVERRIDE;
 
 private :
     GraphicsScene *scene;
@@ -85,7 +85,7 @@ class LevelState : public QState
 public:
     LevelState(GraphicsScene *scene, PlayState *game, QState *parent = 0);
 protected:
-    void onEntry(QEvent *);
+    void onEntry(QEvent *) Q_DECL_OVERRIDE;
 private :
     void initializeLevel();
     GraphicsScene *scene;
@@ -98,8 +98,8 @@ public:
     explicit PauseState(GraphicsScene *scene, QState *parent = 0);
 
 protected:
-    void onEntry(QEvent *);
-    void onExit(QEvent *);
+    void onEntry(QEvent *) Q_DECL_OVERRIDE;
+    void onExit(QEvent *) Q_DECL_OVERRIDE;
 private :
     GraphicsScene *scene;
 };
@@ -110,8 +110,8 @@ public:
     LostState(GraphicsScene *scene, PlayState *game, QState *parent = 0);
 
 protected:
-    void onEntry(QEvent *);
-    void onExit(QEvent *);
+    void onEntry(QEvent *) Q_DECL_OVERRIDE;
+    void onExit(QEvent *) Q_DECL_OVERRIDE;
 private :
     GraphicsScene *scene;
     PlayState *game;
@@ -123,8 +123,8 @@ public:
     WinState(GraphicsScene *scene, PlayState *game, QState *parent = 0);
 
 protected:
-    void onEntry(QEvent *);
-    void onExit(QEvent *);
+    void onEntry(QEvent *) Q_DECL_OVERRIDE;
+    void onExit(QEvent *) Q_DECL_OVERRIDE;
 private :
     GraphicsScene *scene;
     PlayState *game;
@@ -143,7 +143,7 @@ class UpdateScoreTransition : public QSignalTransition
 public:
     UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target);
 protected:
-    virtual bool eventTest(QEvent *event);
+    virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE;
 private:
     PlayState * game;
     GraphicsScene *scene;
@@ -155,7 +155,7 @@ class WinTransition : public QSignalTransition
 public:
     WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target);
 protected:
-    virtual bool eventTest(QEvent *event);
+    virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE;
 private:
     PlayState * game;
     GraphicsScene *scene;
@@ -167,7 +167,7 @@ private:
 public:
     CustomSpaceTransition(QWidget *widget, PlayState *game, QEvent::Type type, int key);
 protected:
-    virtual bool eventTest(QEvent *event);
+    virtual bool eventTest(QEvent *event) Q_DECL_OVERRIDE;
 private:
     PlayState *game;
 };
diff --git a/examples/widgets/animation/sub-attaq/submarine.h b/examples/widgets/animation/sub-attaq/submarine.h
index 802bf6f81c..b087d0178d 100644
--- a/examples/widgets/animation/sub-attaq/submarine.h
+++ b/examples/widgets/animation/sub-attaq/submarine.h
@@ -72,7 +72,7 @@ public:
     void launchTorpedo(int speed);
     void destroy();
 
-    virtual int type() const;
+    virtual int type() const Q_DECL_OVERRIDE;
 
     QGraphicsRotation *rotation() const { return graphicsRotation; }
 
diff --git a/examples/widgets/animation/sub-attaq/submarine_p.h b/examples/widgets/animation/sub-attaq/submarine_p.h
index e1755505df..f117be7b8c 100644
--- a/examples/widgets/animation/sub-attaq/submarine_p.h
+++ b/examples/widgets/animation/sub-attaq/submarine_p.h
@@ -84,7 +84,7 @@ protected slots:
     }
 
 protected:
-    void onEntry(QEvent *e)
+    void onEntry(QEvent *e) Q_DECL_OVERRIDE
     {
         if (submarine->currentDirection() == SubMarine::Left) {
             movementAnimation->setEndValue(QPointF(0,submarine->y()));
@@ -116,14 +116,14 @@ public:
     }
 
 protected:
-    void onEntry(QEvent *e)
+    void onEntry(QEvent *e) Q_DECL_OVERRIDE
     {
         returnAnimation->stop();
         returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.);
         QAnimationState::onEntry(e);
     }
 
-    void onExit(QEvent *e)
+    void onExit(QEvent *e) Q_DECL_OVERRIDE
     {
         submarine->currentDirection() == SubMarine::Right ? submarine->setCurrentDirection(SubMarine::Left) : submarine->setCurrentDirection(SubMarine::Right);
         QAnimationState::onExit(e);