Replace Q_DECL_FINAL with final

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

4 files changed, 17 insertions, 17 deletions

diff --git a/tests/auto/core/common/testpostmanarbiter.h b/tests/auto/core/common/testpostmanarbiter.h
index 731f16f0f..7d7e4e49b 100644
--- a/tests/auto/core/common/testpostmanarbiter.h
+++ b/tests/auto/core/common/testpostmanarbiter.h
@@ -42,10 +42,10 @@ class TestPostman : public Qt3DCore::QAbstractPostman
 {
 public:
     explicit TestPostman(TestArbiter *arbiter);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL;
-    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL;
-    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
-    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) final;
+    void setScene(Qt3DCore::QScene *) final;
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) final;
+    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &e) final;
 
 private:
     TestArbiter *m_arbiter;
@@ -57,13 +57,13 @@ public:
     TestArbiter();
     ~TestArbiter();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) final;
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL;
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangePtr &e) final;
 
-    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_FINAL;
+    void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) final;
 
-    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL;
+    Qt3DCore::QAbstractPostman *postman() const final;
 
     QVector<Qt3DCore::QSceneChangePtr> events;
 
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 1e1b1a3aa..6dcd1bd13 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -104,10 +104,10 @@ public:
         : m_spy(spy)
     {}
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) Q_DECL_FINAL {};
-    void setScene(Qt3DCore::QScene *) Q_DECL_FINAL {};
-    void notifyBackend(const Qt3DCore::QSceneChangePtr &change) Q_DECL_FINAL;
-    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &changee) Q_DECL_FINAL { Q_UNUSED(changee); return false; }
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) final {};
+    void setScene(Qt3DCore::QScene *) final {};
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &change) final;
+    bool shouldNotifyFrontend(const Qt3DCore::QSceneChangePtr &changee) final { Q_UNUSED(changee); return false; }
 
 private:
     ObserverSpy *m_spy;
@@ -155,7 +155,7 @@ public:
         events << ChangeRecord(e, false);
     }
 
-    Qt3DCore::QAbstractPostman *postman() const Q_DECL_FINAL
+    Qt3DCore::QAbstractPostman *postman() const final
     {
         return m_postman.data();
     }
diff --git a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
index cf7874a5c..4beb28bc2 100644
--- a/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
+++ b/tests/auto/core/qchangearbiter/tst_qchangearbiter.cpp
@@ -301,7 +301,7 @@ public:
         , m_allowFrontendNotifications(false)
     {}
 
-    void setScene(Qt3DCore::QScene *scene) Q_DECL_FINAL
+    void setScene(Qt3DCore::QScene *scene) final
     {
         m_sceneInterface = scene;
     }
@@ -334,7 +334,7 @@ public:
         return m_lastChanges;
     }
 
-    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) Q_DECL_FINAL
+    void notifyBackend(const Qt3DCore::QSceneChangePtr &e) final
     {
         m_sceneInterface->arbiter()->sceneChangeEventWithLock(e);
     }
diff --git a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
index 24d9cce68..cde9834b4 100644
--- a/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
+++ b/tests/auto/core/qservicelocator/tst_qservicelocator.cpp
@@ -55,8 +55,8 @@ public:
         : QSystemInformationService(QStringLiteral("Dummy System Information Service"))
     {}
 
-    QStringList aspectNames() const Q_DECL_FINAL { return QStringList(); }
-    int threadPoolThreadCount() const Q_DECL_FINAL { return 4; }
+    QStringList aspectNames() const final { return QStringList(); }
+    int threadPoolThreadCount() const final { return 4; }
 };