QmlDesigner: Fix warnings about inconsistent override usage

Change-Id: I71de3d105c97940fe3b72adfbe3dbb898d7a7d2e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>

5 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h
index a6d48ef01b..41e1d697b8 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h
@@ -55,7 +55,7 @@ public:
     ~NavigatorView();
 
     bool hasWidget() const override;
-    WidgetInfo widgetInfo();
+    WidgetInfo widgetInfo() override;
 
     // AbstractView
     void modelAttached(Model *model) override;
@@ -76,7 +76,7 @@ public:
     void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override;
     void instanceErrorChange(const QVector<ModelNode> &errorNodeList) override;
 
-    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags);
+    void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags) override;
 
 private slots:
     void changeSelection(const QItemSelection &selected, const QItemSelection &deselected);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
index ab208a7d22..191f84ea1c 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
@@ -88,7 +88,7 @@ public:
     void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
 
 protected:
-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;
     void setupPane(const TypeName &typeName);
     void setValue(const QmlObjectNode &fxObjectNode, const PropertyName &name, const QVariant &value);
 
diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h
index 90a2294822..0e74b8f7be 100644
--- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h
+++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h
@@ -50,8 +50,8 @@ public:
     void updateContext() override;
 
 protected:
-    bool isVisible(const SelectionContext &selectionContext) const;
-    bool isEnabled(const SelectionContext &selectionContext) const;
+    bool isVisible(const SelectionContext &selectionContext) const override;
+    bool isEnabled(const SelectionContext &selectionContext) const override;
 
 private:
     void createActionForTab(const ModelNode &modelNode);
diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
index 8a6c0fb780..131317bdbd 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
@@ -105,7 +105,7 @@ public:
     void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override;
 
 
-    void currentStateChanged(const ModelNode &node);
+    void currentStateChanged(const ModelNode &node) override;
 
     QList<NodeInstance> instances() const;
     NodeInstance instanceForModelNode(const ModelNode &node) const ;
@@ -121,14 +121,14 @@ public:
     void updateChildren(const NodeAbstractProperty &newPropertyParent);
     void updatePosition(const QList<VariantProperty>& propertyList);
 
-    void valuesChanged(const ValuesChangedCommand &command);
-    void pixmapChanged(const PixmapChangedCommand &command);
-    void informationChanged(const InformationChangedCommand &command);
-    void childrenChanged(const ChildrenChangedCommand &command);
-    void statePreviewImagesChanged(const StatePreviewImageChangedCommand &command);
-    void componentCompleted(const ComponentCompletedCommand &command);
-    void token(const TokenCommand &command);
-    void debugOutput(const DebugOutputCommand &command);
+    void valuesChanged(const ValuesChangedCommand &command) override;
+    void pixmapChanged(const PixmapChangedCommand &command) override;
+    void informationChanged(const InformationChangedCommand &command) override;
+    void childrenChanged(const ChildrenChangedCommand &command) override;
+    void statePreviewImagesChanged(const StatePreviewImageChangedCommand &command) override;
+    void componentCompleted(const ComponentCompletedCommand &command) override;
+    void token(const TokenCommand &command) override;
+    void debugOutput(const DebugOutputCommand &command) override;
 
     QImage statePreviewImage(const ModelNode &stateNode) const;
 
@@ -141,7 +141,7 @@ signals:
     void qmlPuppetError(const QString &errorMessage);
 
 protected:
-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent *event) override;
 
 private: // functions
     void activateState(const NodeInstance &instance);
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 06cf93af76..3f32762468 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -319,7 +319,7 @@ public:
         return true;
     }
 
-    virtual bool processSignal(const QString &name, const Value * /*value*/)
+    bool processSignal(const QString &name, const Value * /*value*/) override
     {
         m_signals.append(name.toUtf8());
         return true;