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

QmlDesigner: Rename hasInstanceForNode to hasInstanceForModelNode

Browse Source 
Change-Id: Ia66160505a7b899f9e1b436df5584ce5b42bea9f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-31 14:19:47 +02:00
parent 282de65774
commit 1c3e9e01d1
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ public:
QList<NodeInstance> instances() const; QList<NodeInstance> instances() const;
NodeInstance instanceForModelNode(const ModelNode &node) const ; NodeInstance instanceForModelNode(const ModelNode &node) const ;
bool hasInstanceForNode(const ModelNode &node) const; bool hasInstanceForModelNode(const ModelNode &node) const;
NodeInstance instanceForId(qint32 id); NodeInstance instanceForId(qint32 id);
bool hasInstanceForId(qint32 id); bool hasInstanceForId(qint32 id);

36
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -335,11 +335,11 @@ void NodeInstanceView::propertiesRemoved(const QList<AbstractProperty>& /*proper
void NodeInstanceView::removeInstanceAndSubInstances(const ModelNode &node) void NodeInstanceView::removeInstanceAndSubInstances(const ModelNode &node)
{ {
foreach (const ModelNode &subNode, node.allSubModelNodes()) { foreach (const ModelNode &subNode, node.allSubModelNodes()) {
if (hasInstanceForNode(subNode)) if (hasInstanceForModelNode(subNode))
removeInstanceNodeRelationship(subNode); removeInstanceNodeRelationship(subNode);
} }
if (hasInstanceForNode(node)) if (hasInstanceForModelNode(node))
removeInstanceNodeRelationship(node); removeInstanceNodeRelationship(node);
} }
@@ -403,7 +403,7 @@ void NodeInstanceView::fileUrlChanged(const QUrl &/*oldUrl*/, const QUrl &newUrl
void NodeInstanceView::nodeIdChanged(const ModelNode& node, const QString& /*newId*/, const QString& /*oldId*/) void NodeInstanceView::nodeIdChanged(const ModelNode& node, const QString& /*newId*/, const QString& /*oldId*/)
{ {
if (hasInstanceForNode(node)) { if (hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
nodeInstanceServer()->changeIds(createChangeIdsCommand(QList<NodeInstance>() << instance)); nodeInstanceServer()->changeIds(createChangeIdsCommand(QList<NodeInstance>() << instance));
} }
@@ -416,12 +416,12 @@ void NodeInstanceView::nodeOrderChanged(const NodeListProperty & listProperty,
PropertyName propertyName = listProperty.name(); PropertyName propertyName = listProperty.name();
qint32 containerInstanceId = -1; qint32 containerInstanceId = -1;
ModelNode containerNode = listProperty.parentModelNode(); ModelNode containerNode = listProperty.parentModelNode();
if (hasInstanceForNode(containerNode)) if (hasInstanceForModelNode(containerNode))
containerInstanceId = instanceForModelNode(containerNode).instanceId(); containerInstanceId = instanceForModelNode(containerNode).instanceId();
foreach (const ModelNode &node, listProperty.toModelNodeList()) { foreach (const ModelNode &node, listProperty.toModelNodeList()) {
qint32 instanceId = -1; qint32 instanceId = -1;
if (hasInstanceForNode(node)) { if (hasInstanceForModelNode(node)) {
instanceId = instanceForModelNode(node).instanceId(); instanceId = instanceForModelNode(node).instanceId();
ReparentContainer container(instanceId, containerInstanceId, propertyName, containerInstanceId, propertyName); ReparentContainer container(instanceId, containerInstanceId, propertyName, containerInstanceId, propertyName);
containerList.append(container); containerList.append(container);
@@ -492,7 +492,7 @@ void NodeInstanceView::instancesToken(const QString &/*tokenName*/, int /*tokenN
void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data)
{ {
if ((node.isRootNode() && (name == "width" || name == "height")) || name.endsWith(PropertyName("@NodeInstance"))) { if ((node.isRootNode() && (name == "width" || name == "height")) || name.endsWith(PropertyName("@NodeInstance"))) {
if (hasInstanceForNode(node)) { if (hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
QVariant value = data; QVariant value = data;
if (value.isValid()) { if (value.isValid()) {
@@ -522,7 +522,7 @@ void NodeInstanceView::customNotification(const AbstractView *view, const QStrin
void NodeInstanceView::nodeSourceChanged(const ModelNode &node, const QString & newNodeSource) void NodeInstanceView::nodeSourceChanged(const ModelNode &node, const QString & newNodeSource)
{ {
if (hasInstanceForNode(node)) { if (hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
ChangeNodeSourceCommand changeNodeSourceCommand(instance.instanceId(), newNodeSource); ChangeNodeSourceCommand changeNodeSourceCommand(instance.instanceId(), newNodeSource);
nodeInstanceServer()->changeNodeSource(changeNodeSourceCommand); nodeInstanceServer()->changeNodeSource(changeNodeSourceCommand);
@@ -584,7 +584,7 @@ NodeInstance NodeInstanceView::instanceForModelNode(const ModelNode &node) const
return m_nodeInstanceHash.value(node); return m_nodeInstanceHash.value(node);
} }
bool NodeInstanceView::hasInstanceForNode(const ModelNode &node) const bool NodeInstanceView::hasInstanceForModelNode(const ModelNode &node) const
{ {
return m_nodeInstanceHash.contains(node); return m_nodeInstanceHash.contains(node);
} }
@@ -758,7 +758,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
foreach (const ModelNode &node, nodeList) { foreach (const ModelNode &node, nodeList) {
variantPropertyList.append(node.variantProperties()); variantPropertyList.append(node.variantProperties());
bindingPropertyList.append(node.bindingProperties()); bindingPropertyList.append(node.bindingProperties());
if (node.isValid() && hasInstanceForNode(node)) { if (node.isValid() && hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
QHashIterator<PropertyName, QVariant> auxiliaryIterator(node.auxiliaryData()); QHashIterator<PropertyName, QVariant> auxiliaryIterator(node.auxiliaryData());
while (auxiliaryIterator.hasNext()) { while (auxiliaryIterator.hasNext()) {
@@ -812,7 +812,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
QVector<PropertyValueContainer> valueContainerList; QVector<PropertyValueContainer> valueContainerList;
foreach (const VariantProperty &property, variantPropertyList) { foreach (const VariantProperty &property, variantPropertyList) {
ModelNode node = property.parentModelNode(); ModelNode node = property.parentModelNode();
if (node.isValid() && hasInstanceForNode(node)) { if (node.isValid() && hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
PropertyValueContainer container(instance.instanceId(), property.name(), property.value(), property.dynamicTypeName()); PropertyValueContainer container(instance.instanceId(), property.name(), property.value(), property.dynamicTypeName());
valueContainerList.append(container); valueContainerList.append(container);
@@ -822,7 +822,7 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand()
QVector<PropertyBindingContainer> bindingContainerList; QVector<PropertyBindingContainer> bindingContainerList;
foreach (const BindingProperty &property, bindingPropertyList) { foreach (const BindingProperty &property, bindingPropertyList) {
ModelNode node = property.parentModelNode(); ModelNode node = property.parentModelNode();
if (node.isValid() && hasInstanceForNode(node)) { if (node.isValid() && hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
PropertyBindingContainer container(instance.instanceId(), property.name(), property.expression(), property.dynamicTypeName()); PropertyBindingContainer container(instance.instanceId(), property.name(), property.expression(), property.dynamicTypeName());
bindingContainerList.append(container); bindingContainerList.append(container);
@@ -909,11 +909,11 @@ ReparentInstancesCommand NodeInstanceView::createReparentInstancesCommand(const
qint32 newParentInstanceId = -1; qint32 newParentInstanceId = -1;
qint32 oldParentInstanceId = -1; qint32 oldParentInstanceId = -1;
if (newPropertyParent.isValid() && hasInstanceForNode(newPropertyParent.parentModelNode())) if (newPropertyParent.isValid() && hasInstanceForModelNode(newPropertyParent.parentModelNode()))
newParentInstanceId = instanceForModelNode(newPropertyParent.parentModelNode()).instanceId(); newParentInstanceId = instanceForModelNode(newPropertyParent.parentModelNode()).instanceId();
if (oldPropertyParent.isValid() && hasInstanceForNode(oldPropertyParent.parentModelNode())) if (oldPropertyParent.isValid() && hasInstanceForModelNode(oldPropertyParent.parentModelNode()))
oldParentInstanceId = instanceForModelNode(oldPropertyParent.parentModelNode()).instanceId(); oldParentInstanceId = instanceForModelNode(oldPropertyParent.parentModelNode()).instanceId();
@@ -935,7 +935,7 @@ ChangeValuesCommand NodeInstanceView::createChangeValueCommand(const QList<Varia
foreach (const VariantProperty &property, propertyList) { foreach (const VariantProperty &property, propertyList) {
ModelNode node = property.parentModelNode(); ModelNode node = property.parentModelNode();
if (node.isValid() && hasInstanceForNode(node)) { if (node.isValid() && hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
PropertyValueContainer container(instance.instanceId(), property.name(), property.value(), property.dynamicTypeName()); PropertyValueContainer container(instance.instanceId(), property.name(), property.value(), property.dynamicTypeName());
containerList.append(container); containerList.append(container);
@@ -952,7 +952,7 @@ ChangeBindingsCommand NodeInstanceView::createChangeBindingCommand(const QList<B
foreach (const BindingProperty &property, propertyList) { foreach (const BindingProperty &property, propertyList) {
ModelNode node = property.parentModelNode(); ModelNode node = property.parentModelNode();
if (node.isValid() && hasInstanceForNode(node)) { if (node.isValid() && hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
PropertyBindingContainer container(instance.instanceId(), property.name(), property.expression(), property.dynamicTypeName()); PropertyBindingContainer container(instance.instanceId(), property.name(), property.expression(), property.dynamicTypeName());
containerList.append(container); containerList.append(container);
@@ -983,7 +983,7 @@ RemoveInstancesCommand NodeInstanceView::createRemoveInstancesCommand(const QLis
{ {
QVector<qint32> idList; QVector<qint32> idList;
foreach (const ModelNode &node, nodeList) { foreach (const ModelNode &node, nodeList) {
if (node.isValid() && hasInstanceForNode(node)) { if (node.isValid() && hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
if (instance.instanceId() >= 0) if (instance.instanceId() >= 0)
@@ -998,7 +998,7 @@ RemoveInstancesCommand NodeInstanceView::createRemoveInstancesCommand(const Mode
{ {
QVector<qint32> idList; QVector<qint32> idList;
if (node.isValid() && hasInstanceForNode(node)) if (node.isValid() && hasInstanceForModelNode(node))
idList.append(instanceForModelNode(node).instanceId()); idList.append(instanceForModelNode(node).instanceId());
return RemoveInstancesCommand(idList); return RemoveInstancesCommand(idList);
@@ -1010,7 +1010,7 @@ RemovePropertiesCommand NodeInstanceView::createRemovePropertiesCommand(const QL
foreach (const AbstractProperty &property, propertyList) { foreach (const AbstractProperty &property, propertyList) {
ModelNode node = property.parentModelNode(); ModelNode node = property.parentModelNode();
if (node.isValid() && hasInstanceForNode(node)) { if (node.isValid() && hasInstanceForModelNode(node)) {
NodeInstance instance = instanceForModelNode(node); NodeInstance instance = instanceForModelNode(node);
PropertyAbstractContainer container(instance.instanceId(), property.name(), property.dynamicTypeName()); PropertyAbstractContainer container(instance.instanceId(), property.name(), property.dynamicTypeName());
containerList.append(container); containerList.append(container);

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

@@ -80,7 +80,7 @@ bool QmlModelNodeFacade::isValidQmlModelNodeFacade(const ModelNode &modelNode)
{ {
return modelNode.isValid() return modelNode.isValid()
&& nodeInstanceView() && nodeInstanceView()
&& nodeInstanceView()->hasInstanceForNode(modelNode) && nodeInstanceView()->hasInstanceForModelNode(modelNode)
&& nodeInstanceView()->instanceForModelNode(modelNode).isValid(); && nodeInstanceView()->instanceForModelNode(modelNode).isValid();
} }

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

@@ -409,7 +409,7 @@ bool QmlObjectNode::isAncestorOf(const QmlObjectNode &objectNode) const
QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const PropertyName &name) QVariant QmlObjectNode::instanceValue(const ModelNode &modelNode, const PropertyName &name)
{ {
Q_ASSERT(modelNode.view()->nodeInstanceView()->hasInstanceForNode(modelNode)); Q_ASSERT(modelNode.view()->nodeInstanceView()->hasInstanceForModelNode(modelNode));
return modelNode.view()->nodeInstanceView()->instanceForModelNode(modelNode).property(name); return modelNode.view()->nodeInstanceView()->instanceForModelNode(modelNode).property(name);
} }