From 971aa6766576b3ca54e2b8539a396fe54f676155 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Tue, 5 Nov 2013 08:44:31 +0100 Subject: [PATCH] Only do a fast pre-sorting when "Sort by Name" is used This is a follow-up to commit 0e9f4a398735cfc19ae783d2ab054d2400d95416, which tries to speed up sorting the items naturally by their name using the idea that a fast non-natural pre-sorting already sorts the items mostly correctly and thus reduces the number of expensive natural comparisons. This change only makes sense if the view is really sorted by "Name". In other cases, the pre-sorting will most likely not be useful. Thanks to Christoph Feck for pointing this out! --- src/kitemviews/kfileitemmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 261b23046d..4c8577543f 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -1034,7 +1034,7 @@ void KFileItemModel::insertItems(QList& newItems) m_groups.clear(); - if (m_naturalSorting) { + if (m_sortRole == NameRole && m_naturalSorting) { // Natural sorting of items can be very slow. However, it becomes much // faster if the input sequence is already mostly sorted. Therefore, we // first sort 'newItems' according to the QStrings returned by