From 9dd60b34f82a90a5aae85f80a1adbe0849ef7824 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 5 Dec 2013 23:47:08 -0800
Subject: [PATCH] Fix use of variable before initialization

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>
---
 .../qml2puppet/instances/graphicalnodeinstance.cpp          | 6 +++---
 .../qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
index 561a333d4d4..eaa501e231e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
@@ -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;
 
-    if (childItem) {
-        foreach (QQuickItem *childItem, childItem->childItems())
+    if (item) {
+        foreach (QQuickItem *childItem, item->childItems())
         {
             if (childItem && nodeInstanceServer()->hasInstanceForObject(childItem)) {
                 instanceList.append(nodeInstanceServer()->instanceForObject(childItem));
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h
index d9996cb7377..e351aa64a9b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.h
@@ -69,7 +69,7 @@ protected:
     QRectF boundingRectWithStepChilds(QQuickItem *parentItem) const;
     void resetHorizontal();
     void resetVertical();
-    QList<ServerNodeInstance> childItemsForChild(QQuickItem *childItem) const;
+    QList<ServerNodeInstance> childItemsForChild(QQuickItem *item) const;
     void refresh();
     static bool anyItemHasContent(QQuickItem *quickItem);
     static bool childItemsHaveContent(QQuickItem *quickItem);