From 596e1940458557d0b1a94ed90915d83047189162 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 4 Mar 2011 15:23:51 +0100 Subject: [PATCH] Compilefix --- .../propertyeditor/qmlanchorbindingproxy.cpp | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp index 85b8e6cfdce..87e71d22094 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp @@ -275,10 +275,10 @@ void QmlAnchorBindingProxy::resetLayout() { m_fxItemNode.anchors().removeAnchors(); m_fxItemNode.anchors().removeMargins(); - if (qFuzzyCompare(m_fxItemNode.instancePosition().x(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "x")) - m_fxItemNode.setVariantProperty("x", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "x")); - if (qFuzzyCompare(m_fxItemNode.instancePosition().y(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "y")) - m_fxItemNode.setVariantProperty("y", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "y")); + if (qFuzzyCompare(m_fxItemNode.instancePosition().x(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + 'x')) + m_fxItemNode.setVariantProperty("x", m_fxItemNode.modelNode().auxiliaryData(auxDataString + 'x')); + if (qFuzzyCompare(m_fxItemNode.instancePosition().y(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + 'y')) + m_fxItemNode.setVariantProperty("y", m_fxItemNode.modelNode().auxiliaryData(auxDataString + 'y')); if (qFuzzyCompare(m_fxItemNode.instanceSize().width(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "width")) m_fxItemNode.setVariantProperty("width", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "width")); if (qFuzzyCompare(m_fxItemNode.instanceSize().height(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "height")) @@ -330,13 +330,14 @@ void QmlAnchorBindingProxy::setLeftAnchor(bool anchor) removeLeftAnchor(); } else { calcLeftMargin(); - m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "x", m_fxItemNode.instancePosition().x()); - m_fxItemNode.removeVariantProperty("x"); + m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + QChar('x'), m_fxItemNode.instancePosition().x()); + m_fxItemNode.removeVariantProperty(QChar('x')); if (rightAnchored()) { m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "width", m_fxItemNode.instanceSize().width()); m_fxItemNode.removeVariantProperty("width"); } } + emit leftAnchorChanged(); if (hasAnchors() != anchor) emit anchorsChanged(); @@ -468,8 +469,8 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor) removeTopAnchor(); } else { calcTopMargin(); - m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "y", m_fxItemNode.instancePosition().y()); - m_fxItemNode.removeVariantProperty("y"); + m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + QChar('y'), m_fxItemNode.instancePosition().y()); + m_fxItemNode.removeVariantProperty(QChar('y')); if (bottomAnchored()) { m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "height", m_fxItemNode.instanceSize().height()); m_fxItemNode.removeVariantProperty("height"); @@ -486,8 +487,8 @@ void QmlAnchorBindingProxy::removeTopAnchor() { m_fxItemNode.anchors().removeAnchor(AnchorLine::Top); m_fxItemNode.anchors().removeMargin(AnchorLine::Top); - if (qFuzzyCompare(m_fxItemNode.instancePosition().y(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + 'y')) - m_fxItemNode.setVariantProperty('y', m_fxItemNode.modelNode().auxiliaryData(auxDataString + 'y')); + if (qFuzzyCompare(m_fxItemNode.instancePosition().y(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + QChar('y'))) + m_fxItemNode.setVariantProperty(QChar('y'), m_fxItemNode.modelNode().auxiliaryData(auxDataString + QChar('y'))); if (qFuzzyCompare(m_fxItemNode.instanceSize().height(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "height")) m_fxItemNode.setVariantProperty("height", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "height")); @@ -509,10 +510,11 @@ void QmlAnchorBindingProxy::removeLeftAnchor() { m_fxItemNode.anchors().removeAnchor(AnchorLine::Left); m_fxItemNode.anchors().removeMargin(AnchorLine::Left); - if (qFuzzyCompare(m_fxItemNode.instancePosition().x(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + 'x')) - m_fxItemNode.setVariantProperty('x', m_fxItemNode.modelNode().auxiliaryData(auxDataString + 'x')); + if (qFuzzyCompare(m_fxItemNode.instancePosition().x(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + QChar('x'))) + m_fxItemNode.setVariantProperty(QChar('x'), m_fxItemNode.modelNode().auxiliaryData(auxDataString + QChar('x'))); if (qFuzzyCompare(m_fxItemNode.instanceSize().width(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "width")) m_fxItemNode.setVariantProperty("width", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "width")); + } void QmlAnchorBindingProxy::removeRightAnchor() { @@ -588,10 +590,10 @@ void QmlAnchorBindingProxy::fill() RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction(); - m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + 'x', m_fxItemNode.instancePosition().x()); - m_fxItemNode.removeVariantProperty('x'); - m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + 'y', m_fxItemNode.instancePosition().y()); - m_fxItemNode.removeVariantProperty('y'); + m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + QChar('x'), m_fxItemNode.instancePosition().x()); + m_fxItemNode.removeVariantProperty(QChar('x')); + m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + QChar('y'), m_fxItemNode.instancePosition().y()); + m_fxItemNode.removeVariantProperty(QChar('y')); m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "width", m_fxItemNode.instanceSize().width()); m_fxItemNode.removeVariantProperty("width"); m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "height", m_fxItemNode.instanceSize().height());