Replace Q_DECL_OVERRIDE with override

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

26 files changed, 41 insertions, 41 deletions

diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.h b/src/quick3d/imports/animation/qt3dquick3danimationplugin.h
index a7158750b..3800194ce 100644
--- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.h
+++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DAnimationPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 public:
     Qt3DQuick3DAnimationPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h
index b0ef5947c..99c6ab525 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.h
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.h
@@ -58,7 +58,7 @@ class Qt3DQuick3DCorePlugin : public QQmlExtensionPlugin
 public:
     Qt3DQuick3DCorePlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
     ~Qt3DQuick3DCorePlugin();
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h
index f24a93b3f..b7c1f5f87 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.h
@@ -58,7 +58,7 @@ class Qt3DQuick3DExtrasPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DExtrasPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.h b/src/quick3d/imports/input/qt3dquick3dinputplugin.h
index 8a54eaa53..e02710696 100644
--- a/src/quick3d/imports/input/qt3dquick3dinputplugin.h
+++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DInputPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DInputPlugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h
index a0d95c597..8f4a2fe39 100644
--- a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h
+++ b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DLogicPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DLogicPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.h b/src/quick3d/imports/render/qt3dquick3drenderplugin.h
index 181965fe1..11802b179 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.h
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.h
@@ -57,7 +57,7 @@ class Qt3DQuick3DRenderPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     Qt3DQuick3DRenderPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene2d/qtquickscene2dplugin.h b/src/quick3d/imports/scene2d/qtquickscene2dplugin.h
index c9318673f..7e97fd662 100644
--- a/src/quick3d/imports/scene2d/qtquickscene2dplugin.h
+++ b/src/quick3d/imports/scene2d/qtquickscene2dplugin.h
@@ -54,7 +54,7 @@ class QtQuickScene2DPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     QtQuickScene2DPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.h b/src/quick3d/imports/scene3d/qtquickscene3dplugin.h
index df85b4cd7..44a69a805 100644
--- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.h
+++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.h
@@ -57,7 +57,7 @@ class QtQuickScene3DPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
     QtQuickScene3DPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
-    void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char *uri) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h
index e0ce3addc..39e679961 100644
--- a/src/quick3d/imports/scene3d/scene3ditem_p.h
+++ b/src/quick3d/imports/scene3d/scene3ditem_p.h
@@ -115,11 +115,11 @@ private Q_SLOTS:
     void applyRootEntityChange();
 
 private:
-    QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) Q_DECL_OVERRIDE;
+    QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) override;
     void setWindowSurface(QObject *rootObject);
     void setCameraAspectModeHelper();
     void updateCameraAspectRatio();
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent *event) override;
 
     QStringList m_aspects;
     Qt3DCore::QEntity *m_entity;
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index a79cb4f90..b92c98133 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -99,8 +99,8 @@ public:
     QObject *object() const;
     Q_INVOKABLE QObject *objectAt(int index) const;
 
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 
 Q_SIGNALS:
     void modelChanged();
diff --git a/src/quick3d/quick3d/qt3dquick_global.cpp b/src/quick3d/quick3d/qt3dquick_global.cpp
index 0ce0b8194..cef480240 100644
--- a/src/quick3d/quick3d/qt3dquick_global.cpp
+++ b/src/quick3d/quick3d/qt3dquick_global.cpp
@@ -286,7 +286,7 @@ public:
         return QMatrix4x4(matVals);
     }
 
-    const QMetaObject *getMetaObjectForMetaType(int type) Q_DECL_OVERRIDE
+    const QMetaObject *getMetaObjectForMetaType(int type) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -308,7 +308,7 @@ public:
         return nullptr;
     }
 
-    bool init(int type, QVariant& dst) Q_DECL_OVERRIDE
+    bool init(int type, QVariant& dst) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -335,7 +335,7 @@ public:
         return false;
     }
 
