diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-12 11:58:21 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-04-21 11:10:13 +0000 |
| commit | a5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch) | |
| tree | 61a093917f9c8308d2153335d49c58acc3836981 /src/core/stream_video_node.cpp | |
| parent | d08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff) | |
Standardize override declaration
Update our overrides to Qt coding standard getting rid of
Q_DECL_OVERRIDE and redundant virtual declarations.
Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core/stream_video_node.cpp')
| -rw-r--r-- | src/core/stream_video_node.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/stream_video_node.cpp b/src/core/stream_video_node.cpp index 81b76a296..29922f866 100644 --- a/src/core/stream_video_node.cpp +++ b/src/core/stream_video_node.cpp @@ -49,7 +49,7 @@ public: StreamVideoMaterialShader(TextureTarget target) : m_target(target) { } virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); - virtual char const *const *attributeNames() const Q_DECL_OVERRIDE { + char const *const *attributeNames() const override { static const char *names[] = { "a_position", "a_texCoord", @@ -59,7 +59,7 @@ public: } protected: - virtual const char *vertexShader() const Q_DECL_OVERRIDE { + const char *vertexShader() const override { // Keep in sync with cc::VertexShaderVideoTransform static const char *shader = "attribute highp vec4 a_position;\n" @@ -74,7 +74,7 @@ protected: return shader; } - virtual const char *fragmentShader() const Q_DECL_OVERRIDE { + const char *fragmentShader() const override { // Keep in sync with cc::FragmentShaderRGBATexAlpha static const char *shaderExternal = "#extension GL_OES_EGL_image_external : require\n" |