From b2a39399e9cc0c61c8d39aa9aa50342cf0db87d2 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Wed, 6 Mar 2013 18:24:34 +0100
Subject: [PATCH] QmlDesigner: Fix signature of auxiliaryDataChanged
Change-Id: I4075e62cb15c91be3561ac29df814d0f0f255b8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
.../qmldesigner/components/formeditor/formeditorview.cpp | 2 +-
.../qmldesigner/components/formeditor/formeditorview.h | 2 +-
.../qmldesigner/components/integration/componentview.cpp | 2 +-
.../qmldesigner/components/integration/componentview.h | 2 +-
.../qmldesigner/components/itemlibrary/itemlibraryview.cpp | 2 +-
.../qmldesigner/components/itemlibrary/itemlibraryview.h | 2 +-
.../qmldesigner/components/navigator/navigatorview.cpp | 2 +-
src/plugins/qmldesigner/components/navigator/navigatorview.h | 2 +-
src/plugins/qmldesigner/designercore/include/abstractview.h | 2 +-
src/plugins/qmldesigner/designercore/include/forwardview.h | 4 ++--
src/plugins/qmldesigner/designercore/model/abstractview.cpp | 2 +-
src/plugins/qmldesigner/designercore/model/viewlogger.cpp | 2 +-
src/plugins/qmldesigner/designercore/model/viewlogger.h | 2 +-
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 467340315c3..db051d203a4 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 c4e2f97d67b..09b7f6c7898 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 b0bd1f81f48..47666211412 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 09edd7a07d8..5b2c3e52577 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 f12dc793488..2f63c2d13e3 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 a432c129fc1..f5ee3ceefd0 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 c91b154e3ed..37020f84e60 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 c0184a40cdc..48a9f6ac004 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 fc82e8e36d3..1e670186e76 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 84e39ee47ce..82b4398aca0 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 35fcec9fb75..1e4993976c1 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 8f0bc670f69..05b7d855844 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 4cfbbc27085..8fc0dd7cb27 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);
--
GitLab