feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix indentation

Browse Source 
Change-Id: I839ab790a6ccb3cc4a1cb46f98c0f2cd9936e599
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-03-08 17:14:55 +01:00
parent fb213b5826
commit dc375f9d00
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
View File

@@ -38,12 +38,12 @@
//using namespace QmlDesigner; //using namespace QmlDesigner;
PropertyEditorValue::PropertyEditorValue(QObject *parent) PropertyEditorValue::PropertyEditorValue(QObject *parent)
: QObject(parent), : QObject(parent),
m_isInSubState(false), m_isInSubState(false),
m_isInModel(false), m_isInModel(false),
m_isBound(false), m_isBound(false),
m_isValid(false), m_isValid(false),
m_complexNode(new PropertyEditorNodeWrapper(this)) m_complexNode(new PropertyEditorNodeWrapper(this))
{ {
} }
@@ -52,7 +52,7 @@ QVariant PropertyEditorValue::value() const
QVariant returnValue = m_value; QVariant returnValue = m_value;
if (modelNode().isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name())) if (modelNode().isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name()))
if (modelNode().metaInfo().propertyTypeName(name()) == "QUrl") if (modelNode().metaInfo().propertyTypeName(name()) == "QUrl")
returnValue = returnValue.toUrl().toString(); returnValue = returnValue.toUrl().toString();
return returnValue; return returnValue;
} }
@@ -133,7 +133,7 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
QVariant newValue = value; QVariant newValue = value;
if (modelNode().isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name())) if (modelNode().isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().hasProperty(name()))
if (modelNode().metaInfo().propertyTypeName(name()) == "QUrl") if (modelNode().metaInfo().propertyTypeName(name()) == "QUrl")
newValue = QUrl(newValue.toString()); newValue = QUrl(newValue.toString());
if (cleverDoubleCompare(newValue, m_value)) if (cleverDoubleCompare(newValue, m_value))
return; return;