Remove most compiler warnings about missing overrides

Remove around 1000 compiler warnings about missing overrides
in our auto tests.

This significantly reduce the compiler warning noise in our auto
tests, so that one can actually better see the real problems
inbetween.

Change-Id: Id0c04dba43fcaf55d8cd2b5c6697358857c31bf9
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

10 files changed, 59 insertions, 52 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index e19ef4c308..934505034e 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -87,7 +87,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         Q_UNUSED(option);
         Q_UNUSED(widget);
@@ -1113,7 +1113,7 @@ public:
     }
 
     virtual int pixelMetric(PixelMetric metric, const QStyleOption * option = 0,
-                            const QWidget * widget = 0 ) const;
+                            const QWidget * widget = 0 ) const override;
 
     int hspacing;
     int vspacing;
@@ -1122,7 +1122,7 @@ public:
                       QSizePolicy::ControlType control2,
                       Qt::Orientation orientation,
                       const QStyleOption *option = 0,
-                      const QWidget *widget = 0) const;
+                      const QWidget *widget = 0) const override;
 
 };
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index 65480bf665..d1f8954ab9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -163,7 +163,7 @@ public:
         }
 
 protected:
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override;
 };
 
 QSizeF TestWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index eaad5e478d..5df8b7c1ac 100644
--- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -43,7 +43,7 @@ public:
           m_painter(0)
     {}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         m_painter = painter;
         ++numRepaints;
@@ -70,7 +70,7 @@ public:
           m_painter(0), m_source(0)
     {}
 
-    QRectF boundingRectFor(const QRectF &rect) const
+    QRectF boundingRectFor(const QRectF &rect) const override
     { return rect.adjusted(-m_margin, -m_margin, m_margin, m_margin); }
 
     void reset()
@@ -94,7 +94,7 @@ public:
     int margin() const
     { return m_margin; }
 
