From 1e6031c04debac1accb49ea19912a845f577abee Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 4 Apr 2012 13:35:34 +0200 Subject: Extract sorting-algorithm from KFileItemModel into custom class --- src/kitemviews/kfileitemmodel.h | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'src/kitemviews/kfileitemmodel.h') diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 4824dec3d..42cb15403 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -274,30 +274,6 @@ private: */ int sortRoleCompare(const ItemData* a, const ItemData* b) const; - /** - * Sorts the items by using lessThan() as comparison criteria. - * The merge sort algorithm is used to assure a worst-case - * of O(n * log(n)) and to keep the number of comparisons low. - */ - void sort(QList::iterator begin, QList::iterator end); - - /** Helper method for sort(). */ - void merge(QList::iterator begin, - QList::iterator pivot, - QList::iterator end); - - /** Helper method for sort(). */ - QList::iterator lowerBound(QList::iterator begin, - QList::iterator end, - const ItemData* value); - - /** Helper method for sort(). */ - QList::iterator upperBound(QList::iterator begin, - QList::iterator end, - const ItemData* value); - /** Helper method for sort(). */ - void reverse(QList::iterator begin, QList::iterator end); - int stringCompare(const QString& a, const QString& b) const; /** @@ -408,7 +384,8 @@ private: // and done step after step in slotCompleted(). QSet m_urlsToExpand; - friend class KFileItemModelTest; // For unit testing + friend class KFileItemModelSortAlgorithm; // Accesses lessThan() method + friend class KFileItemModelTest; // For unit testing }; inline bool KFileItemModel::isChildItem(int index) const -- cgit v1.3.1