summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@theqtcompany.com>2016-04-11 13:19:52 +0200
committerTim Jenssen <tim.jenssen@theqtcompany.com>2016-04-15 11:38:49 +0000
commit84d7852c0678b76405856efb16808d3f73efc9a0 (patch)
tree39605f0587258a6298158c822fab93d8c98eaa28
parent4ba5dfccf57e6c4fc2df85481d37da811aabdae1 (diff)
downloadqt-creator-84d7852c0678b76405856efb16808d3f73efc9a0.tar.gz
QmlDesigner: improve code niceness
Change-Id: I05ba3c6741977270c9abf9137db447c74dce025f Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp2
-rw-r--r--src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
index 7da39cf637..ec0da2a136 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
@@ -293,10 +293,8 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q
m_backendAnchorBinding.setup(qmlObjectNode.modelNode());
context()->setContextProperty(QLatin1String("anchorBackend"), &m_backendAnchorBinding);
-
context()->setContextProperty(QLatin1String("transaction"), m_propertyEditorTransaction.data());
-
// model node
m_backendModelNode.setup(qmlObjectNode.modelNode());
context()->setContextProperty(QLatin1String("modelNodeBackend"), &m_backendModelNode);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
index 5e90162cfd..7d2f60162b 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp
@@ -148,9 +148,8 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value)
void PropertyEditorValue::setValue(const QVariant &value)
{
if (!compareVariants(m_value, value) &&
- !cleverDoubleCompare(value, m_value) &&
- !cleverColorCompare(value, m_value))
-
+ !cleverDoubleCompare(value, m_value) &&
+ !cleverColorCompare(value, m_value))
m_value = value;
fixAmbigousColorNames(modelNode(), name(), &m_value);