diff options
author | Albert Astals Cid <aacid@kde.org> | 2014-08-09 16:18:01 +0200 |
---|---|---|
committer | Albert Astals Cid <aacid@kde.org> | 2014-08-14 10:58:20 +0200 |
commit | 2f494803578475732dcffcd12fe5ba3b4b1c521b (patch) | |
tree | e0603d0661e45ba95554b99d901e2e08b3557c05 /src/quick/items/qquickspritesequence.cpp | |
parent | da9c41a72975db20425a80741da4eb5c0d2dfd65 (diff) |
Add Q_DECL_OVERRIDE
Change-Id: I2e64950aef710f943c3bc50bc9bf8a1f7fb58d28
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/quick/items/qquickspritesequence.cpp')
-rw-r--r-- | src/quick/items/qquickspritesequence.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp index a90aa9ace2..e2c5841073 100644 --- a/src/quick/items/qquickspritesequence.cpp +++ b/src/quick/items/qquickspritesequence.cpp @@ -61,9 +61,9 @@ class QQuickSpriteSequenceMaterial : public QSGMaterial public: QQuickSpriteSequenceMaterial(); ~QQuickSpriteSequenceMaterial(); - virtual QSGMaterialType *type() const { static QSGMaterialType type; return &type; } - virtual QSGMaterialShader *createShader() const; - virtual int compare(const QSGMaterial *other) const + QSGMaterialType *type() const Q_DECL_OVERRIDE{ static QSGMaterialType type; return &type; } + QSGMaterialShader *createShader() const Q_DECL_OVERRIDE; + int compare(const QSGMaterial *other) const Q_DECL_OVERRIDE { return this - static_cast<const QQuickSpriteSequenceMaterial *>(other); } @@ -107,7 +107,7 @@ public: setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/items/shaders/sprite.frag")); } - virtual void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) + void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *) Q_DECL_OVERRIDE { QQuickSpriteSequenceMaterial *m = static_cast<QQuickSpriteSequenceMaterial *>(newEffect); m->texture->bind(); @@ -120,14 +120,14 @@ public: program()->setUniformValue(m_matrix_id, state.combinedMatrix()); } - virtual void initialize() { + void initialize() Q_DECL_OVERRIDE { m_matrix_id = program()->uniformLocation("qt_Matrix"); m_opacity_id = program()->uniformLocation("qt_Opacity"); m_animData_id = program()->uniformLocation("animData"); m_animPos_id = program()->uniformLocation("animPos"); } - virtual char const *const *attributeNames() const { + char const *const *attributeNames() const Q_DECL_OVERRIDE { static const char *attr[] = { "vPos", "vTex", |