From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Mon, 9 Sep 2013 19:43:29 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/KDE/4.11'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e03a687c92e1f5d4415bcf83c1fd4370fc518ffb

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

e03a687c92e1f5d4415bcf83c1fd4370fc518ffb
diff --cc src/kitemviews/kfileitemmodel.h
index f364e7ce0,c87ee9736..841016138
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@@ -319,10 -319,15 +319,17 @@@ private
       */
      QList<ItemData*> createItemDataList(const KUrl& parentUrl, const KFileItemList& items) const;
  
 +    static int expandedParentsCount(const ItemData* data);
 +
      void removeExpandedItems();
  
+     /**
+      * This function is called by setData() and slotRefreshItems(). It emits
+      * the itemsChanged() signal, checks if the sort order is still correct,
+      * and starts m_resortAllItemsTimer if that is not the case.
+      */
+     void emitItemsChangedAndTriggerResorting(const KItemRangeList& itemRanges, const QSet<QByteArray>& changedRoles);
+ 
      /**
       * Resets all values from m_requestRole to false.
       */