From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sun, 10 Mar 2013 17:31:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f71e0881d2c0a52c5fa020e3fd2b44ca6ab7b2d4

Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
	dolphin/src/kitemviews/kfileitemmodel.cpp
---

f71e0881d2c0a52c5fa020e3fd2b44ca6ab7b2d4
diff --cc src/kitemviews/kfileitemmodel.cpp
index 688826ee4,792724502..61703e760
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@@ -437,7 -438,30 +437,31 @@@ bool KFileItemModel::setExpanded(int in
              itemsToRemove.append(m_itemData.at(index)->item);
              ++index;
          }
+ 
+         QSet<KUrl> urlsToRemove;
+         urlsToRemove.reserve(itemsToRemove.count() + 1);
+         urlsToRemove.insert(url);
+         foreach (const KFileItem& item, itemsToRemove) {
+             KUrl url = item.url();
+             url.adjustPath(KUrl::RemoveTrailingSlash);
+             urlsToRemove.insert(url);
+         }
+ 
 -        QSet<KFileItem>::iterator it = m_filteredItems.begin();
++        QHash<KFileItem, ItemData*>::iterator it = m_filteredItems.begin();
+         while (it != m_filteredItems.end()) {
 -            const KUrl url = it->url();
++            const KUrl url = it.key().url();
+             KUrl parentUrl = url.upUrl();
+             parentUrl.adjustPath(KUrl::RemoveTrailingSlash);
+ 
+             if (urlsToRemove.contains(parentUrl)) {
++                delete it.value();
+                 it = m_filteredItems.erase(it);
+             } else {
+                 ++it;
+             }
+         }
+ 
 -        removeItems(itemsToRemove);
 +        removeItems(itemsToRemove, DeleteItemData);
      }
  
      return true;