Replace Q_DECL_OVERRIDE with override

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

5 files changed, 18 insertions, 18 deletions

diff --git a/src/plugins/sceneparsers/assimp/assimphelpers.h b/src/plugins/sceneparsers/assimp/assimphelpers.h
index 64a6d4abe..0db22ce7b 100644
--- a/src/plugins/sceneparsers/assimp/assimphelpers.h
+++ b/src/plugins/sceneparsers/assimp/assimphelpers.h
@@ -69,12 +69,12 @@ public :
     AssimpIOStream(QIODevice *device);
     ~AssimpIOStream();
 
-    size_t Read(void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE;
-    size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) Q_DECL_OVERRIDE;
-    aiReturn Seek(size_t pOffset, aiOrigin pOrigin) Q_DECL_OVERRIDE;
-    size_t Tell() const Q_DECL_OVERRIDE;
-    size_t FileSize() const Q_DECL_OVERRIDE;
-    void Flush() Q_DECL_OVERRIDE;
+    size_t Read(void *pvBuffer, size_t pSize, size_t pCount) override;
+    size_t Write(const void *pvBuffer, size_t pSize, size_t pCount) override;
+    aiReturn Seek(size_t pOffset, aiOrigin pOrigin) override;
+    size_t Tell() const override;
+    size_t FileSize() const override;
+    void Flush() override;
 
 private:
     QIODevice *const m_device;
@@ -86,10 +86,10 @@ class AssimpIOSystem : public Assimp::IOSystem
 public :
     AssimpIOSystem();
     ~AssimpIOSystem();
-    bool Exists(const char *pFile) const Q_DECL_OVERRIDE;
-    char getOsSeparator() const Q_DECL_OVERRIDE;
-    Assimp::IOStream *Open(const char *pFile, const char *pMode) Q_DECL_OVERRIDE;
-    void Close(Assimp::IOStream *pFile) Q_DECL_OVERRIDE;
+    bool Exists(const char *pFile) const override;
+    char getOsSeparator() const override;
+    Assimp::IOStream *Open(const char *pFile, const char *pMode) override;
+    void Close(Assimp::IOStream *pFile) override;
 
 private:
     QMap<QByteArray, QIODevice::OpenMode> m_openModeMaps;
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h
index 068f6eed2..5cbace362 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.h
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.h
@@ -97,11 +97,11 @@ public:
     ~AssimpImporter();
 
     // SceneParserInterface interface
-    void setSource(const QUrl& source) Q_DECL_OVERRIDE;
-    void setData(const QByteArray& data, const QString &basePath) Q_DECL_OVERRIDE;
-    bool areFileTypesSupported(const QStringList &extensions) const Q_DECL_OVERRIDE;
-    Qt3DCore::QEntity *scene(const QString &id = QString()) Q_DECL_OVERRIDE;
-    Qt3DCore::QEntity *node(const QString &id) Q_DECL_OVERRIDE;
+    void setSource(const QUrl& source) override;
+    void setData(const QByteArray& data, const QString &basePath) override;
+    bool areFileTypesSupported(const QStringList &extensions) const override;
+    Qt3DCore::QEntity *scene(const QString &id = QString()) override;
+    Qt3DCore::QEntity *node(const QString &id) override;
 
 private:
     static bool areAssimpExtensions(const QStringList &extensions);
diff --git a/src/plugins/sceneparsers/assimp/main.cpp b/src/plugins/sceneparsers/assimp/main.cpp
index 079bf9b9b..445a44d16 100644
--- a/src/plugins/sceneparsers/assimp/main.cpp
+++ b/src/plugins/sceneparsers/assimp/main.cpp
@@ -48,7 +48,7 @@ class AssimpSceneImportPlugin : public Qt3DRender::QSceneImportPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QSceneImportFactoryInterface_iid FILE "assimp.json")
 
-    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) override
     {
         Q_UNUSED(key)
         Q_UNUSED(paramList)
diff --git a/src/plugins/sceneparsers/gltf/main.cpp b/src/plugins/sceneparsers/gltf/main.cpp
index f595c26ab..d113b2efb 100644
--- a/src/plugins/sceneparsers/gltf/main.cpp
+++ b/src/plugins/sceneparsers/gltf/main.cpp
@@ -49,7 +49,7 @@ class GLTFSceneImportPlugin : public Qt3DRender::QSceneImportPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QSceneImportFactoryInterface_iid FILE "gltf.json")
 
-    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+    Qt3DRender::QSceneImporter *create(const QString &key, const QStringList &paramList) override
     {
         Q_UNUSED(key)
         Q_UNUSED(paramList)
diff --git a/src/plugins/sceneparsers/gltfexport/main.cpp b/src/plugins/sceneparsers/gltfexport/main.cpp
index f32aabe11..7a74d4d01 100644
--- a/src/plugins/sceneparsers/gltfexport/main.cpp
+++ b/src/plugins/sceneparsers/gltfexport/main.cpp
@@ -48,7 +48,7 @@ class GLTFSceneExportPlugin : public Qt3DRender::QSceneExportPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QSceneExportFactoryInterface_iid FILE "gltfexport.json")
 
-    Qt3DRender::QSceneExporter *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+    Qt3DRender::QSceneExporter *create(const QString &key, const QStringList &paramList) override
     {
         Q_UNUSED(key)
         Q_UNUSED(paramList)