summaryrefslogtreecommitdiffstats
path: root/src/render/renderstates
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-21 17:14:38 +0200
committerSean Harmer <sean.harmer@kdab.com>2017-09-25 10:42:44 +0000
commit93f5ac54f56b8c340731fd88e1b88525fca7793c (patch)
tree61f28cbaa19c0ca7aa07bcee0f7f0fd71eb06fb5 /src/render/renderstates
parent43542ef59ac9324106a0690da3b808b23d5ab3a9 (diff)
Replace Q_DECL_FINAL with final
Change-Id: Ia80d1cb9cc96d76f8b367caa725c59a70ae0a4d5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/renderstates')
-rw-r--r--src/render/renderstates/renderstatenode_p.h2
-rw-r--r--src/render/renderstates/renderstates_p.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/render/renderstates/renderstatenode_p.h b/src/render/renderstates/renderstatenode_p.h
index 97a2d5e4d..886bb0c95 100644
--- a/src/render/renderstates/renderstatenode_p.h
+++ b/src/render/renderstates/renderstatenode_p.h
@@ -72,7 +72,7 @@ protected:
void cleanup();
private:
- void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
+ void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
StateVariant m_impl;
};
diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h
index 82ba084e3..c85606f87 100644
--- a/src/render/renderstates/renderstates_p.h
+++ b/src/render/renderstates/renderstates_p.h
@@ -159,14 +159,14 @@ public:
class Q_AUTOTEST_EXPORT ColorMask : public GenericState<ColorMask, ColorStateMask, GLboolean, GLboolean, GLboolean, GLboolean>
{
public:
- void apply(GraphicsContext *gc) const Q_DECL_FINAL;
+ void apply(GraphicsContext *gc) const final;
void updateProperty(const char *name, const QVariant &value) override;
};
class Q_AUTOTEST_EXPORT ClipPlane : public GenericState<ClipPlane, ClipPlaneMask, int, QVector3D, float>
{
public:
- void apply(GraphicsContext *gc) const Q_DECL_FINAL;
+ void apply(GraphicsContext *gc) const final;
void updateProperty(const char *name, const QVariant &value) override;
};
@@ -179,21 +179,21 @@ public:
class Q_AUTOTEST_EXPORT StencilOp : public GenericState<StencilOp, StencilOpMask, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum>
{
public:
- void apply(GraphicsContext *gc) const Q_DECL_FINAL;
+ void apply(GraphicsContext *gc) const final;
void updateProperty(const char *name, const QVariant &value) override;
};
class Q_AUTOTEST_EXPORT StencilMask : public GenericState<StencilMask, StencilWriteStateMask, uint, uint>
{
public:
- void apply(GraphicsContext *gc) const Q_DECL_FINAL;
+ void apply(GraphicsContext *gc) const final;
void updateProperty(const char *name, const QVariant &value) override;
};
class Q_AUTOTEST_EXPORT LineWidth : public GenericState<LineWidth, LineWidthMask, GLfloat, bool>
{
public:
- void apply(GraphicsContext *gc) const Q_DECL_FINAL;
+ void apply(GraphicsContext *gc) const final;
void updateProperty(const char *name, const QVariant &value) override;
};