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

Fix use of variable before initialization

Browse Source 
That's what you get for shadowing a variable... The "childItem" variable
on the second part of the foreach refers to one declared on the first
part, which is uninitialized.

Found by ICC 14.0:
graphicalnodeinstance.cpp(300): warning #592: variable "childItem" is used before its value is set

Change-Id: I9079a428eda90f4bb06f9ccd1adf836fee119133
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thiago Macieira
2013-12-05 23:47:08 -08:00
parent 293d4d9a6d
commit 9dd60b34f8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
View File

@@ -292,12 +292,12 @@ int GraphicalNodeInstance::penWidth() const
} }
QList<ServerNodeInstance> GraphicalNodeInstance::childItemsForChild(QQuickItem *childItem) const QList<ServerNodeInstance> GraphicalNodeInstance::childItemsForChild(QQuickItem *item) const
{ {
QList<ServerNodeInstance> instanceList; QList<ServerNodeInstance> instanceList;
if (childItem) { if (item) {
foreach (QQuickItem *childItem, childItem->childItems()) foreach (QQuickItem *childItem, item->childItems())
{ {
if (childItem && nodeInstanceServer()->hasInstanceForObject(childItem)) { if (childItem && nodeInstanceServer()->hasInstanceForObject(childItem)) {
instanceList.append(nodeInstanceServer()->instanceForObject(childItem)); instanceList.append(nodeInstanceServer()->instanceForObject(childItem));

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h
View File

@@ -69,7 +69,7 @@ protected:
QRectF boundingRectWithStepChilds(QQuickItem *parentItem) const; QRectF boundingRectWithStepChilds(QQuickItem *parentItem) const;
void resetHorizontal(); void resetHorizontal();
void resetVertical(); void resetVertical();
QList<ServerNodeInstance> childItemsForChild(QQuickItem *childItem) const; QList<ServerNodeInstance> childItemsForChild(QQuickItem *item) const;
void refresh(); void refresh();
static bool anyItemHasContent(QQuickItem *quickItem); static bool anyItemHasContent(QQuickItem *quickItem);
static bool childItemsHaveContent(QQuickItem *quickItem); static bool childItemsHaveContent(QQuickItem *quickItem);