Commit 8ce99eda authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner: Rename hasShowContent to instanceHasShowContent



Change-Id: I32871e3a661319deefe910edf2e3cd51fbf8aefa
Reviewed-by: default avatarTim Jenssen <tim.jenssen@digia.com>
parent 8b202874
......@@ -104,7 +104,7 @@ bool AbstractFormEditorTool::topSelectedItemIsMovable(const QList<QGraphicsItem*
&& selectedNodes.contains(formEditorItem->qmlItemNode())
&& formEditorItem->qmlItemNode().instanceIsMovable()
&& !formEditorItem->qmlItemNode().instanceIsInLayoutable()
&& (formEditorItem->qmlItemNode().hasShowContent()))
&& (formEditorItem->qmlItemNode().instanceHasShowContent()))
return true;
}
......@@ -142,7 +142,7 @@ FormEditorItem *AbstractFormEditorTool::topMovableFormEditorItem(const QList<QGr
foreach (QGraphicsItem *item, itemList) {
FormEditorItem *formEditorItem = FormEditorItem::fromQGraphicsItem(item);
if (formEditorItem
&& (formEditorItem->qmlItemNode().hasShowContent()))
&& (formEditorItem->qmlItemNode().instanceHasShowContent()))
return formEditorItem;
}
......
......@@ -151,7 +151,7 @@ void SelectionTool::hoverMoveEvent(const QList<QGraphicsItem*> &itemList,
&& formEditorItem->qmlItemNode().isValid()
&& !formEditorItem->qmlItemNode().instanceIsInLayoutable()
&& formEditorItem->qmlItemNode().instanceIsMovable()
&& (formEditorItem->qmlItemNode().hasShowContent() || !m_selectOnlyContentItems))
&& (formEditorItem->qmlItemNode().instanceHasShowContent() || !m_selectOnlyContentItems))
{
topSelectableItem = formEditorItem;
break;
......
......@@ -79,7 +79,7 @@ void SingleSelectionManipulator::select(SelectionType selectionType, bool select
if (formEditorItem
&& formEditorItem->qmlItemNode().isValid()
&& (formEditorItem->qmlItemNode().hasShowContent() || !selectOnlyContentItems))
&& (formEditorItem->qmlItemNode().instanceHasShowContent() || !selectOnlyContentItems))
{
selectedNode = formEditorItem->qmlItemNode();
break;
......
......@@ -66,7 +66,7 @@ public:
bool hasChildren() const;
bool hasResources() const;
bool instanceHasAnchors() const;
bool hasShowContent() const;
bool instanceHasShowContent() const;
bool canReparent() const;
bool instanceIsAnchoredBySibling() const;
......
......@@ -174,7 +174,7 @@ bool QmlItemNode::instanceHasAnchors() const
return anchors().instanceHasAnchors();
}
bool QmlItemNode::hasShowContent() const
bool QmlItemNode::instanceHasShowContent() const
{
return nodeInstance().hasContent();
}
......
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