Fix warnings about marking functions override

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

7 files changed, 29 insertions, 27 deletions

diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 357c173356..7e86e96830 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -56,7 +56,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = nullptr) : 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);
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index 7cf5f43706..73fad597b2 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -49,7 +49,7 @@ class RectWidget : public QGraphicsWidget
 public:
     RectWidget(QGraphicsItem *parent = nullptr, Qt::WindowFlags wFlags = { }) : QGraphicsWidget(parent, wFlags), setGeometryCalls(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);
@@ -58,7 +58,7 @@ public:
         painter->drawLine(rect().bottomLeft(), rect().topRight());
     }
 
-    void setGeometry(const QRectF &rect)
+    void setGeometry(const QRectF &rect) override
     {
         //qDebug() << "setGeometry():" << this->data(0).toString();
         setGeometryCalls->insert(this, rect);
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 163be6b2e8..afa11cd553 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
@@ -47,7 +47,7 @@ private slots:
 struct MySquareWidget : public QGraphicsWidget
 {
     MySquareWidget() {}
-    virtual QSizeF  sizeHint ( Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override
     {
         if (which != Qt::PreferredSize)
             return QGraphicsWidget::sizeHint(which, constraint);
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chip.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chip.h
index 754dd8dfa7..e716b4dafc 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chip.h
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chip.h
@@ -37,14 +37,14 @@ class Chip : public QGraphicsItem
 public:
     Chip(const QColor &color, int x, int y);
 
-    QRectF boundingRect() const;
-    QPainterPath shape() const;
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget);
+    QRectF boundingRect() const override;
+    QPainterPath shape() const override;
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget) override;
 
 protected:
-    void mousePressEvent(QGraphicsSceneMouseEvent *event);
-    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
-    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mousePressEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
 
 private:
     int x, y;
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
index c615635ad4..e6d383dc1b 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -54,8 +54,8 @@ public:
     void setOperation(Operation operation);
 
 protected:
-    void paintEvent(QPaintEvent *event);
-    void timerEvent(QTimerEvent *event);
+    void paintEvent(QPaintEvent *event) override;
+    void timerEvent(QTimerEvent *event) override;
 
 private:
     void populateScene();
diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 7be7f3f90d..1b275fbd29 100644
--- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -81,14 +81,14 @@ public:
     }
 
 protected:
-    void paintEvent(QPaintEvent *event)
+    void paintEvent(QPaintEvent *event) override
     {
         QGraphicsView::paintEvent(event);
         if (waiting)
             eventLoop.exit();
     }
 
-    void timerEvent(QTimerEvent *event)
+    void timerEvent(QTimerEvent *event) override
     {
         if (event->timerId() == timerId)
             eventLoop.exit();
@@ -479,7 +479,7 @@ public:
     }
 
 protected:
-    void advance(int i)
+    void advance(int i) override
     {
         if (!i)
             return;
@@ -587,7 +587,7 @@ public:
     }
 
 protected:
-    void advance(int i)
+    void advance(int i) override
     {
         if (!i)
             return;
@@ -693,14 +693,15 @@ public:
         yspeed = y;
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget = 0) override
     {
         QGraphicsPixmapItem::paint(painter,option,widget);
         //We just want to wait, and we don't want to process the event loop with qWait
         QTest::qSleep(3);
     }
 protected:
-    void advance(int i)
+    void advance(int i) override
     {
         if (!i)
             return;
@@ -792,12 +793,13 @@ public:
     {
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget = 0) override
     {
         QGraphicsPixmapItem::paint(painter,option,widget);
     }
 protected:
-    void advance(int i)
+    void advance(int i) override
     {
         Q_UNUSED(i);
         if (partial)
diff --git a/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp
index 007f12516f..157ee7a152 100644
--- a/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/benchmarks/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -45,11 +45,11 @@ public:
           row_count(rows),
           column_count(columns) {}
 
-    int rowCount(const QModelIndex& = QModelIndex()) const { return row_count; }
-    int columnCount(const QModelIndex& = QModelIndex()) const { return column_count; }
+    int rowCount(const QModelIndex & = QModelIndex()) const override { return row_count; }
+    int columnCount(const QModelIndex & = QModelIndex()) const override { return column_count; }
     bool isEditable(const QModelIndex &) const { return true; }
 
-    QVariant data(const QModelIndex &idx, int role) const
+    QVariant data(const QModelIndex &idx, int role) const override
     {
         if (!idx.isValid() || idx.row() >= row_count || idx.column() >= column_count) {
             qWarning() << "Invalid modelIndex [%d,%d,%p]" << idx;
@@ -62,7 +62,7 @@ public:
         return QVariant();
     }
 
-    bool insertRows(int start, int count, const QModelIndex &parent = QModelIndex())
+    bool insertRows(int start, int count, const QModelIndex &parent = QModelIndex()) override
     {
         if (start < 0 || start > row_count)
             return false;
@@ -73,7 +73,7 @@ public:
         return true;
     }
 
-    bool removeRows(int start, int count, const QModelIndex &parent = QModelIndex())
+    bool removeRows(int start, int count, const QModelIndex &parent = QModelIndex()) override
     {
         if (start < 0 || start >= row_count || row_count < count)
             return false;
@@ -84,7 +84,7 @@ public:
         return true;
     }
 
-    bool insertColumns(int start, int count, const QModelIndex &parent = QModelIndex())
+    bool insertColumns(int start, int count, const QModelIndex &parent = QModelIndex()) override
     {
         if (start < 0 || start > column_count)
             return false;
@@ -95,7 +95,7 @@ public:
         return true;
     }
 
-    bool removeColumns(int start, int count, const QModelIndex &parent = QModelIndex())
+    bool removeColumns(int start, int count, const QModelIndex &parent = QModelIndex()) override
     {
         if (start < 0 || start >= column_count || column_count < count)
             return false;