From 119f7a3fce241efddc7e7f9eef8e729cf9ad35c2 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sun, 4 Jan 2015 21:45:30 +0100 Subject: Fix for crash which was introduced by commit c2a0d3e889666539669562a6c1f7a080a0f29b11 (use QCollator instead of KStringHandler) REVIEW: 121817 BUG: 342316 --- src/kitemviews/kfileitemmodel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/kitemviews/kfileitemmodel.h') diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index df7a5e3f0..dfcd8797b 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -362,7 +362,7 @@ private: * @return True if the item-data \a a should be ordered before the item-data * \b. The item-data may have different parent-items. */ - bool lessThan(const ItemData* a, const ItemData* b) const; + bool lessThan(const ItemData* a, const ItemData* b, const QCollator& collator) const; /** * Sorts the items between \a begin and \a end using the comparison @@ -375,9 +375,9 @@ private: * the passed item-data using m_sortRole as criteria. Both items must * have the same parent item, otherwise the comparison will be wrong. */ - int sortRoleCompare(const ItemData* a, const ItemData* b) const; + int sortRoleCompare(const ItemData* a, const ItemData* b, const QCollator& collator) const; - int stringCompare(const QString& a, const QString& b) const; + int stringCompare(const QString& a, const QString& b, const QCollator& collator) const; bool useMaximumUpdateInterval() const; -- cgit v1.3.1