From 95220eebae1be024b84b069ce9ae4be35c9e6a5f Mon Sep 17 00:00:00 2001
From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Sat, 13 Dec 2014 20:31:01 +0100
Subject: Port from KStringHandler naturalCompare to QCollator compare.

Make use of the QCollator instance (m_collator) in nameRoleGroups instead of using QString::localeAwareCompare (uses QCollator internally)

We don't need the m_caseSensitivity anymore, because the QCollator instance also holds this information.

(This patch doesn't make use of QCollatorSortKey)

Reviewed by Kai

REVIEW: 121480
---
 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 d98d4538d..df7a5e3f0 100644
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -26,6 +26,7 @@
 #include <kitemviews/kitemmodelbase.h>
 #include <kitemviews/private/kfileitemmodelfilter.h>
 
+#include <QCollator>
 #include <QHash>
 #include <QSet>
 
@@ -455,13 +456,13 @@ private:
 private:
     KFileItemModelDirLister* m_dirLister;
 
+    QCollator m_collator;
     bool m_naturalSorting;
     bool m_sortDirsFirst;
 
     RoleType m_sortRole;
     int m_sortingProgressPercent; // Value of directorySortingProgress() signal
     QSet<QByteArray> m_roles;
-    Qt::CaseSensitivity m_caseSensitivity;
 
     QList<ItemData*> m_itemData;
 
-- 
cgit v1.3.1