-    bool create(int type, int argc, const void *argv[], QVariant *v) Q_DECL_OVERRIDE
+    bool create(int type, int argc, const void *argv[], QVariant *v) override
     {
         switch (type) {
         case QMetaType::QVector2D:
@@ -400,7 +400,7 @@ public:
         return true;
     }
 
-    bool createFromString(int type, const QString &s, void *data, size_t dataSize) Q_DECL_OVERRIDE
+    bool createFromString(int type, const QString &s, void *data, size_t dataSize) override
     {
         bool ok = false;
 
@@ -423,7 +423,7 @@ public:
         return false;
     }
 
-    bool createStringFrom(int type, const void *data, QString *s) Q_DECL_OVERRIDE
+    bool createStringFrom(int type, const void *data, QString *s) override
     {
         if (type == QMetaType::QColor) {
             const QColor *color = reinterpret_cast<const QColor *>(data);
@@ -434,7 +434,7 @@ public:
         return false;
     }
 
-    bool variantFromString(const QString &s, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromString(const QString &s, QVariant *v) override
     {
         QColor c(s);
         if (c.isValid()) {
@@ -477,7 +477,7 @@ public:
         return false;
     }
 
-    bool variantFromString(int type, const QString &s, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromString(int type, const QString &s, QVariant *v) override
     {
         bool ok = false;
 
@@ -520,7 +520,7 @@ public:
         return false;
     }
 
-    bool variantFromJsObject(int type, QQmlV4Handle object, QV4::ExecutionEngine *v4, QVariant *v) Q_DECL_OVERRIDE
+    bool variantFromJsObject(int type, QQmlV4Handle object, QV4::ExecutionEngine *v4, QVariant *v) override
     {
         QV4::Scope scope(v4);
 #ifndef QT_NO_DEBUG
@@ -543,7 +543,7 @@ public:
         return (*(reinterpret_cast<const T *>(lhs)) == rhs.value<T>());
     }
 
-    bool equal(int type, const void *lhs, const QVariant &rhs) Q_DECL_OVERRIDE
+    bool equal(int type, const void *lhs, const QVariant &rhs) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -574,7 +574,7 @@ public:
         return true;
     }
 
-    bool store(int type, const void *src, void *dst, size_t dstSize) Q_DECL_OVERRIDE
+    bool store(int type, const void *src, void *dst, size_t dstSize) override
     {
         switch (type) {
         case QMetaType::QColor:
@@ -604,7 +604,7 @@ public:
         return true;
     }
 
-    bool read(const QVariant &src, void *dst, int dstType) Q_DECL_OVERRIDE
+    bool read(const QVariant &src, void *dst, int dstType) override
     {
         switch (dstType) {
         case QMetaType::QColor:
@@ -636,7 +636,7 @@ public:
         return false;
     }
 
-    bool write(int type, const void *src, QVariant& dst) Q_DECL_OVERRIDE
+    bool write(int type, const void *src, QVariant& dst) override
     {
         switch (type) {
         case QMetaType::QColor:
diff --git a/src/quick3d/quick3d/qt3dquicknodefactory_p.h b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
index a6029cb37..e363ca205 100644
--- a/src/quick3d/quick3d/qt3dquicknodefactory_p.h
+++ b/src/quick3d/quick3d/qt3dquicknodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DCore {
 class QuickNodeFactory : public QAbstractNodeFactory
 {
 public:
-    QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
index ca10c874f..a4efd0347 100644
--- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
+++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DAnimation {
 class QuickAnimationNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
index 43172952c..a40d73a62 100644
--- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
+++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DExtras {
 class QuickExtrasNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
index e41754f42..560247ae9 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
@@ -86,7 +86,7 @@ public:
         startTimer(QGuiApplication::primaryScreen()->refreshRate());
     }
 
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE
+    void timerEvent(QTimerEvent *) override
     {
         incubateFor(m_incubationTime);
     }
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.h b/src/quick3d/quick3dextras/qt3dquickwindow.h
index 0880fc160..30f901979 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.h
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.h
@@ -114,7 +114,7 @@ Q_SIGNALS:
     void cameraAspectRatioModeChanged(CameraAspectRatioMode mode);
 
 protected:
-    void showEvent(QShowEvent *e) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent *e) override;
 
 private:
     void onSceneCreated(QObject *rootObject);
diff --git a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
index e9d28dafe..c50b4e4bc 100644
--- a/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
+++ b/src/quick3d/quick3dinput/qt3dquickinputnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DInput {
 class QuickInputNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
index 2e680b852..0590338cc 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
+++ b/src/quick3d/quick3drender/items/quick3dparameter_p_p.h
@@ -70,7 +70,7 @@ public:
 
     Q_DECLARE_PUBLIC(Quick3DParameter)
 
-    void setValue(const QVariant &value) Q_DECL_OVERRIDE;
+    void setValue(const QVariant &value) override;
 };
 
 } // namespace Quick
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index cd6e2a81e..539391da9 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -64,7 +64,7 @@ public:
     {
     }
 
-    QVariant readProperty(const QVariant &v) Q_DECL_OVERRIDE
+    QVariant readProperty(const QVariant &v) override
     {
         // qjsValueTypeId are not compile time constant (no switch)
         if (v.userType() == qjsValueTypeId) {
diff --git a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
index dd3788878..121c64216 100644
--- a/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
+++ b/src/quick3d/quick3drender/qt3dquickrendernodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
 class QuickRenderNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);
 
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.h b/src/quick3d/quick3dscene2d/items/qscene2d.h
index 73322a9e9..fd8466e22 100644
--- a/src/quick3d/quick3dscene2d/items/qscene2d.h
+++ b/src/quick3d/quick3dscene2d/items/qscene2d.h
@@ -101,7 +101,7 @@ protected:
     Q_DECLARE_PRIVATE(QScene2D)
 
 private:
-    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE;
+    Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override;
 };
 
 } // namespace Quick
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d_p.h b/src/quick3d/quick3dscene2d/items/qscene2d_p.h
index 217058f5c..ce354845a 100644
--- a/src/quick3d/quick3dscene2d/items/qscene2d_p.h
+++ b/src/quick3d/quick3dscene2d/items/qscene2d_p.h
@@ -74,7 +74,7 @@ public:
     QScene2DPrivate();
     ~QScene2DPrivate();
 
-    void setScene(Qt3DCore::QScene *scene) Q_DECL_OVERRIDE;
+    void setScene(Qt3DCore::QScene *scene) override;
 
     Scene2DManager *m_renderManager;
     QMetaObject::Connection m_textureDestroyedConnection;
diff --git a/src/quick3d/quick3dscene2d/items/scene2d_p.h b/src/quick3d/quick3dscene2d/items/scene2d_p.h
index b42089306..454a09447 100644
--- a/src/quick3d/quick3dscene2d/items/scene2d_p.h
+++ b/src/quick3d/quick3dscene2d/items/scene2d_p.h
@@ -75,7 +75,7 @@ class RenderQmlEventHandler : public QObject
     Q_OBJECT
 public:
     RenderQmlEventHandler(Scene2D *node);
-    bool event(QEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) override;
 
 private:
     Scene2D *m_node;
@@ -94,8 +94,8 @@ public:
     void setOutput(Qt3DCore::QNodeId outputId);
     void initializeSharedObject();
 
-    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) override;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) override;
 
     bool updateFbo(QOpenGLTexture *texture);
     void syncRenderControl();
diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
index 20c080dec..8829715d7 100644
--- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
+++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
@@ -54,7 +54,7 @@ class RenderControl : public QQuickRenderControl
 {
 public:
     RenderControl(QWindow *w) : m_window(w) { }
-    QWindow *renderWindow(QPoint *offset) Q_DECL_OVERRIDE;
+    QWindow *renderWindow(QPoint *offset) override;
 
 private:
     QWindow *m_window;
diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h b/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h
index 821616f47..ececf96fd 100644
--- a/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h
+++ b/src/quick3d/quick3dscene2d/items/scene2dmanager_p.h
@@ -99,7 +99,7 @@ public:
 
     void setItem(QQuickItem *item);
 
-    bool event(QEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) override;
 
     void cleanup();
 };
diff --git a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
index 9166c6ec2..dd8d1271b 100644
--- a/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
+++ b/src/quick3d/quick3dscene2d/qt3dquickscene2dnodefactory_p.h
@@ -64,7 +64,7 @@ namespace Qt3DRender {
 class QuickScene2DNodeFactory : public Qt3DCore::QAbstractNodeFactory
 {
 public:
-    Qt3DCore::QNode *createNode(const char *type) Q_DECL_OVERRIDE;
+    Qt3DCore::QNode *createNode(const char *type) override;
 
     void registerType(const char *className, const char *quickName, int major, int minor);