From 681f93c74d7d60dc1998d3124e1f59ddc0f476ee Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
Date: Wed, 20 Sep 2017 20:57:39 +0200
Subject: Replace Q_DECL_OVERRIDE with override

Change-Id: I176f91a8c51e81a2df3fe91733118261491223ee
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tests/auto/qml/qqmlinstantiator/stringmodel.h                      | 4 ++--
 tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp                   | 6 +++---
 tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp | 2 +-
 tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp           | 2 +-
 tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp           | 2 +-
 tests/auto/quick/qquickwindow/tst_qquickwindow.cpp                 | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/qml/qqmlinstantiator/stringmodel.h b/tests/auto/qml/qqmlinstantiator/stringmodel.h
index 0bd4ada55e..b01817375a 100644
--- a/tests/auto/qml/qqmlinstantiator/stringmodel.h
+++ b/tests/auto/qml/qqmlinstantiator/stringmodel.h
@@ -65,7 +65,7 @@ public:
         return items.count();
     }
 
-    virtual QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE
+    QHash<int, QByteArray> roleNames() const override
     {
         return roles;
     }
@@ -75,7 +75,7 @@ public:
         return 1;
     }
 
-    virtual bool hasChildren(const QModelIndex &) const Q_DECL_OVERRIDE
+    bool hasChildren(const QModelIndex &) const override
     {
         return rowCount(QModelIndex()) > 0;
     }
diff --git a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
index beb60925bb..88a5d41975 100644
--- a/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
+++ b/tests/auto/qml/qqmlnotifier/tst_qqmlnotifier.cpp
@@ -98,7 +98,7 @@ public:
     }
 
 protected:
-    void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE {
+    void connectNotify(const QMetaMethod &signal) override {
         if (signal.name() == "qmlObjectPropChanged") qmlObjectPropConnections++;
         if (signal.name() == "cppObjectPropChanged") cppObjectPropConnections++;
         if (signal.name() == "unboundPropChanged") unboundPropConnections++;
@@ -112,7 +112,7 @@ protected:
         //qDebug() << Q_FUNC_INFO << this << signal.name();
     }
 
-    void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE {
+    void disconnectNotify(const QMetaMethod &signal) override {
         if (signal.name() == "qmlObjectPropChanged") qmlObjectPropConnections--;
         if (signal.name() == "cppObjectPropChanged") cppObjectPropConnections--;
         if (signal.name() == "unboundPropChanged") unboundPropConnections--;
@@ -146,7 +146,7 @@ public:
     {}
 
 private slots:
-    void initTestCase() Q_DECL_OVERRIDE;
+    void initTestCase() override;
     void cleanupTestCase();
     void testConnectNotify();
 
diff --git a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
index 820c804065..dcb0e01b5d 100644
--- a/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
+++ b/tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
@@ -292,7 +292,7 @@ class KillerThread : public QThread
 {
     Q_OBJECT
 protected:
-    void run() Q_DECL_OVERRIDE {
+    void run() override {
         sleep(3);
         qFatal("Either the GUI or the render thread is stuck in an infinite loop.");
     }
diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
index e52370721f..a8a00b51e9 100644
--- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
+++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
@@ -57,7 +57,7 @@ public:
     }
 
 private slots:
-    void initTestCase() Q_DECL_OVERRIDE;
+    void initTestCase() override;
     void layerEnabled();
     void layerSmooth();
 #if QT_CONFIG(opengl)
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index 05785dd3a0..dada49cfc2 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -77,7 +77,7 @@ public:
     {}
 
 private slots:
-    void initTestCase() Q_DECL_OVERRIDE;
+    void initTestCase() override;
     void dragProperties();
     void resetDrag();
     void dragging_data() { acceptedButton_data(); }
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 399c6ee493..9620d81357 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -2424,13 +2424,13 @@ public:
         m_childMouseEventFilterEventCount.clear();
     }
 protected:
-    bool childMouseEventFilter(QQuickItem *, QEvent *event) Q_DECL_OVERRIDE
+    bool childMouseEventFilter(QQuickItem *, QEvent *event) override
     {
         m_childMouseEventFilterEventCount[event->type()]++;
         return m_returnTrueForType.contains(event->type());
     }
 
-    bool event(QEvent *event) Q_DECL_OVERRIDE
+    bool event(QEvent *event) override
     {
         m_eventCount[event->type()]++;
         return QQuickRectangle::event(event);
@@ -2611,7 +2611,7 @@ public:
         return false;
     }
 
-    virtual bool contains(const QPointF &pos) const override {
+    bool contains(const QPointF &pos) const override {
         // returns true if the point is inside the the embedded circle inside the (square) rect
         const float radius = (float)width()/2;
         const QVector2D center(radius, radius);
-- 
cgit v1.2.3