summaryrefslogtreecommitdiffstats
path: root/src/qtmultimediaquicktools/qsgvideonode_texture.cpp
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-11 15:10:11 +0300
committerYoann Lopes <yoann.lopes@qt.io>2016-12-12 15:29:53 +0000
commit32e35a8839085d88ddbf289ba2669c6745e9a04a (patch)
tree8a009ea34d44114ee4cfabf275cdf95fb9bf159a /src/qtmultimediaquicktools/qsgvideonode_texture.cpp
parentc89e2ea249015142f59c8ea440b6e36bac6f96c9 (diff)
Add missing override and remove redundant virtual
Change-Id: Ifd439abf21877adff57080489324bea729ee5279 Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/qtmultimediaquicktools/qsgvideonode_texture.cpp')
-rw-r--r--src/qtmultimediaquicktools/qsgvideonode_texture.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp
index 8080f3ec2..a26d59532 100644
--- a/src/qtmultimediaquicktools/qsgvideonode_texture.cpp
+++ b/src/qtmultimediaquicktools/qsgvideonode_texture.cpp
@@ -82,9 +82,9 @@ public:
setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/qtmultimediaquicktools/shaders/rgbvideo.frag"));
}
- void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial);
+ void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
- virtual char const *const *attributeNames() const {
+ char const *const *attributeNames() const override {
static const char *names[] = {
"qt_VertexPosition",
"qt_VertexTexCoord",
@@ -94,7 +94,7 @@ public:
}
protected:
- virtual void initialize() {
+ void initialize() override {
m_id_matrix = program()->uniformLocation("qt_Matrix");
m_id_Texture = program()->uniformLocation("rgbTexture");
m_id_opacity = program()->uniformLocation("opacity");
@@ -132,17 +132,17 @@ public:
m_frame = QVideoFrame();
}
- virtual QSGMaterialType *type() const {
+ QSGMaterialType *type() const override {
static QSGMaterialType normalType, swizzleType;
return needsSwizzling() ? &swizzleType : &normalType;
}
- virtual QSGMaterialShader *createShader() const {
+ QSGMaterialShader *createShader() const override {
return needsSwizzling() ? new QSGVideoMaterialShader_Texture_swizzle
: new QSGVideoMaterialShader_Texture;
}
- virtual int compare(const QSGMaterial *other) const {
+ int compare(const QSGMaterial *other) const override {
const QSGVideoMaterial_Texture *m = static_cast<const QSGVideoMaterial_Texture *>(other);
if (!m_textureId)