Replace Q_DECL_OVERRIDE with override

Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

8 files changed, 27 insertions, 27 deletions

diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 25c2a6dba..1e1b1a3aa 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -138,19 +138,19 @@ public:
     {
     }
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) override
     {
         events << ChangeRecord(e, true);
     }
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_OVERRIDE
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) override
     {
         for (size_t i = 0, m = e.size(); i < m; ++i) {
             events << ChangeRecord(e.at(i), false);
         }
     }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override
     {
         events << ChangeRecord(e, false);
     }
diff --git a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
index ba76d2100..94519f5e5 100644
--- a/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
+++ b/tests/auto/core/qaspectengine/tst_qaspectengine.cpp
@@ -46,23 +46,23 @@ public:
     }
 
 private:
-    void onRegistered() Q_DECL_OVERRIDE
+    void onRegistered() override
     {
         qDebug() << Q_FUNC_INFO;
     }
 
-    void onEngineStartup() Q_DECL_OVERRIDE
+    void onEngineStartup() override
     {
         qDebug() << Q_FUNC_INFO;
         m_rootEntityId = rootEntityId();
     }
 
-    void onEngineShutdown() Q_DECL_OVERRIDE
+    void onEngineShutdown() override
     {
         qDebug() << Q_FUNC_INFO;
     }
 
-    QVector<QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE \
+    QVector<QAspectJobPtr> jobsToExecute(qint64) override \
     {
         if (m_rootEntityId)
             qDebug() << Q_FUNC_INFO << m_rootEntityId;
@@ -81,16 +81,16 @@ public: \
         : QAbstractAspect(parent) {} \
     \
 private: \
-    void onRegistered() Q_DECL_OVERRIDE {} \
-    void onEngineStartup() Q_DECL_OVERRIDE {} \
-    void onEngineShutdown() Q_DECL_OVERRIDE {} \
+    void onRegistered() override {} \
+    void onEngineStartup() override {} \
+    void onEngineShutdown() override {} \
     \
-    QVector<QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE \
+    QVector<QAspectJobPtr> jobsToExecute(qint64) override \
     { \
         return QVector<QAspectJobPtr>(); \
     } \
     \
-    QVariant executeCommand(const QStringList &args) Q_DECL_OVERRIDE \
+    QVariant executeCommand(const QStringList &args) override \
     { \
         if (args.size() >= 2 && args.first() == QLatin1Literal("echo")) { \
             QStringList list = args; \
diff --git a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
index 0dc8ce10d..87ff528f0 100644
--- a/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
+++ b/tests/auto/core/qaspectfactory/tst_qaspectfactory.cpp
@@ -41,11 +41,11 @@ public: \
         : QAbstractAspect(parent) {} \
 \
 private: \
-    void onRegistered() Q_DECL_OVERRIDE {} \
-    void onEngineStartup() Q_DECL_OVERRIDE {} \
-    void onEngineShutdown() Q_DECL_OVERRIDE {} \
+    void onRegistered() override {} \
+    void onEngineStartup() override {} \
+    void onEngineShutdown() override {} \
 \
-    QVector<QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE \
+    QVector<QAspectJobPtr> jobsToExecute(qint64) override \
     { \
         return QVector<QAspectJobPtr>(); \
     } \
diff --git a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp
index b9f7934ab..b5750e639 100644
--- a/tests/auto/core/qaspectjob/tst_qaspectjob.cpp
+++ b/tests/auto/core/qaspectjob/tst_qaspectjob.cpp
@@ -34,7 +34,7 @@ using namespace Qt3DCore;
 class FakeAspectJob : public QAspectJob
 {
 public:
-    void run() Q_DECL_OVERRIDE {}
+    void run() override {}
 };
 
 class tst_QAspectJob : public QObject
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index 57f7e7ed4..cf7874a5c 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -117,7 +117,7 @@ public:
         Qt3DCore::QNodePrivate::get(this)->notifyObservers(e);
     }
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override
     {
         QVERIFY(!change.isNull());
         m_lastChanges << change;
@@ -182,7 +182,7 @@ class tst_SimpleObserver : public Qt3DCore::QObserverInterface
 public:
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override
     {
         QVERIFY(!e.isNull());
         m_lastChanges.append(e);
@@ -218,7 +218,7 @@ public:
     {}
 
     // QObserverInterface interface
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override
     {
         QVERIFY(!e.isNull());
         m_lastChanges << e;
@@ -271,7 +271,7 @@ public:
 
     ~ThreadedAnswer() { qDebug() << this; }
 
-    void run() Q_DECL_OVERRIDE
+    void run() override
     {
         // create backend change queue on QChangeArbiter
         Qt3DCore::QChangeArbiter::createThreadLocalChangeQueue(m_arbiter);
diff --git a/tests/auto/core/qpostman/tst_qpostman.cpp b/tests/auto/core/qpostman/tst_qpostman.cpp
index 612db6257..6fcb6e840 100644
--- a/tests/auto/core/qpostman/tst_qpostman.cpp
+++ b/tests/auto/core/qpostman/tst_qpostman.cpp
@@ -53,7 +53,7 @@ public:
     inline bool hasReceivedChange() const { return m_hasReceivedChange; }
 
 protected:
-    void sceneChangeEvent(const QSceneChangePtr &) Q_DECL_OVERRIDE
+    void sceneChangeEvent(const QSceneChangePtr &) override
     {
         m_hasReceivedChange = true;
     }
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp
index 78f17e8fa..36ec14b4e 100644
--- a/tests/auto/core/qscene/tst_qscene.cpp
+++ b/tests/auto/core/qscene/tst_qscene.cpp
@@ -63,9 +63,9 @@ private slots:
 class tst_LockableObserver : public Qt3DCore::QLockableObserverInterface
 {
 public:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE {}
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &) Q_DECL_OVERRIDE {}
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &) Q_DECL_OVERRIDE {}
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) override {}
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &) override {}
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &) override {}
 };
 
 class tst_Observable : public Qt3DCore::QObservableInterface
diff --git a/tests/auto/core/threadpooler/tst_threadpooler.cpp b/tests/auto/core/threadpooler/tst_threadpooler.cpp
index 2fc6e8c3b..bc4552c66 100644
--- a/tests/auto/core/threadpooler/tst_threadpooler.cpp
+++ b/tests/auto/core/threadpooler/tst_threadpooler.cpp
@@ -86,7 +86,7 @@ public:
 
     void setMutex(QMutex *mutex);
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     TestFunction m_func;
@@ -119,7 +119,7 @@ class MassAspectJob : public Qt3DCore::QAspectJob
 public:
     MassAspectJob(MassFunction func, QVector3D *data);
 
-    void run() Q_DECL_OVERRIDE;
+    void run() override;
 
 private:
     MassFunction m_func;