Commit 3a4a7ff7 authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner: Rename canReparent to instanceCanReparent



Change-Id: I6b2eac40c68a01053133d623690e6ff4c2d02060
Reviewed-by: default avatarTim Jenssen <tim.jenssen@digia.com>
parent 8ce99eda
......@@ -115,7 +115,7 @@ bool MoveManipulator::itemsCanReparented() const
foreach (FormEditorItem* item, m_itemList) {
if (item
&& item->qmlItemNode().isValid()
&& !item->qmlItemNode().canReparent())
&& !item->qmlItemNode().instanceCanReparent())
return false;
}
......
......@@ -68,7 +68,7 @@ public:
bool instanceHasAnchors() const;
bool instanceHasShowContent() const;
bool canReparent() const;
bool instanceCanReparent() const;
bool instanceIsAnchoredBySibling() const;
bool instanceIsAnchoredByChildren() const;
bool instanceIsMovable() const;
......
......@@ -83,7 +83,7 @@ public:
bool isInBaseState() const;
QmlPropertyChanges propertyChangeForCurrentState() const;
virtual bool canReparent() const;
virtual bool instanceCanReparent() const;
bool isRootModelNode() const;
......
......@@ -179,9 +179,9 @@ bool QmlItemNode::instanceHasShowContent() const
return nodeInstance().hasContent();
}
bool QmlItemNode::canReparent() const
bool QmlItemNode::instanceCanReparent() const
{
return QmlObjectNode::canReparent() && !anchors().instanceHasAnchors() && !instanceIsAnchoredBySibling();
return QmlObjectNode::instanceCanReparent() && !anchors().instanceHasAnchors() && !instanceIsAnchoredBySibling();
}
bool QmlItemNode::instanceIsAnchoredBySibling() const
......
......@@ -232,7 +232,7 @@ bool QmlObjectNode::isInBaseState() const
return currentState().isBaseState();
}
bool QmlObjectNode::canReparent() const
bool QmlObjectNode::instanceCanReparent() const
{
return isInBaseState();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment