summaryrefslogtreecommitdiffstats
path: root/lib/yuv_video_node.cpp
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-11-06 17:15:12 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-14 15:43:48 +0100
commit496f66ee52214ac614135c736f7d89c4dd08ba14 (patch)
treebd4de6a9909846b53f1edbd58d2914e16ef5f2d1 /lib/yuv_video_node.cpp
parente1f0ec1af9bcef187bc132e29101b3f7c9c367c1 (diff)
Mark functions with Q_DECL_OVERRIDE where necessary.
Change-Id: I15261c3737a3284b99308453132f09ee7889c444 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'lib/yuv_video_node.cpp')
-rw-r--r--lib/yuv_video_node.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/yuv_video_node.cpp b/lib/yuv_video_node.cpp
index 869630f67..e6c0c7da9 100644
--- a/lib/yuv_video_node.cpp
+++ b/lib/yuv_video_node.cpp
@@ -45,9 +45,9 @@
class YUVVideoMaterialShader : public QSGMaterialShader
{
public:
- virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial);
+ virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE;
- virtual char const *const *attributeNames() const {
+ virtual char const *const *attributeNames() const Q_DECL_OVERRIDE {
static const char *names[] = {
"a_position",
"a_texCoord",
@@ -57,7 +57,7 @@ public:
}
protected:
- virtual const char *vertexShader() const {
+ virtual const char *vertexShader() const Q_DECL_OVERRIDE {
// Keep in sync with cc::VertexShaderPosTexYUVStretch
const char *shader =
"attribute highp vec4 a_position;\n"
@@ -72,7 +72,7 @@ protected:
return shader;
}
- virtual const char *fragmentShader() const {
+ virtual const char *fragmentShader() const Q_DECL_OVERRIDE {
// Keep in sync with cc::FragmentShaderYUVVideo
static const char *shader =
"varying mediump vec2 v_texCoord;\n"
@@ -93,7 +93,7 @@ protected:
return shader;
}
- virtual void initialize() {
+ virtual void initialize() Q_DECL_OVERRIDE {
m_id_matrix = program()->uniformLocation("matrix");
m_id_texScale = program()->uniformLocation("texScale");
m_id_yTexture = program()->uniformLocation("y_texture");
@@ -116,10 +116,10 @@ protected:
class YUVAVideoMaterialShader : public YUVVideoMaterialShader
{
- virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial);
+ virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE;
protected:
- virtual const char *fragmentShader() const {
+ virtual const char *fragmentShader() const Q_DECL_OVERRIDE {
// Keep in sync with cc::FragmentShaderYUVAVideo
static const char *shader =
// "precision mediump float;\n"
@@ -144,7 +144,7 @@ protected:
return shader;
}
- virtual void initialize() {
+ virtual void initialize() Q_DECL_OVERRIDE {
// YUVVideoMaterialShader has a subset of the uniforms.
YUVVideoMaterialShader::initialize();
m_id_aTexture = program()->uniformLocation("a_texture");