Replace Q_DECL_OVERRIDE with override

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

4 files changed, 16 insertions, 16 deletions

diff --git a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
index 97e9b7c77..1390b6b49 100644
--- a/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
+++ b/tests/auto/input/abstractaxisinput/tst_abstractaxisinput.cpp
@@ -47,7 +47,7 @@ public:
     }
 
 private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override
     {
         auto creationChange = Qt3DCore::QNodeCreatedChangePtr<Qt3DInput::QAbstractAxisInputData>::create(this);
         auto &data = creationChange->data;
@@ -64,7 +64,7 @@ public:
     {
     }
 
-    float process(Qt3DInput::Input::InputHandler *inputHandler, qint64 currentTime) Q_DECL_OVERRIDE
+    float process(Qt3DInput::Input::InputHandler *inputHandler, qint64 currentTime) override
     {
         Q_UNUSED(inputHandler);
         Q_UNUSED(currentTime);
diff --git a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
index d3745b8cb..a436959cc 100644
--- a/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
+++ b/tests/auto/input/loadproxydevicejob/tst_loadproxydevicejob.cpp
@@ -47,35 +47,35 @@ public:
         , m_name(name)
     {}
 
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) override
     {
         return QVector<Qt3DCore::QAspectJobPtr>();
     }
 
-    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) Q_DECL_OVERRIDE
+    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &name) override
     {
         if (name == m_name)
             return new TestPhysicalDevice();
         return nullptr;
     }
 
-    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId) const Q_DECL_OVERRIDE
+    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId) const override
     {
         return nullptr;
     }
 
-    QVector<Qt3DCore::QNodeId> physicalDevices() const Q_DECL_OVERRIDE
+    QVector<Qt3DCore::QNodeId> physicalDevices() const override
     {
         return QVector<Qt3DCore::QNodeId>();
     }
 
-    QStringList deviceNames() const Q_DECL_OVERRIDE
+    QStringList deviceNames() const override
     {
         return QStringList() << m_name;
     }
 
 private:
-    void onInitialize() Q_DECL_OVERRIDE {}
+    void onInitialize() override {}
     QString m_name;
 };
 
diff --git a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
index 0cf37fe95..d146a80e7 100644
--- a/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
+++ b/tests/auto/input/qabstractphysicaldevicebackendnode/tst_qabstractphysicaldevicebackendnode.cpp
@@ -49,14 +49,14 @@ public:
         : Qt3DInput::QAbstractPhysicalDeviceBackendNode(mode)
     {}
 
-    float axisValue(int axisIdentifier) const Q_DECL_OVERRIDE
+    float axisValue(int axisIdentifier) const override
     {
         if (axisIdentifier == 883)
             return 883.0f;
         return 0.0f;
     }
 
-    bool isButtonPressed(int buttonIdentifier) const Q_DECL_OVERRIDE
+    bool isButtonPressed(int buttonIdentifier) const override
     {
         if (buttonIdentifier == 454)
             return true;
diff --git a/tests/auto/input/utils/tst_utils.cpp b/tests/auto/input/utils/tst_utils.cpp
index 766408ce3..d90034a3f 100644
--- a/tests/auto/input/utils/tst_utils.cpp
+++ b/tests/auto/input/utils/tst_utils.cpp
@@ -56,12 +56,12 @@ public:
         , m_device(device)
     {}
 
-    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) Q_DECL_OVERRIDE { return QVector<Qt3DCore::QAspectJobPtr>(); }
-    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &) Q_DECL_OVERRIDE { return nullptr; }
-    QVector<Qt3DCore::QNodeId> physicalDevices() const Q_DECL_OVERRIDE { return QVector<Qt3DCore::QNodeId>(); }
-    QStringList deviceNames() const Q_DECL_OVERRIDE { return QStringList(); }
+    QVector<Qt3DCore::QAspectJobPtr> jobsToExecute(qint64) override { return QVector<Qt3DCore::QAspectJobPtr>(); }
+    Qt3DInput::QAbstractPhysicalDevice *createPhysicalDevice(const QString &) override { return nullptr; }
+    QVector<Qt3DCore::QNodeId> physicalDevices() const override { return QVector<Qt3DCore::QNodeId>(); }
+    QStringList deviceNames() const override { return QStringList(); }
 
-    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId deviceId) const Q_DECL_OVERRIDE
+    Qt3DInput::QAbstractPhysicalDeviceBackendNode *physicalDevice(Qt3DCore::QNodeId deviceId) const override
     {
         if (m_device->id() == deviceId)
             return new FakeBackendDevice();
@@ -69,7 +69,7 @@ public:
     }
 
 private:
-    void onInitialize() Q_DECL_OVERRIDE {}
+    void onInitialize() override {}
     Qt3DInput::QAbstractPhysicalDevice *m_device;
 };