Replace Q_DECL_OVERRIDE with override

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

12 files changed, 23 insertions, 23 deletions

diff --git a/src/render/geometry/armature_p.h b/src/render/geometry/armature_p.h
index f0960d256..3e2bd748a 100644
--- a/src/render/geometry/armature_p.h
+++ b/src/render/geometry/armature_p.h
@@ -63,7 +63,7 @@ class Q_AUTOTEST_EXPORT Armature : public BackendNode
 public:
     Armature();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void cleanup();
 
     Qt3DCore::QNodeId skeletonId() const { return m_skeletonId; }
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index 1b639f42f..bd395160a 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -68,7 +68,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     inline Qt3DCore::QNodeId bufferId() const { return m_bufferId; }
     inline QString name() const { return m_name; }
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index 691d6cc60..ac5dc1437 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -73,7 +73,7 @@ public:
     ~Buffer();
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     void setManager(BufferManager *manager);
     void executeFunctor();
@@ -107,9 +107,9 @@ class BufferFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit BufferFunctor(AbstractRenderer *renderer, BufferManager *manager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 private:
     BufferManager *m_manager;
     AbstractRenderer *m_renderer;
diff --git a/src/render/geometry/geometry_p.h b/src/render/geometry/geometry_p.h
index 41d54cb54..ea1f7fdb2 100644
--- a/src/render/geometry/geometry_p.h
+++ b/src/render/geometry/geometry_p.h
@@ -68,7 +68,7 @@ public:
 
     void cleanup();
 
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     inline QVector<Qt3DCore::QNodeId> attributes() const { return m_attributes; }
     inline bool isDirty() const { return m_geometryDirty; }
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index 5a7358f00..146f49dc2 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -74,7 +74,7 @@ public:
 
     void cleanup();
     void setManager(GeometryRendererManager *manager);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void executeFunctor();
 
     inline Qt3DCore::QNodeId geometryId() const { return m_geometryId; }
@@ -121,9 +121,9 @@ class GeometryRendererFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
     explicit GeometryRendererFunctor(AbstractRenderer *renderer, GeometryRendererManager *manager);
-    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
-    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
-    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const override;
+    void destroy(Qt3DCore::QNodeId id) const override;
 private:
     GeometryRendererManager *m_manager;
     AbstractRenderer *m_renderer;
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index b3ce270a0..982a449fb 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -146,7 +146,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QAttribute)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // Qt3DRender
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index b978e0e0b..3d524d60f 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -153,12 +153,12 @@ QBufferPrivate::QBufferPrivate()
             , m_radius(radius)
         {}
 
-        QByteArray operator ()() Q_DECL_OVERRIDE
+        QByteArray operator ()() override
         {
             return createSphereMeshVertexData(m_radius, m_rings, m_slices);
         }
 
-        bool operator ==(const QBufferDataGenerator &other) const Q_DECL_OVERRIDE
+        bool operator ==(const QBufferDataGenerator &other) const override
         {
             const SphereVertexDataFunctor *otherFunctor = functor_cast<SphereVertexDataFunctor>(&other);
             if (otherFunctor != nullptr)
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index 7cb5acb0a..1aa4bcc06 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -118,7 +118,7 @@ public Q_SLOTS:
     void setAccessType(AccessType access);
 
 protected:
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 Q_SIGNALS:
     void dataChanged(const QByteArray &bytes);
@@ -130,7 +130,7 @@ Q_SIGNALS:
 
 private:
     Q_DECLARE_PRIVATE(QBuffer)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 143d98d1e..0e6f7d68e 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -75,7 +75,7 @@ protected:
 
 private:
     Q_DECLARE_PRIVATE(QGeometry)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 704e2f89f..85bab9fc6 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -134,11 +134,11 @@ Q_SIGNALS:
 
 protected:
     explicit QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = nullptr);
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
 
 private:
     Q_DECLARE_PRIVATE(QGeometryRenderer)
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Qt3DRender
diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h
index 1f602ba89..e8eccb608 100644
--- a/src/render/geometry/qmesh_p.h
+++ b/src/render/geometry/qmesh_p.h
@@ -82,7 +82,7 @@ class Q_AUTOTEST_EXPORT MeshDownloadRequest : public Qt3DCore::QDownloadRequest
 public:
     MeshDownloadRequest(Qt3DCore::QNodeId mesh, QUrl source, Qt3DCore::QAspectEngine *engine);
 
-    void onCompleted() Q_DECL_OVERRIDE;
+    void onCompleted() override;
 
 private:
     Qt3DCore::QNodeId m_mesh;
@@ -93,8 +93,8 @@ class Q_AUTOTEST_EXPORT MeshLoaderFunctor : public QGeometryFactory
 {
 public :
     MeshLoaderFunctor(QMesh *mesh, Qt3DCore::QAspectEngine *engine, const QByteArray &sourceData = QByteArray());
-    QGeometry *operator()() Q_DECL_OVERRIDE;
-    bool operator ==(const QGeometryFactory &other) const Q_DECL_OVERRIDE;
+    QGeometry *operator()() override;
+    bool operator ==(const QGeometryFactory &other) const override;
     QT3D_FUNCTOR(MeshLoaderFunctor)
 
     Qt3DCore::QNodeId m_mesh;
diff --git a/src/render/geometry/skeleton_p.h b/src/render/geometry/skeleton_p.h
index 8907987d9..b1567ab1b 100644
--- a/src/render/geometry/skeleton_p.h
+++ b/src/render/geometry/skeleton_p.h
@@ -84,7 +84,7 @@ public:
     JointManager *jointManager() const { return m_jointManager; }
 
     void cleanup();
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
     void setStatus(Qt3DCore::QSkeletonLoader::Status status);
     Qt3DCore::QSkeletonLoader::Status status() const { return m_status; }