diff options
author | Sergio Martins <sergio.martins@kdab.com> | 2015-02-17 21:25:01 +0000 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-02-18 07:03:19 +0000 |
commit | 13075b0888ab5c104010f7ff142fda917aa7c310 (patch) | |
tree | b967a908fbcb4e0fa275d103040c361f17cc9823 /src | |
parent | ae45b629b8a40318fa3e619116b0dd84c987f6ed (diff) |
Fix inconsistent override warnings [-Winconsistent-missing-override]
Classes should either use or not use override, otherwise it hurts
code readability.
Change-Id: Ibe3e5a5fdc5cb3fc4c61ab722005c337f5998c26
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/nodes/qnode_p.h | 2 | ||||
-rw-r--r-- | src/render/backend/quniformvalue_p.h | 2 | ||||
-rw-r--r-- | src/render/backend/renderannotation_p.h | 2 | ||||
-rw-r--r-- | src/render/backend/rendereffect_p.h | 2 | ||||
-rw-r--r-- | src/render/backend/rendershader_p.h | 2 | ||||
-rw-r--r-- | src/render/backend/rendertechnique_p.h | 2 | ||||
-rw-r--r-- | src/render/frontend/qcylindermesh.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h index b0b05037b..67f999f3e 100644 --- a/src/core/nodes/qnode_p.h +++ b/src/core/nodes/qnode_p.h @@ -62,7 +62,7 @@ public: void setArbiter(QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE; void notifyPropertyChange(const char *name, const QVariant &value); - virtual void notifyObservers(const QSceneChangePtr &change); + void notifyObservers(const QSceneChangePtr &change) Q_DECL_OVERRIDE; void insertTree(QNode *treeRoot, int depth = 0); diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index b3f4a64b9..e3c983a83 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -118,7 +118,7 @@ public : // Called by the QGraphicContext prior applying void setTextureUnit(int textureUnit) { m_textureUnit = textureUnit; } - void apply(QGraphicsContext *ctx, const ShaderUniform &description) const; + void apply(QGraphicsContext *ctx, const ShaderUniform &description) const Q_DECL_OVERRIDE; private: QNodeId m_textureId; diff --git a/src/render/backend/renderannotation_p.h b/src/render/backend/renderannotation_p.h index e737328ab..70f6641ce 100644 --- a/src/render/backend/renderannotation_p.h +++ b/src/render/backend/renderannotation_p.h @@ -60,7 +60,7 @@ public: QVariant criterionValue() const; QString criterionName() const; - void sceneChangeEvent(const QSceneChangePtr &e); + void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; bool operator ==(const RenderAnnotation &other); bool operator !=(const RenderAnnotation &other); diff --git a/src/render/backend/rendereffect_p.h b/src/render/backend/rendereffect_p.h index 55a4f9fde..40291c275 100644 --- a/src/render/backend/rendereffect_p.h +++ b/src/render/backend/rendereffect_p.h @@ -60,7 +60,7 @@ public: void cleanup(); void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e); + void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; void appendRenderTechnique(const QNodeId &t); QList<QNodeId> techniques() const; diff --git a/src/render/backend/rendershader_p.h b/src/render/backend/rendershader_p.h index 3b1955626..bece7be93 100644 --- a/src/render/backend/rendershader_p.h +++ b/src/render/backend/rendershader_p.h @@ -65,7 +65,7 @@ public: void cleanup(); - void updateFromPeer(QNode *peer); + void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; void updateUniforms(QGraphicsContext *ctx, const QUniformPack &pack); void setFragOutputs(const QHash<QString, int> &fragOutputs); diff --git a/src/render/backend/rendertechnique_p.h b/src/render/backend/rendertechnique_p.h index 2c65192c3..6427c6176 100644 --- a/src/render/backend/rendertechnique_p.h +++ b/src/render/backend/rendertechnique_p.h @@ -67,7 +67,7 @@ public: void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e); + void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; QList<QNodeId> parameters() const; void appendRenderPass(const QNodeId &renderPassId); diff --git a/src/render/frontend/qcylindermesh.cpp b/src/render/frontend/qcylindermesh.cpp index 0e0f45436..166b56d72 100644 --- a/src/render/frontend/qcylindermesh.cpp +++ b/src/render/frontend/qcylindermesh.cpp @@ -56,7 +56,7 @@ class CylinderMeshFunctor : public QAbstractMeshFunctor public: CylinderMeshFunctor(int rings, int slices, float radius, float length); QMeshDataPtr operator ()() Q_DECL_OVERRIDE; - bool operator ==(const QAbstractMeshFunctor &other) const; + bool operator ==(const QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE; private: int m_rings; |