From a5c1754faa7bd9491fcf64dda34b479cdf62c9bd Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 12 Apr 2017 11:58:21 +0200 Subject: 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 --- src/core/stream_video_node.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/stream_video_node.cpp') 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" -- cgit v1.2.3