From 5d87d4c49bb2ffd06f088658a024c378995818bd Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 28 Jun 2011 13:21:16 +0200 Subject: [PATCH] QmlDesigner.model: renaming in NodeSourceType Change-Id: I958b99967da8ed81542de08b64334c88d688f755 Reviewed-on: http://codereview.qt.nokia.com/828 Reviewed-by: Qt Sanity Bot Reviewed-by: Marco Bubke --- .../qmldesigner/components/integration/componentview.cpp | 4 ++-- .../qmldesigner/designercore/include/abstractview.h | 2 +- src/plugins/qmldesigner/designercore/include/modelnode.h | 6 +++--- src/plugins/qmldesigner/designercore/model/model.cpp | 2 +- .../designercore/model/modelnodecontextmenu.cpp | 8 ++++---- .../qmldesigner/designercore/model/texttomodelmerger.cpp | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp index 887773319eb..f54cbf34423 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.cpp +++ b/src/plugins/qmldesigner/components/integration/componentview.cpp @@ -146,7 +146,7 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node) foreach (const ModelNode &node, nodeList) { - if (node.nodeSourceType() == ModelNode::ComponentSource) { + if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) { if (!node.id().isEmpty()) { QStandardItem *item = new QStandardItem(node.id()); item->setData(QVariant::fromValue(node), ModelNodeRole); @@ -186,7 +186,7 @@ void ComponentView::searchForComponentAndRemoveFromList(const ModelNode &node) foreach (const ModelNode &childNode, nodeList) { - if (childNode.nodeSourceType() == ModelNode::ComponentSource) { + if (childNode.nodeSourceType() == ModelNode::NodeWithComponentSource) { removeSingleNodeFromList(childNode); } } diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 64480eb2d95..ca48ad3773a 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -88,7 +88,7 @@ public: const PropertyListType &propertyList = PropertyListType(), const PropertyListType &auxPropertyList = PropertyListType(), const QString &nodeSource = QString(), - ModelNode::NodeSourceType nodeSourceType = ModelNode::NoSource); + ModelNode::NodeSourceType nodeSourceType = ModelNode::NodeWithoutSource); const ModelNode rootModelNode() const; ModelNode rootModelNode(); diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index 810349aac7e..8186534ad7e 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -87,9 +87,9 @@ class CORESHARED_EXPORT ModelNode public: enum NodeSourceType { - NoSource = 0, - CustomParserSource = 1, - ComponentSource = 2 + NodeWithoutSource = 0, + NodeWithCustomParserSource = 1, + NodeWithComponentSource = 2 }; ModelNode(); diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp index 03616fa06ad..0f75621b69a 100644 --- a/src/plugins/qmldesigner/designercore/model/model.cpp +++ b/src/plugins/qmldesigner/designercore/model/model.cpp @@ -94,7 +94,7 @@ ModelPrivate::ModelPrivate(Model *model) : m_writeLock(false), m_internalIdCounter(1) { - m_rootInternalNode = createNode("QtQuick/Item", 1, 0, PropertyListType(), PropertyListType(), QString(), ModelNode::NoSource,true); + m_rootInternalNode = createNode("QtQuick/Item", 1, 0, PropertyListType(), PropertyListType(), QString(), ModelNode::NodeWithoutSource,true); } ModelPrivate::~ModelPrivate() diff --git a/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp b/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp index 6704b80ef6f..8d93e63bdd0 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp @@ -82,13 +82,13 @@ static inline bool modelNodeIsComponent(const ModelNode &node) if (node.metaInfo().isComponent()) return true; - if (node.nodeSourceType() == ModelNode::ComponentSource) + if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) return true; if (checkIfNodeIsAView(node) && node.hasNodeProperty("delegate")) { if (node.nodeProperty("delegate").modelNode().metaInfo().isComponent()) return true; - if (node.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::ComponentSource) + if (node.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource) return true; } @@ -131,11 +131,11 @@ static inline void openInlineComponent(const ModelNode &node) if (!DesignDocumentController::instance()) return; - if (node.nodeSourceType() == ModelNode::ComponentSource) + if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) DesignDocumentController::instance()->changeCurrentModelTo(node); if (checkIfNodeIsAView(node) && node.hasNodeProperty("delegate")) { - if (node.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::ComponentSource) + if (node.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource) DesignDocumentController::instance()->changeCurrentModelTo(node.nodeProperty("delegate").modelNode()); } } diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 2e176a9dc8b..4cd0130caed 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -1187,12 +1187,12 @@ ModelNode TextToModelMerger::createModelNode(const QString &typeName, nodeSource = componentSource; } - ModelNode::NodeSourceType nodeSourceType = ModelNode::NoSource; + ModelNode::NodeSourceType nodeSourceType = ModelNode::NodeWithoutSource; if (isComponentType(typeName) || isImplicitComponent) - nodeSourceType = ModelNode::ComponentSource; + nodeSourceType = ModelNode::NodeWithComponentSource; else if (isCustomParserType(typeName)) - nodeSourceType = ModelNode::CustomParserSource; + nodeSourceType = ModelNode::NodeWithCustomParserSource; ModelNode newNode = m_rewriterView->createModelNode(typeName, majorVersion,