feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix signature of auxiliaryDataChanged

Browse Source 
Change-Id: I4075e62cb15c91be3561ac29df814d0f0f255b8e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
(cherry picked from commit b2a39399e9)
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Marco Bubke
2013-03-06 18:24:34 +01:00
committed by Thomas Hartmann
parent d204ee0b43
commit 36f51f7902
13 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
View File

@@ -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))) {

2
src/plugins/qmldesigner/components/formeditor/formeditorview.h
View File

@@ -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);

2
src/plugins/qmldesigner/components/integration/componentview.cpp
View File

@@ -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*/) {}

2
src/plugins/qmldesigner/components/integration/componentview.h
View File

@@ -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);

2
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
View File

@@ -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 &)
{
}

2
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
View File

@@ -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);

2
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
View File

@@ -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))
{

2
src/plugins/qmldesigner/components/navigator/navigatorview.h
View File

@@ -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);

2
src/plugins/qmldesigner/designercore/include/abstractview.h
View File

@@ -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);

4
src/plugins/qmldesigner/designercore/include/forwardview.h
View File

@@ -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);

2
src/plugins/qmldesigner/designercore/model/abstractview.cpp
View File

@@ -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*/)
{
}

2
src/plugins/qmldesigner/designercore/model/viewlogger.cpp
View File

@@ -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;
}

2
src/plugins/qmldesigner/designercore/model/viewlogger.h
View File

@@ -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);