Commit e970d7bf authored by Thomas Hartmann's avatar Thomas Hartmann
Browse files

QmlDesigner: adding missing QTC_OVERRIDE to views



Change-Id: I43ed62a10840723676884bf40722315d4dee8d80
Reviewed-by: default avatarMarco Bubke <marco.bubke@digia.com>
(cherry picked from commit d904557f)
parent 368b3acb
...@@ -42,39 +42,45 @@ public: ...@@ -42,39 +42,45 @@ public:
DesignDocumentView(QObject *parent = 0); DesignDocumentView(QObject *parent = 0);
~DesignDocumentView(); ~DesignDocumentView();
virtual void nodeCreated(const ModelNode &createdNode); virtual void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
virtual void nodeAboutToBeRemoved(const ModelNode &removedNode); virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange); virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
virtual void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); virtual void nodeAboutToBeReparented(const ModelNode &node,
virtual void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); const NodeAbstractProperty &newPropertyParent,
virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId); const NodeAbstractProperty &oldPropertyParent,
virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList); AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList); virtual void nodeReparented(const ModelNode &node,
virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange); const NodeAbstractProperty &newPropertyParent,
virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange); const NodeAbstractProperty &oldPropertyParent,
virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion); AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
virtual void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, virtual void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
const QList<ModelNode> &lastSelectedNodeList); const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList); void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
void instancesCompleted(const QVector<ModelNode> &completedNodeList); void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash); void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
void instancesRenderImageChanged(const QVector<ModelNode> &nodeList); void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList); void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
void instancesChildrenChanged(const QVector<ModelNode> &nodeList); void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector); void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource); void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
void rewriterBeginTransaction(); void rewriterBeginTransaction();
void rewriterEndTransaction(); void rewriterEndTransaction();
void actualStateChanged(const ModelNode &node); void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports); void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
ModelNode insertModel(const ModelNode &modelNode) ModelNode insertModel(const ModelNode &modelNode)
{ return m_modelMerger.insertModel(modelNode); } { return m_modelMerger.insertModel(modelNode); }
......
...@@ -49,32 +49,38 @@ public: ...@@ -49,32 +49,38 @@ public:
QString currentStateName() const; QString currentStateName() const;
// AbstractView // AbstractView
void modelAttached(Model *model); void modelAttached(Model *model) QTC_OVERRIDE;
void modelAboutToBeDetached(Model *model); void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
void propertiesRemoved(const QList<AbstractProperty>& propertyList); void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange); void variantPropertiesChanged(const QList<VariantProperty>& propertyList,
PropertyChangeFlags propertyChange) QTC_OVERRIDE;
void nodeAboutToBeRemoved(const ModelNode &removedNode);
void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange); void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); void nodeRemoved(const ModelNode &removedNode,
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); const NodeAbstractProperty &parentProperty,
void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); PropertyChangeFlags propertyChange) QTC_OVERRIDE;
void nodeAboutToBeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
void nodeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
// QmlModelView // QmlModelView
void actualStateChanged(const ModelNode &node); void actualStateChanged(const ModelNode &node) QTC_OVERRIDE;
void transformChanged(const QmlObjectNode &qmlObjectNode, const QString &propertyName);
void parentChanged(const QmlObjectNode &qmlObjectNode);
void otherPropertyChanged(const QmlObjectNode &qmlObjectNode, const QString &propertyName);
void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId); void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) QTC_OVERRIDE;
void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange); void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList); void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList); void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
WidgetInfo widgetInfo(); WidgetInfo widgetInfo() QTC_OVERRIDE;
public slots: public slots:
......
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