From 282de65774e05dcb34cbe6c0ed9025eec6a45612 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Tue, 30 Jul 2013 17:00:04 +0200
Subject: [PATCH] QmlDesigner: Rename hasDefaultProperty to
 hasDefaultPropertyName

hasDefaultProperty sounded like the property existed in the model not
in the meta info system.

Change-Id: Iaa670f10b9d6d6038fbc3a4224250ed821407af4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../components/componentcore/modelnodeoperations.cpp          | 2 +-
 .../qmldesigner/components/formeditor/movemanipulator.cpp     | 2 +-
 src/plugins/qmldesigner/designercore/include/qmlobjectnode.h  | 2 +-
 src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp    | 2 +-
 src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp  | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
index 9164c590e0..565f22813f 100644
--- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp
@@ -113,7 +113,7 @@ static inline void reparentTo(const ModelNode &node, const QmlItemNode &parent)
     if (parent.isValid() && node.isValid()) {
         NodeAbstractProperty parentProperty;
 
-        if (parent.hasDefaultProperty())
+        if (parent.hasDefaultPropertyName())
             parentProperty = parent.nodeAbstractProperty(parent.defaultPropertyName());
         else
             parentProperty = parent.nodeAbstractProperty("data");
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
index 685d544b7f..ba777968d6 100644
--- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp
@@ -348,7 +348,7 @@ void MoveManipulator::reparentTo(FormEditorItem *newParent)
 
     QmlItemNode parentItemNode(newParent->qmlItemNode());
     if (parentItemNode.isValid()) {
-        if (parentItemNode.hasDefaultProperty())
+        if (parentItemNode.hasDefaultPropertyName())
             parentProperty = parentItemNode.nodeAbstractProperty(parentItemNode.defaultPropertyName());
         else
             parentProperty = parentItemNode.nodeAbstractProperty("data");
diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
index 1c92409a77..af472e3a7c 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h
@@ -101,7 +101,7 @@ public:
 
     bool isAncestorOf(const QmlObjectNode &objectNode) const;
 
-    bool hasDefaultProperty() const;
+    bool hasDefaultPropertyName() const;
     PropertyName defaultPropertyName() const;
 
     static  QVariant instanceValue(const ModelNode &modelNode, const PropertyName &name);
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index 9d7ebba150..73ef4079f3 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -147,7 +147,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
             newQmlItemNode = createQmlItemNodeFromSource(view, itemLibraryEntry.qml(), position);
         }
 
-        if (parentQmlItemNode.hasDefaultProperty())
+        if (parentQmlItemNode.hasDefaultPropertyName())
             parentQmlItemNode.nodeAbstractProperty(parentQmlItemNode.defaultPropertyName()).reparentHere(newQmlItemNode);
 
         if (!newQmlItemNode.isValid())
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index 3e2db542ac..9826bcae39 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -517,7 +517,7 @@ QString QmlObjectNode::validId()
     return modelNode().validId();
 }
 
-bool QmlObjectNode::hasDefaultProperty() const
+bool QmlObjectNode::hasDefaultPropertyName() const
 {
     return modelNode().metaInfo().hasDefaultProperty();
 }
@@ -529,7 +529,7 @@ PropertyName QmlObjectNode::defaultPropertyName() const
 
 void QmlObjectNode::setParent(QmlObjectNode newParent)
 {
-    if (newParent.hasDefaultProperty())
+    if (newParent.hasDefaultPropertyName())
         newParent.modelNode().nodeAbstractProperty(newParent.defaultPropertyName()).reparentHere(modelNode());
 }
 
-- 
GitLab