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

QmlDesigner.model: renaming in NodeSourceType

Browse Source 
Change-Id: I958b99967da8ed81542de08b64334c88d688f755
Reviewed-on: http://codereview.qt.nokia.com/828
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
This commit is contained in:
Thomas Hartmann
2011-06-28 13:21:16 +02:00
committed by Marco Bubke
parent 9beba55712
commit 5d87d4c49b
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
foreach (const ModelNode &node, nodeList) { foreach (const ModelNode &node, nodeList) {
if (node.nodeSourceType() == ModelNode::ComponentSource) { if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) {
if (!node.id().isEmpty()) { if (!node.id().isEmpty()) {
QStandardItem *item = new QStandardItem(node.id()); QStandardItem *item = new QStandardItem(node.id());
item->setData(QVariant::fromValue(node), ModelNodeRole); item->setData(QVariant::fromValue(node), ModelNodeRole);
@@ -186,7 +186,7 @@ void ComponentView::searchForComponentAndRemoveFromList(const ModelNode &node)
foreach (const ModelNode &childNode, nodeList) { foreach (const ModelNode &childNode, nodeList) {
if (childNode.nodeSourceType() == ModelNode::ComponentSource) { if (childNode.nodeSourceType() == ModelNode::NodeWithComponentSource) {
removeSingleNodeFromList(childNode); removeSingleNodeFromList(childNode);
} }
} }

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

@@ -88,7 +88,7 @@ public:
const PropertyListType &propertyList = PropertyListType(), const PropertyListType &propertyList = PropertyListType(),
const PropertyListType &auxPropertyList = PropertyListType(), const PropertyListType &auxPropertyList = PropertyListType(),
const QString &nodeSource = QString(), const QString &nodeSource = QString(),
ModelNode::NodeSourceType nodeSourceType = ModelNode::NoSource); ModelNode::NodeSourceType nodeSourceType = ModelNode::NodeWithoutSource);
const ModelNode rootModelNode() const; const ModelNode rootModelNode() const;
ModelNode rootModelNode(); ModelNode rootModelNode();

6
src/plugins/qmldesigner/designercore/include/modelnode.h
View File

@@ -87,9 +87,9 @@ class CORESHARED_EXPORT ModelNode
public: public:
enum NodeSourceType { enum NodeSourceType {
NoSource = 0, NodeWithoutSource = 0,
CustomParserSource = 1, NodeWithCustomParserSource = 1,
ComponentSource = 2 NodeWithComponentSource = 2
}; };
ModelNode(); ModelNode();

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

@@ -94,7 +94,7 @@ ModelPrivate::ModelPrivate(Model *model) :
m_writeLock(false), m_writeLock(false),
m_internalIdCounter(1) 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() ModelPrivate::~ModelPrivate()

8
src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
View File

@@ -82,13 +82,13 @@ static inline bool modelNodeIsComponent(const ModelNode &node)
if (node.metaInfo().isComponent()) if (node.metaInfo().isComponent())
return true; return true;
if (node.nodeSourceType() == ModelNode::ComponentSource) if (node.nodeSourceType() == ModelNode::NodeWithComponentSource)
return true; return true;
if (checkIfNodeIsAView(node) && if (checkIfNodeIsAView(node) &&
node.hasNodeProperty("delegate")) { node.hasNodeProperty("delegate")) {
if (node.nodeProperty("delegate").modelNode().metaInfo().isComponent()) if (node.nodeProperty("delegate").modelNode().metaInfo().isComponent())
return true; return true;
if (node.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::ComponentSource) if (node.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource)
return true; return true;
} }
@@ -131,11 +131,11 @@ static inline void openInlineComponent(const ModelNode &node)
if (!DesignDocumentController::instance()) if (!DesignDocumentController::instance())
return; return;
if (node.nodeSourceType() == ModelNode::ComponentSource) if (node.nodeSourceType() == ModelNode::NodeWithComponentSource)
DesignDocumentController::instance()->changeCurrentModelTo(node); DesignDocumentController::instance()->changeCurrentModelTo(node);
if (checkIfNodeIsAView(node) && if (checkIfNodeIsAView(node) &&
node.hasNodeProperty("delegate")) { 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()); DesignDocumentController::instance()->changeCurrentModelTo(node.nodeProperty("delegate").modelNode());
} }
} }

6
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -1187,12 +1187,12 @@ ModelNode TextToModelMerger::createModelNode(const QString &typeName,
nodeSource = componentSource; nodeSource = componentSource;
} }
ModelNode::NodeSourceType nodeSourceType = ModelNode::NoSource; ModelNode::NodeSourceType nodeSourceType = ModelNode::NodeWithoutSource;
if (isComponentType(typeName) || isImplicitComponent) if (isComponentType(typeName) || isImplicitComponent)
nodeSourceType = ModelNode::ComponentSource; nodeSourceType = ModelNode::NodeWithComponentSource;
else if (isCustomParserType(typeName)) else if (isCustomParserType(typeName))
nodeSourceType = ModelNode::CustomParserSource; nodeSourceType = ModelNode::NodeWithCustomParserSource;
ModelNode newNode = m_rewriterView->createModelNode(typeName, ModelNode newNode = m_rewriterView->createModelNode(typeName,
majorVersion, majorVersion,