Commit fdd5b0f1 authored by Tobias Hunger's avatar Tobias Hunger

QmlDesigner: Fix warnings about inconsistent override usage

Change-Id: I71de3d105c97940fe3b72adfbe3dbb898d7a7d2e
Reviewed-by: default avatarTim Jenssen <tim.jenssen@theqtcompany.com>
parent c020d1e4
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
~NavigatorView(); ~NavigatorView();
bool hasWidget() const override; bool hasWidget() const override;
WidgetInfo widgetInfo(); WidgetInfo widgetInfo() override;
// AbstractView // AbstractView
void modelAttached(Model *model) override; void modelAttached(Model *model) override;
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override; void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) override;
void instanceErrorChange(const QVector<ModelNode> &errorNodeList) 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: private slots:
void changeSelection(const QItemSelection &selected, const QItemSelection &deselected); void changeSelection(const QItemSelection &selected, const QItemSelection &deselected);
......
...@@ -88,7 +88,7 @@ public: ...@@ -88,7 +88,7 @@ public:
void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override; void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
protected: protected:
void timerEvent(QTimerEvent *event); void timerEvent(QTimerEvent *event) override;
void setupPane(const TypeName &typeName); void setupPane(const TypeName &typeName);
void setValue(const QmlObjectNode &fxObjectNode, const PropertyName &name, const QVariant &value); void setValue(const QmlObjectNode &fxObjectNode, const PropertyName &name, const QVariant &value);
......
...@@ -50,8 +50,8 @@ public: ...@@ -50,8 +50,8 @@ public:
void updateContext() override; void updateContext() override;
protected: protected:
bool isVisible(const SelectionContext &selectionContext) const; bool isVisible(const SelectionContext &selectionContext) const override;
bool isEnabled(const SelectionContext &selectionContext) const; bool isEnabled(const SelectionContext &selectionContext) const override;
private: private:
void createActionForTab(const ModelNode &modelNode); void createActionForTab(const ModelNode &modelNode);
......
...@@ -105,7 +105,7 @@ public: ...@@ -105,7 +105,7 @@ public:
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override; void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) override;
void currentStateChanged(const ModelNode &node); void currentStateChanged(const ModelNode &node) override;
QList<NodeInstance> instances() const; QList<NodeInstance> instances() const;
NodeInstance instanceForModelNode(const ModelNode &node) const ; NodeInstance instanceForModelNode(const ModelNode &node) const ;
...@@ -121,14 +121,14 @@ public: ...@@ -121,14 +121,14 @@ public:
void updateChildren(const NodeAbstractProperty &newPropertyParent); void updateChildren(const NodeAbstractProperty &newPropertyParent);
void updatePosition(const QList<VariantProperty>& propertyList); void updatePosition(const QList<VariantProperty>& propertyList);
void valuesChanged(const ValuesChangedCommand &command); void valuesChanged(const ValuesChangedCommand &command) override;
void pixmapChanged(const PixmapChangedCommand &command); void pixmapChanged(const PixmapChangedCommand &command) override;
void informationChanged(const InformationChangedCommand &command); void informationChanged(const InformationChangedCommand &command) override;
void childrenChanged(const ChildrenChangedCommand &command); void childrenChanged(const ChildrenChangedCommand &command) override;
void statePreviewImagesChanged(const StatePreviewImageChangedCommand &command); void statePreviewImagesChanged(const StatePreviewImageChangedCommand &command) override;
void componentCompleted(const ComponentCompletedCommand &command); void componentCompleted(const ComponentCompletedCommand &command) override;
void token(const TokenCommand &command); void token(const TokenCommand &command) override;
void debugOutput(const DebugOutputCommand &command); void debugOutput(const DebugOutputCommand &command) override;
QImage statePreviewImage(const ModelNode &stateNode) const; QImage statePreviewImage(const ModelNode &stateNode) const;
...@@ -141,7 +141,7 @@ signals: ...@@ -141,7 +141,7 @@ signals:
void qmlPuppetError(const QString &errorMessage); void qmlPuppetError(const QString &errorMessage);
protected: protected:
void timerEvent(QTimerEvent *event); void timerEvent(QTimerEvent *event) override;
private: // functions private: // functions
void activateState(const NodeInstance &instance); void activateState(const NodeInstance &instance);
......
...@@ -319,7 +319,7 @@ public: ...@@ -319,7 +319,7 @@ public:
return true; 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()); m_signals.append(name.toUtf8());
return true; return true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment