sources: Add missing override and remove redundant virtual

Change-Id: I48e26b1491024d41ebf75d40f0d1a7e9a1b20f22
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 29 insertions, 29 deletions

diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index ccfebddb0e..fde491b1ef 100644
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -118,15 +118,15 @@ public:
         Q_ASSERT(!m_fragment_code.isNull());
     }
 
-    const char *vertexShader() const { return m_vertex_code.constData(); }
-    const char *fragmentShader() const { return m_fragment_code.constData(); }
+    const char *vertexShader() const override { return m_vertex_code.constData(); }
+    const char *fragmentShader() const override { return m_fragment_code.constData(); }
 
-    QList<QByteArray> attributes() const {
+    QList<QByteArray> attributes() const override {
         return QList<QByteArray>() << "vPosTex" << "vData" << "vVec"
             << "vColor" << "vDeformVec" << "vRotation";
     };
 
-    void initialize() {
+    void initialize() override {
         QSGSimpleMaterialShader<TabledMaterialData>::initialize();
         program()->bind();
         program()->setUniformValue("_qt_texture", 0);
@@ -138,7 +138,7 @@ public:
         m_opacitytable_id = program()->uniformLocation("opacitytable");
     }
 
-    void updateState(const TabledMaterialData* d, const TabledMaterialData*) {
+    void updateState(const TabledMaterialData* d, const TabledMaterialData*) override {
         glFuncs->glActiveTexture(GL_TEXTURE1);
         d->colorTable->bind();
 
@@ -192,15 +192,15 @@ public:
         Q_ASSERT(!m_fragment_code.isNull());
     }
 
-    const char *vertexShader() const { return m_vertex_code.constData(); }
-    const char *fragmentShader() const { return m_fragment_code.constData(); }
+    const char *vertexShader() const override { return m_vertex_code.constData(); }
+    const char *fragmentShader() const override { return m_fragment_code.constData(); }
 
-    QList<QByteArray> attributes() const {
+    QList<QByteArray> attributes() const override {
         return QList<QByteArray>() << "vPosTex" << "vData" << "vVec"
             << "vColor" << "vDeformVec" << "vRotation";
     };
 
-    void initialize() {
+    void initialize() override {
         QSGSimpleMaterialShader<DeformableMaterialData>::initialize();
         program()->bind();
         program()->setUniformValue("_qt_texture", 0);
@@ -209,7 +209,7 @@ public:
         m_entry_id = program()->uniformLocation("entry");
     }
 
-    void updateState(const DeformableMaterialData* d, const DeformableMaterialData*) {
+    void updateState(const DeformableMaterialData* d, const DeformableMaterialData*) override {
         d->texture->bind();
 
         program()->setUniformValue(m_timestamp_id, (float) d->timestamp);
@@ -259,15 +259,15 @@ public:
         Q_ASSERT(!m_fragment_code.isNull());
     }
 
-    const char *vertexShader() const { return m_vertex_code.constData(); }
-    const char *fragmentShader() const { return m_fragment_code.constData(); }
+    const char *vertexShader() const override { return m_vertex_code.constData(); }
+    const char *fragmentShader() const override { return m_fragment_code.constData(); }
 
-    QList<QByteArray> attributes() const {
+    QList<QByteArray> attributes() const override {
         return QList<QByteArray>() << "vPosTex" << "vData" << "vVec"
             << "vColor" << "vDeformVec" << "vRotation" << "vAnimData" << "vAnimPos";
     }
 
-    void initialize() {
+    void initialize() override {
         QSGSimpleMaterialShader<SpriteMaterialData>::initialize();
         program()->bind();
         program()->setUniformValue("_qt_texture", 0);
@@ -280,7 +280,7 @@ public:
         m_opacitytable_id = program()->uniformLocation("opacitytable");
     }
 
-    void updateState(const SpriteMaterialData* d, const SpriteMaterialData*) {
+    void updateState(const SpriteMaterialData* d, const SpriteMaterialData*) override {
         glFuncs->glActiveTexture(GL_TEXTURE1);
         d->colorTable->bind();
 
@@ -333,10 +333,10 @@ public:
         Q_ASSERT(!m_fragment_code.isNull());
     }
 
-    const char *vertexShader() const { return m_vertex_code.constData(); }
-    const char *fragmentShader() const { return m_fragment_code.constData(); }
+    const char *vertexShader() const override { return m_vertex_code.constData(); }
+    const char *fragmentShader() const override { return m_fragment_code.constData(); }
 
-    void activate() {
+    void activate() override {
         QSGSimpleMaterialShader<ColoredMaterialData>::activate();
 #if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
         glEnable(GL_POINT_SPRITE);
@@ -344,7 +344,7 @@ public:
 #endif
     }
 
-    void deactivate() {
+    void deactivate() override {
         QSGSimpleMaterialShader<ColoredMaterialData>::deactivate();
 #if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
         glDisable(GL_POINT_SPRITE);
@@ -352,11 +352,11 @@ public:
 #endif
     }
 
-    QList<QByteArray> attributes() const {
+    QList<QByteArray> attributes() const override {
         return QList<QByteArray>() << "vPos" << "vData" << "vVec" << "vColor";
     }
 
-    void initialize() {
+    void initialize() override {
         QSGSimpleMaterialShader<ColoredMaterialData>::initialize();
         program()->bind();
         program()->setUniformValue("_qt_texture", 0);
@@ -365,7 +365,7 @@ public:
         m_entry_id = program()->uniformLocation("entry");
     }
 
-    void updateState(const ColoredMaterialData* d, const ColoredMaterialData*) {
+    void updateState(const ColoredMaterialData* d, const ColoredMaterialData*) override {
         d->texture->bind();
 
         program()->setUniformValue(m_timestamp_id, (float) d->timestamp);
@@ -407,10 +407,10 @@ public:
         Q_ASSERT(!m_fragment_code.isNull());
     }
 
-    const char *vertexShader() const { return m_vertex_code.constData(); }
-    const char *fragmentShader() const { return m_fragment_code.constData(); }
+    const char *vertexShader() const override { return m_vertex_code.constData(); }
+    const char *fragmentShader() const override { return m_fragment_code.constData(); }
 
-    void activate() {
+    void activate() override {
         QSGSimpleMaterialShader<SimpleMaterialData>::activate();
 #if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
         glEnable(GL_POINT_SPRITE);
@@ -418,7 +418,7 @@ public:
 #endif
     }
 
-    void deactivate() {
+    void deactivate() override {
         QSGSimpleMaterialShader<SimpleMaterialData>::deactivate();
 #if !defined(QT_OPENGL_ES_2) && !defined(Q_OS_WIN)
         glDisable(GL_POINT_SPRITE);
@@ -426,11 +426,11 @@ public:
 #endif
     }
 
-    QList<QByteArray> attributes() const {
+    QList<QByteArray> attributes() const override {
         return QList<QByteArray>() << "vPos" << "vData" << "vVec";
     }
 
-    void initialize() {
+    void initialize() override {
         QSGSimpleMaterialShader<SimpleMaterialData>::initialize();
         program()->bind();
         program()->setUniformValue("_qt_texture", 0);
@@ -439,7 +439,7 @@ public:
         m_entry_id = program()->uniformLocation("entry");
     }
 
-    void updateState(const SimpleMaterialData* d, const SimpleMaterialData*) {
+    void updateState(const SimpleMaterialData* d, const SimpleMaterialData*) override {
         d->texture->bind();
 
         program()->setUniformValue(m_timestamp_id, (float) d->timestamp);