From 43542ef59ac9324106a0690da3b808b23d5ab3a9 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Wed, 20 Sep 2017 20:57:27 +0200 Subject: Replace Q_DECL_OVERRIDE with override Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d Reviewed-by: Sean Harmer --- src/render/lights/light_p.h | 2 +- src/render/lights/qabstractlight.h | 2 +- src/render/lights/qenvironmentlight.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/render/lights') diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h index 19deb1bcc..e1f552b2e 100644 --- a/src/render/lights/light_p.h +++ b/src/render/lights/light_p.h @@ -77,7 +77,7 @@ class RenderLightFunctor : public Qt3DCore::QBackendNodeMapper public: explicit RenderLightFunctor(AbstractRenderer *renderer, NodeManagers *managers); - Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const override; Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL; void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL; diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 33a88b215..23d2d5f7e 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -86,7 +86,7 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QAbstractLight) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DRender diff --git a/src/render/lights/qenvironmentlight.h b/src/render/lights/qenvironmentlight.h index 0a5087c42..c3d180233 100644 --- a/src/render/lights/qenvironmentlight.h +++ b/src/render/lights/qenvironmentlight.h @@ -76,7 +76,7 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QEnvironmentLight) - Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const Q_DECL_OVERRIDE; + Qt3DCore::QNodeCreatedChangeBasePtr createNodeCreationChange() const override; }; } // namespace Qt3DRender -- cgit v1.2.3