-    void draw(QPainter *painter)
+    void draw(QPainter *painter) override
     {
         ++numRepaints;
         if (storeDeviceDependentStuff) {
@@ -109,7 +109,7 @@ public:
         source()->draw(painter);
     }
 
-    void sourceChanged(ChangeFlags)
+    void sourceChanged(ChangeFlags) override
     { m_sourceChanged = true; }
 
     void sourceBoundingRectChanged()
@@ -310,11 +310,13 @@ public:
     {
     }
 
-    QRectF boundingRectFor(const QRectF &src) const {
+    QRectF boundingRectFor(const QRectF &src) const override
+    {
         return src.adjusted(-10, -10, 10, 10);
     }
 
-    void draw(QPainter *) {
+    void draw(QPainter *) override
+    {
         pix = source()->pixmap(coordinateMode, &offset, padMode);
     }
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index 4d5857c3c8..7e7536a94c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
@@ -121,7 +121,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent), m_fnConstraint(0) {}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         Q_UNUSED(option);
         Q_UNUSED(widget);
@@ -130,7 +130,7 @@ public:
         painter->drawLine(rect().bottomLeft(), rect().topRight());
     }
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override
     {
         if (constraint.width() < 0 && constraint.height() < 0 && m_sizeHints[which].isValid()) {
             return m_sizeHints[which];
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index c5009e9847..cc416f76b2 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -93,7 +93,8 @@ public:
     TestGraphicsWidget(QGraphicsWidget *parent = 0) : QGraphicsWidget(parent)
     { }
 
-    bool event(QEvent *e) {
+    bool event(QEvent *e) override
+    {
         ++(m_eventCount[int(e->type())]);
         return QGraphicsWidget::event(e);
     }
@@ -111,7 +112,7 @@ public:
         functionCount.clear();
     }
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         QGraphicsWidget::setGeometry(rect);
         ++(functionCount[SetGeometry]);
@@ -235,13 +236,13 @@ class TestLayout : public QGraphicsLinearLayout
         setSpacing(0);
     }
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         ++(functionCount[SetGeometry]);
         QGraphicsLinearLayout::setGeometry(rect);
     }
 
-    void invalidate()
+    void invalidate() override
     {
         ++(functionCount[Invalidate]);
         QGraphicsLinearLayout::invalidate();
@@ -569,27 +570,29 @@ class Layout : public QGraphicsLayout
 public:
     Layout(QGraphicsLayoutItem *parentItem = 0) : QGraphicsLayout(parentItem) {}
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         QGraphicsLayout::setGeometry(rect);
     }
 
-    int count() const {
+    int count() const override
+    {
         return 0;
     }
 
-    QGraphicsLayoutItem *itemAt(int index) const {
+    QGraphicsLayoutItem *itemAt(int index) const override
+    {
         Q_UNUSED(index);
         return 0;
     }
 
-    void removeAt(int index)
+    void removeAt(int index) override
     {
         Q_UNUSED(index);
     }
 
 protected:
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override
     {
         Q_UNUSED(constraint);
         Q_UNUSED(which);
@@ -634,9 +637,9 @@ public:
         setGraphicsItem(item);
     }
 
-    void setGeometry(const QRectF &geom);
+    void setGeometry(const QRectF &geom) override;
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const override;
 
     inline QGraphicsRectItem *rectItem() {
         return static_cast<QGraphicsRectItem *>(graphicsItem());
@@ -674,7 +677,8 @@ public:
         connect(&m_timeline, SIGNAL(valueChanged(qreal)), this, SLOT(valueChanged(qreal)));
     }
 
-    void setGeometry(const QRectF &geom) {
+    void setGeometry(const QRectF &geom) override
+    {
         fromGeoms.clear();
         toGeoms.clear();
         for (int i = 0; i < count(); ++i) {
@@ -759,7 +763,7 @@ public:
         setOwnedByLayout(true);
     }
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const override;
 
     ~CustomLayoutItem() {
         m_destructedSet->insert(this);
@@ -790,9 +794,9 @@ public:
         m_destructedSet = destructedSet;
     }
 
-    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const override;
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget * = 0)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget * = 0) override
     {
         const QRect r = option->rect.adjusted(0, 0, -1, -1);
         painter->drawLine(r.topLeft(), r.bottomRight());
@@ -844,18 +848,18 @@ CustomLayout(QGraphicsLayoutItem *parent)
 {
 }
 
-int count() const
+int count() const override
 {
     return items.count();
 }
 
-QGraphicsLayoutItem* itemAt(int index) const
+QGraphicsLayoutItem* itemAt(int index) const override
 {
     return items.at(index);
 }
 
 
-void removeAt(int index)
+void removeAt(int index) override
 {
     items.removeAt(index);
 }
@@ -897,7 +901,7 @@ void updateParentWidget(QGraphicsWidget *item)
     }
 }
 
-QSizeF sizeHint(Qt::SizeHint /* which */, const QSizeF & /* constraint */) const
+QSizeF sizeHint(Qt::SizeHint /* which */, const QSizeF & /* constraint */) const override
 {
     return QSizeF(50,50);
 }
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
index af21b9f391..2d8bf40ee5 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
@@ -72,13 +72,13 @@ public:
         { return QRectF(); }
 
     // QGraphicsLayoutItem::setGeometry is a pure virtual function
-    void setGeometry(QRectF const&) {}
+    void setGeometry(QRectF const&) override {}
 
     // QGraphicsLayoutItem::sizeHint is a pure virtual function
-    QSizeF sizeHint(Qt::SizeHint, QSizeF const& = QSizeF()) const
+    QSizeF sizeHint(Qt::SizeHint, QSizeF const& = QSizeF()) const override
         { return QSizeF(); }
 
-    void updateGeometry()
+    void updateGeometry() override
         { updateGeometryCalled++; QGraphicsLayoutItem::updateGeometry(); }
     int updateGeometryCalled;
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 817f67540e..0851b20927 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -107,7 +107,7 @@ public:
         layoutDirectionChange(0)
         { }
 
-    void widgetEvent(QEvent *e)
+    void widgetEvent(QEvent *e) override
     {
         switch (e->type()) {
         case QEvent::GraphicsSceneResize:
@@ -145,7 +145,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = 0, const QBrush &brush = QBrush()) : QGraphicsWidget(parent){ m_brush = brush;}
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override
     {
         Q_UNUSED(option);
         Q_UNUSED(widget);
@@ -158,7 +158,8 @@ public:
         updateGeometry();
     }
 
-    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const {
+    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override
+    {
         if (m_sizeHints[which].isValid()) {
             return m_sizeHints[which];
         }
diff --git a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
index 6ef17a14af..ddcdc809d9 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
@@ -53,8 +53,8 @@ class MyGraphicsObject : public QGraphicsObject
 {
 public:
     MyGraphicsObject() : QGraphicsObject() {}
-    virtual QRectF boundingRect() const { return QRectF(); }
-    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+    virtual QRectF boundingRect() const override { return QRectF(); }
+    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override {}
 };
 
 void tst_QGraphicsObject::pos()
@@ -223,9 +223,9 @@ public:
         }
     }
 
-    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0)
+    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0) override
     { }
-    QRectF boundingRect() const
+    QRectF boundingRect() const override
     { return QRectF(); }
 
     bool *wasDeleted;
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 0b3e132936..6b292bc713 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -122,7 +122,7 @@ public:
     bool isHovered = false;
 
 protected:
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) override
     {
         isHovered = (option->state & QStyle::State_MouseOver);
 
@@ -2190,7 +2190,7 @@ public:
     bool ignoresDragMove = false;
 
 protected:
-    void dragEnterEvent(QGraphicsSceneDragDropEvent *event)
+    void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         event->setAccepted(!ignoresDragEnter);
@@ -2199,20 +2199,20 @@ protected:
         eventList << event->type();
     }
 
-    void dragMoveEvent(QGraphicsSceneDragDropEvent *event)
+    void dragMoveEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         event->setAccepted(!ignoresDragMove);
         eventList << event->type();
     }
 
-    void dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         eventList << event->type();
     }
 
-    void dropEvent(QGraphicsSceneDragDropEvent *event)
+    void dropEvent(QGraphicsSceneDragDropEvent *event) override
     {
         storeLastEvent(event);
         eventList << event->type();
diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index 4f2c310135..d875eb1db4 100644
--- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -228,9 +228,9 @@ class CustomShapeItem : public QGraphicsItem
 public:
     CustomShapeItem(const QPainterPath &shape) : QGraphicsItem(0), mShape(shape) {}
 
-    QPainterPath shape() const { return mShape; }
-    QRectF boundingRect() const { return mShape.boundingRect(); }
-    void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) {}
+    QPainterPath shape() const override { return mShape; }
+    QRectF boundingRect() const override { return mShape.boundingRect(); }
+    void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) override {}
 private:
     QPainterPath mShape;
 };
@@ -281,7 +281,7 @@ public:
     {
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */) override
     {
         painter->setBrush(brush);
         painter->drawRect(boundingRect());
@@ -336,8 +336,8 @@ void tst_QGraphicsSceneIndex::clear()
         MyItem(QGraphicsItem *parent = 0) : QGraphicsItem(parent), numPaints(0) {}
         int numPaints;
     protected:
-        QRectF boundingRect() const { return QRectF(0, 0, 10, 10); }
-        void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *, QWidget *)
+        QRectF boundingRect() const override { return QRectF(0, 0, 10, 10); }
+        void paint(QPainter * /* painter */, const QStyleOptionGraphicsItem *, QWidget *) override
         { ++numPaints; }
     };