From 87ac18f0310c12f031dc7c639737473643a6ddc9 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Tue, 15 Jan 2013 18:47:00 +0100 Subject: Change the sort and merge functions to a more generic form. This might make it easier to reuse the parallel sorting code. Moreover, some the upperBound/lowerBound functions have been removed because equivalents are provided by the STL. --- src/kitemviews/kfileitemmodel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/kitemviews/kfileitemmodel.h') diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index ef9dc98b9..75fbb7075 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -476,7 +476,8 @@ private: // and done step after step in slotCompleted(). QSet m_urlsToExpand; - friend class KFileItemModelSortAlgorithm; // Accesses lessThan() method + friend class KFileItemModelLessThan; // Accesses lessThan() method + friend class KFileItemModelSortAlgorithm; // Accesses NameRole friend class KFileItemModelRolesUpdater; // Accesses emitSortProgress() method friend class KFileItemModelTest; // For unit testing friend class KFileItemListViewTest; // For unit testing -- cgit v1.3.1