summaryrefslogtreecommitdiffstats
path: root/src/compositor/compositor_api/qwaylandquickitem_p.h
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2017-01-12 13:25:48 +0100
committerJohan Helsing <johan.helsing@qt.io>2017-01-23 16:20:03 +0000
commitf72d63866d3f5820865fcd309b649dc9932518ee (patch)
tree675610cbbc8a88f0197c351e754e7892e4eb7871 /src/compositor/compositor_api/qwaylandquickitem_p.h
parent76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff)
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem_p.h')
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h
index 18693a738..fe8fbfd12 100644
--- a/src/compositor/compositor_api/qwaylandquickitem_p.h
+++ b/src/compositor/compositor_api/qwaylandquickitem_p.h
@@ -66,11 +66,11 @@ class QWaylandBufferMaterialShader : public QSGMaterialShader
public:
QWaylandBufferMaterialShader(QWaylandBufferRef::BufferFormatEgl format);
- void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) Q_DECL_OVERRIDE;
- char const *const *attributeNames() const Q_DECL_OVERRIDE;
+ void updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) override;
+ char const *const *attributeNames() const override;
protected:
- void initialize() Q_DECL_OVERRIDE;
+ void initialize() override;
private:
const QWaylandBufferRef::BufferFormatEgl m_format;
@@ -89,8 +89,8 @@ public:
void bind();
- QSGMaterialType *type() const Q_DECL_OVERRIDE;
- QSGMaterialShader *createShader() const Q_DECL_OVERRIDE;
+ QSGMaterialType *type() const override;
+ QSGMaterialShader *createShader() const override;
private:
void setTextureParameters(GLenum target);