summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Bubke <marco.bubke@digia.com>2013-06-05 17:31:34 +0200
committerMarco Bubke <marco.bubke@digia.com>2013-06-06 16:34:56 +0200
commit4ac938061868a20bca3c970c83cde5b9da8dd267 (patch)
treeaa104ee9d91b661b9ea3477021ea766471ad6f89
parent9d967d4be04d05cf5a632ac748ee05315bbc8239 (diff)
downloadqt-creator-4ac938061868a20bca3c970c83cde5b9da8dd267.tar.gz
QmlDesigner: Remove unused code in anchors
Change-Id: I079eaebb933a8566b2391b7ea274ba6c3e4d36ce Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r--src/plugins/qmldesigner/designercore/include/qmlanchors.h2
-rw-r--r--src/plugins/qmldesigner/designercore/model/qmlanchors.cpp47
2 files changed, 0 insertions, 49 deletions
diff --git a/src/plugins/qmldesigner/designercore/include/qmlanchors.h b/src/plugins/qmldesigner/designercore/include/qmlanchors.h
index 0508ca9967..51be41c875 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlanchors.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlanchors.h
@@ -115,8 +115,6 @@ public:
QmlItemNode qmlItemNode() const;
-protected:
- void beautify();
private:
QmlItemNode m_qmlItemNode;
diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
index 39c5072d80..73c392b85c 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
@@ -124,52 +124,6 @@ bool QmlAnchors::isValid() const
return m_qmlItemNode.isValid();
}
-void QmlAnchors::beautify()
-{
- return;
- if ((instanceHasAnchor(AnchorLine::Left) &&
- instanceHasAnchor(AnchorLine::Right) &&
- instanceHasAnchor(AnchorLine::Top) &&
- instanceHasAnchor(AnchorLine::Bottom)) &&
-
- (instanceAnchor(AnchorLine::Left).type() == AnchorLine::Left &&
- instanceAnchor(AnchorLine::Right).type() == AnchorLine::Right &&
- instanceAnchor(AnchorLine::Top).type() == AnchorLine::Top &&
- instanceAnchor(AnchorLine::Bottom).type() == AnchorLine::Bottom) &&
-
- (instanceAnchor(AnchorLine::Left).qmlItemNode() ==
- instanceAnchor(AnchorLine::Right).qmlItemNode() &&
- instanceAnchor(AnchorLine::Top).qmlItemNode() ==
- instanceAnchor(AnchorLine::Bottom).qmlItemNode()) &&
- (instanceAnchor(AnchorLine::Left).qmlItemNode() ==
- instanceAnchor(AnchorLine::Bottom).qmlItemNode())) {
-
- if (instanceHasAnchor(AnchorLine::Fill))
- return; //avoid recursion
-
- QmlItemNode targetNode(instanceAnchor(AnchorLine::Left).qmlItemNode());
- removeAnchors();
- setAnchor(AnchorLine::Fill, targetNode, AnchorLine::Fill);
- }
-
- if ((instanceHasAnchor(AnchorLine::VerticalCenter) &&
- instanceHasAnchor(AnchorLine::HorizontalCenter)) &&
-
- (instanceAnchor(AnchorLine::VerticalCenter).type() == AnchorLine::VerticalCenter &&
- instanceAnchor(AnchorLine::HorizontalCenter).type() == AnchorLine::HorizontalCenter) &&
-
- (instanceAnchor(AnchorLine::VerticalCenter).qmlItemNode() ==
- instanceAnchor(AnchorLine::HorizontalCenter).qmlItemNode())) {
-
- if (instanceHasAnchor(AnchorLine::Center))
- return; //avoid recursion
-
- QmlItemNode targetNode(instanceAnchor(AnchorLine::VerticalCenter).qmlItemNode());
- removeAnchors();
- setAnchor(AnchorLine::Center, targetNode, AnchorLine::Center);
- }
-}
-
void QmlAnchors::setAnchor(AnchorLine::Type sourceAnchorLine,
const QmlItemNode &targetQmlItemNode,
AnchorLine::Type targetAnchorLine)
@@ -189,7 +143,6 @@ void QmlAnchors::setAnchor(AnchorLine::Type sourceAnchorLine,
targetExpression = targetExpression + QLatin1Char('.') + lineTypeToString(targetAnchorLine);
qmlItemNode().modelNode().bindingProperty(propertyName).setExpression(targetExpression);
}
- beautify();
}
bool detectHorizontalCycle(const ModelNode &node, QList<ModelNode> knownNodeList)