diff options
author | Marco Bubke <marco.bubke@digia.com> | 2013-03-06 18:24:34 +0100 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-03-25 13:35:21 +0100 |
commit | 36f51f790274f11c4547f3309d94e2855f584710 (patch) | |
tree | 3c12d9ae93822c1ef6d3624095c854936114c41a | |
parent | d204ee0b4325a639ea54ffcb8274877720606f31 (diff) |
QmlDesigner: Fix signature of auxiliaryDataChanged
Change-Id: I4075e62cb15c91be3561ac29df814d0f0f255b8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit b2a39399e9cc0c61c8d39aa9aa50342cf0db87d2)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
13 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 467340315c..db051d203a 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -421,7 +421,7 @@ void FormEditorView::nodeSlidedToIndex(const NodeListProperty &listProperty, int m_currentTool->formEditorItemsChanged(scene()->allFormEditorItems()); } -void FormEditorView::auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data) +void FormEditorView::auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) { QmlModelView::auxiliaryDataChanged(node, name, data); if (name == "invisible" && m_scene->hasItemForQmlItemNode(QmlItemNode(node))) { diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h index c4e2f97d67..09b7f6c789 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h @@ -99,7 +99,7 @@ public: void changeToTransformTools(); void nodeSlidedToIndex(const NodeListProperty &listProperty, int newIndex, int oldIndex); - void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); void instancesCompleted(const QVector<ModelNode> &completedNodeList); void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash); diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp index b0bd1f81f4..4766621141 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.cpp +++ b/src/plugins/qmldesigner/components/integration/componentview.cpp @@ -216,7 +216,7 @@ void ComponentView::fileUrlChanged(const QUrl &/*oldUrl*/, const QUrl &/*newUrl* void ComponentView::nodeOrderChanged(const NodeListProperty &/*listProperty*/, const ModelNode & /*movedNode*/, int /*oldIndex*/) {} -void ComponentView::auxiliaryDataChanged(const ModelNode &/*node*/, const QString &/*name*/, const QVariant &/*data*/) {} +void ComponentView::auxiliaryDataChanged(const ModelNode &/*node*/, const PropertyName &/*name*/, const QVariant &/*data*/) {} void ComponentView::customNotification(const AbstractView * /*view*/, const QString &/*identifier*/, const QList<ModelNode> &/*nodeList*/, const QList<QVariant> &/*data*/) {} void ComponentView::importsChanged(const QList<Import> &/*addedImports*/, const QList<Import> &/*removedImports*/) {} diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h index 09edd7a07d..5b2c3e5257 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.h +++ b/src/plugins/qmldesigner/components/integration/componentview.h @@ -95,7 +95,7 @@ public: void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); - void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp index f12dc79348..2f63c2d13e 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp @@ -135,7 +135,7 @@ void ItemLibraryView::selectedNodesChanged(const QList<ModelNode> &, } -void ItemLibraryView::auxiliaryDataChanged(const ModelNode &, const QString &, const QVariant &) +void ItemLibraryView::auxiliaryDataChanged(const ModelNode &, const PropertyName &, const QVariant &) { } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h index a432c129fc..f5ee3ceefd 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h @@ -73,7 +73,7 @@ public: void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList); - void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList); void instancesCompleted(const QVector<ModelNode> &completedNodeList); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index c91b154e3e..37020f84e6 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -200,7 +200,7 @@ void NavigatorView::rootNodeTypeChanged(const QString & /*type*/, int /*majorVer m_treeModel->updateItemRow(rootModelNode()); } -void NavigatorView::auxiliaryDataChanged(const ModelNode &node, const QString & /*name*/, const QVariant & /*data*/) +void NavigatorView::auxiliaryDataChanged(const ModelNode &node, const PropertyName & /*name*/, const QVariant & /*data*/) { if (m_treeModel->isInTree(node)) { diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index c0184a40cd..48a9f6ac00 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -81,7 +81,7 @@ public: void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList); - void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList); void instancesCompleted(const QVector<ModelNode> &completedNodeList); diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index fc82e8e36d..1e670186e7 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -162,7 +162,7 @@ public: virtual void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) = 0; - virtual void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data); + virtual void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); virtual void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data); diff --git a/src/plugins/qmldesigner/designercore/include/forwardview.h b/src/plugins/qmldesigner/designercore/include/forwardview.h index 84e39ee47c..82b4398aca 100644 --- a/src/plugins/qmldesigner/designercore/include/forwardview.h +++ b/src/plugins/qmldesigner/designercore/include/forwardview.h @@ -72,7 +72,7 @@ public: void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex); void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports); - void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); @@ -234,7 +234,7 @@ void ForwardView<ViewType>::importRemoved(const Import &import) } template <class ViewType> -void ForwardView<ViewType>::auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data) +void ForwardView<ViewType>::auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) { AbstractView::auxiliaryDataChanged(node, name, data); diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 35fcec9fb7..1e4993976c 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -240,7 +240,7 @@ void AbstractView::propertiesRemoved(const QList<AbstractProperty>& /*propertyLi */ //\} -void AbstractView::auxiliaryDataChanged(const ModelNode &/*node*/, const QString &/*name*/, const QVariant &/*data*/) +void AbstractView::auxiliaryDataChanged(const ModelNode &/*node*/, const PropertyName &/*name*/, const QVariant &/*data*/) { } diff --git a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp index 8f0bc670f6..05b7d85584 100644 --- a/src/plugins/qmldesigner/designercore/model/viewlogger.cpp +++ b/src/plugins/qmldesigner/designercore/model/viewlogger.cpp @@ -177,7 +177,7 @@ void ViewLogger::nodeOrderChanged(const NodeListProperty &listProperty, const Mo m_output << time() << indent("nodeOrderChanged:") << listProperty << movedNode << oldIndex << endl; } -void ViewLogger::auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data) +void ViewLogger::auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) { m_output << time() << indent("auxiliaryDataChanged:") << node << "\t" << name << "\t" << data.toString() << endl; } diff --git a/src/plugins/qmldesigner/designercore/model/viewlogger.h b/src/plugins/qmldesigner/designercore/model/viewlogger.h index 4cfbbc2708..8fc0dd7cb2 100644 --- a/src/plugins/qmldesigner/designercore/model/viewlogger.h +++ b/src/plugins/qmldesigner/designercore/model/viewlogger.h @@ -68,7 +68,7 @@ public: void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports); - void auxiliaryDataChanged(const ModelNode &node, const QString &name, const QVariant &data); + void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data); void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data); void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList); |