diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.h b/src/plugins/qmldesigner/components/integration/designdocumentview.h index afac32fa2516d5379383bce2981878bb10c3e8b1..271f041a2f7668cf822036468b24077f0caba511 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.h @@ -42,39 +42,45 @@ public: DesignDocumentView(QObject *parent = 0); ~DesignDocumentView(); - virtual void nodeCreated(const ModelNode &createdNode); - virtual void nodeAboutToBeRemoved(const ModelNode &removedNode); - virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange); - virtual void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - virtual void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId); - virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList); - virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList); - virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange); - virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange); - virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion); + virtual void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE; + virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; + 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) QTC_OVERRIDE; + virtual void nodeReparented(const ModelNode &node, + const NodeAbstractProperty &newPropertyParent, + const NodeAbstractProperty &oldPropertyParent, + 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, - const QList<ModelNode> &lastSelectedNodeList); + const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE; - virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); - virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); - void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList); - void instancesCompleted(const QVector<ModelNode> &completedNodeList); - void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash); - void instancesRenderImageChanged(const QVector<ModelNode> &nodeList); - void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList); - void instancesChildrenChanged(const QVector<ModelNode> &nodeList); - void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector); + virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE; + virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; + void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE; + void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE; + void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE; + void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; + void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; + void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE; + 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 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) { return m_modelMerger.insertModel(modelNode); } diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h index 5f1e1038c066b6bc20da44836370a6fc626147f7..a218c71e5801d9be194f243271f63945bb72327e 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h @@ -49,32 +49,38 @@ public: QString currentStateName() const; // AbstractView - void modelAttached(Model *model); - void modelAboutToBeDetached(Model *model); - void propertiesRemoved(const QList<AbstractProperty>& propertyList); - void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange); - - void nodeAboutToBeRemoved(const ModelNode &removedNode); - void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange); - void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange); - void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); + void modelAttached(Model *model) QTC_OVERRIDE; + void modelAboutToBeDetached(Model *model) QTC_OVERRIDE; + void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE; + void variantPropertiesChanged(const QList<VariantProperty>& propertyList, + PropertyChangeFlags propertyChange) QTC_OVERRIDE; + + void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE; + void nodeRemoved(const ModelNode &removedNode, + const NodeAbstractProperty &parentProperty, + 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 - void actualStateChanged(const ModelNode &node); - void transformChanged(const QmlObjectNode &qmlObjectNode, const QString &propertyName); - void parentChanged(const QmlObjectNode &qmlObjectNode); - void otherPropertyChanged(const QmlObjectNode &qmlObjectNode, const QString &propertyName); + void actualStateChanged(const ModelNode &node) QTC_OVERRIDE; - void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); - void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId); - void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange); - void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList); + void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE; + void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) QTC_OVERRIDE; + void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE; + 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: