From d901572093de450d3d1f3f28f2e7ee9e09f8c0dd Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 17 Jul 2014 11:15:20 +0200 Subject: [PATCH] qmldesigner: avoid variable shadowing in nodemetainfo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie61915613417dbeb792e6911527eb486d5120a99 Reviewed-by: Tim Jenssen Reviewed-by: Jędrzej Nowacki --- .../designercore/metainfo/nodemetainfo.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 4cbe1cb9ce4..0f48b1a2c28 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -672,19 +672,19 @@ NodeMetaInfoPrivate::NodeMetaInfoPrivate(Model *model, TypeName type, int maj, i m_model(model) { if (context()) { - const CppComponentValue *objectValue = getCppComponentValue(); + const CppComponentValue *cppObjectValue = getCppComponentValue(); - if (objectValue) { + if (cppObjectValue) { if (m_majorVersion == -1 && m_minorVersion == -1) { - m_majorVersion = objectValue->componentVersion().majorVersion(); - m_minorVersion = objectValue->componentVersion().minorVersion(); + m_majorVersion = cppObjectValue->componentVersion().majorVersion(); + m_minorVersion = cppObjectValue->componentVersion().minorVersion(); } - setupPropertyInfo(getTypes(objectValue, context())); - setupLocalPropertyInfo(getTypes(objectValue, context(), true)); - m_defaultPropertyName = objectValue->defaultPropertyName().toUtf8(); + setupPropertyInfo(getTypes(cppObjectValue, context())); + setupLocalPropertyInfo(getTypes(cppObjectValue, context(), true)); + m_defaultPropertyName = cppObjectValue->defaultPropertyName().toUtf8(); m_isValid = true; setupPrototypes(); - m_signals = getSignals(objectValue, context()); + m_signals = getSignals(cppObjectValue, context()); } else { const ObjectValue *objectValue = getObjectValue(); if (objectValue) {