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

qmldesigner: avoid variable shadowing in nodemetainfo

Browse Source 
Change-Id: Ie61915613417dbeb792e6911527eb486d5120a99
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-07-17 11:15:20 +02:00
parent f9d9dedab5
commit d901572093
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/designercore/metainfo/nodemetainfo.cpp
View File

@@ -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) {