diff options
author | Kevin Funk <kfunk@kde.org> | 2017-09-20 20:57:27 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-25 10:42:42 +0000 |
commit | 43542ef59ac9324106a0690da3b808b23d5ab3a9 (patch) | |
tree | 2b632ce1cba8aed2c99c5a88297da8120f5940bb /src/render/renderstates/renderstates_p.h | |
parent | c9eac1f67bda96bd8ff5205027bbfb70ad2807d7 (diff) |
Replace Q_DECL_OVERRIDE with override
Change-Id: I92c955068e233c50043ad7d06a32300dd386c24d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/renderstates/renderstates_p.h')
-rw-r--r-- | src/render/renderstates/renderstates_p.h | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/render/renderstates/renderstates_p.h b/src/render/renderstates/renderstates_p.h index 2b1af1c4c..82ba084e3 100644 --- a/src/render/renderstates/renderstates_p.h +++ b/src/render/renderstates/renderstates_p.h @@ -62,139 +62,139 @@ namespace Render { class Q_AUTOTEST_EXPORT BlendEquationArguments : public GenericState<BlendEquationArguments, BlendEquationArgumentsMask, GLenum, GLenum, GLenum, GLenum, bool, int> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT BlendEquation : public GenericState<BlendEquation, BlendStateMask, GLenum> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT AlphaFunc : public GenericState<AlphaFunc, AlphaTestMask, GLenum, GLclampf> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT MSAAEnabled : public GenericState<MSAAEnabled, MSAAEnabledStateMask, GLboolean> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT DepthTest : public GenericState<DepthTest, DepthTestStateMask, GLenum> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT NoDepthMask : public GenericState<NoDepthMask, DepthWriteStateMask, GLboolean> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT CullFace : public GenericState<CullFace, CullFaceStateMask, GLenum> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT FrontFace : public GenericState<FrontFace, FrontFaceStateMask, GLenum> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT Dithering : public GenericState<Dithering, DitheringStateMask> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; }; class Q_AUTOTEST_EXPORT ScissorTest : public GenericState<ScissorTest, ScissorStateMask, int, int, int, int> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT StencilTest : public GenericState<StencilTest, StencilTestStateMask, GLenum, int, uint, GLenum, int, uint> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT AlphaCoverage : public GenericState<AlphaCoverage, AlphaCoverageStateMask> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; }; class Q_AUTOTEST_EXPORT PointSize : public GenericState<PointSize, PointSizeMask, bool, GLfloat> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT PolygonOffset : public GenericState<PolygonOffset, PolygonOffsetStateMask, GLfloat, GLfloat> { public: - void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT ColorMask : public GenericState<ColorMask, ColorStateMask, GLboolean, GLboolean, GLboolean, GLboolean> { public: void apply(GraphicsContext *gc) const Q_DECL_FINAL; - void updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + 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 updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void updateProperty(const char *name, const QVariant &value) override; }; class Q_AUTOTEST_EXPORT SeamlessCubemap : public GenericState<SeamlessCubemap, SeamlessCubemapMask> { public: - virtual void apply(GraphicsContext *gc) const Q_DECL_OVERRIDE; + void apply(GraphicsContext *gc) const override; }; 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 updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + 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 updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + 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 updateProperty(const char *name, const QVariant &value) Q_DECL_OVERRIDE; + void updateProperty(const char *name, const QVariant &value) override; }; } // namespace Render |