From kde-commits  Thu Feb 28 23:30:02 2013
From: Albert Astals Cid <aacid () kde ! org>
Date: Thu, 28 Feb 2013 23:30:02 +0000
To: kde-commits
Subject: [kde-workspace/KDE/4.10] kmenuedit: Fix crash when doing stuff like kmenuedit Games/Arcade
Message-Id: <20130228233002.23E1CA604F () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=136209421229733

Git commit 7f220f427f998825327d9b88514e19ea75fb32da by Albert Astals Cid, o=
n behalf of Julien Borderie.
Committed on 01/03/2013 at 00:29.
Pushed by aacid into branch 'KDE/4.10'.

Fix crash when doing stuff like kmenuedit Games/Arcade

Not very smart to shadow the variables :D
Part of review 109084

M  +5    -5    kmenuedit/treeview.cpp

http://commits.kde.org/kde-workspace/7f220f427f998825327d9b88514e19ea75fb32=
da

diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index b144b1c..a6e968a 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -463,18 +463,18 @@ TreeItem *TreeView::expandPath(TreeItem *item, const =
QString &path)
    QString restMenu =3D path.mid(i+1);
 =

    for (int i =3D 0; i < item->childCount(); ++i) {
-       TreeItem *item =3D dynamic_cast<TreeItem *>(item->child(i));
-       if (!item) {
+       TreeItem *childItem =3D dynamic_cast<TreeItem *>(item->child(i));
+       if (!childItem) {
            continue;
        }
 =

-       MenuFolderInfo *folderInfo =3D item->folderInfo();
+       MenuFolderInfo *folderInfo =3D childItem->folderInfo();
        if (folderInfo && (folderInfo->id =3D=3D subMenu)) {
-           item->setExpanded(true);
+           childItem->setExpanded(true);
            if (!restMenu.isEmpty()) {
                return expandPath(item, restMenu);
            } else {
-               return item;
+               return childItem;
            }
        }
    }