diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-21 17:14:38 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-25 10:42:44 +0000 |
commit | 93f5ac54f56b8c340731fd88e1b88525fca7793c (patch) | |
tree | 61f28cbaa19c0ca7aa07bcee0f7f0fd71eb06fb5 /src/quick3d | |
parent | 43542ef59ac9324106a0690da3b808b23d5ab3a9 (diff) |
Replace Q_DECL_FINAL with final
Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterial_p.h | 4 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h | 10 | ||||
-rw-r--r-- | src/quick3d/quick3d/items/quick3dentityloader.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h index df431e452..c096f2a74 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgmaterial_p.h @@ -72,8 +72,8 @@ public: } QSGTexture *texture() const Q_DECL_NOTHROW { return m_texture; } - QSGMaterialType *type() const Q_DECL_FINAL { return &Scene3DSGMaterialShader::type; } - QSGMaterialShader *createShader() const Q_DECL_FINAL { return new Scene3DSGMaterialShader(); } + QSGMaterialType *type() const final { return &Scene3DSGMaterialShader::type; } + QSGMaterialShader *createShader() const final { return new Scene3DSGMaterialShader(); } private: QSGTexture *m_texture; diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h index a1222b07d..c372a1170 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader_p.h @@ -61,15 +61,15 @@ class Scene3DSGMaterialShader : public QSGMaterialShader { public: Scene3DSGMaterialShader(); - void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_FINAL; - const char * const *attributeNames() const Q_DECL_FINAL; + void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) final; + const char * const *attributeNames() const final; static QSGMaterialType type; protected: - const char *vertexShader() const Q_DECL_FINAL; - const char *fragmentShader() const Q_DECL_FINAL; - void initialize() Q_DECL_FINAL; + const char *vertexShader() const final; + const char *fragmentShader() const final; + void initialize() final; private: int m_matrixId; diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp index 8a9b19024..6caca52bf 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.cpp +++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp @@ -86,7 +86,7 @@ public: } protected: - void statusChanged(Status status) Q_DECL_FINAL + void statusChanged(Status status) final { Quick3DEntityLoaderPrivate *priv = Quick3DEntityLoaderPrivate::get(m_loader); |