don't use deprecated methods

svn path=/trunk/KDE/kdebase/apps/; revision=798611

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index 9cf3ca633f2afe7f9c12f542fc8703f38e5f0aaf..da903c92f0dd00e7013e40d8d440cd9985cd480d 100644 (file)
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -29,6 +29,7 @@
 #include <kfileitem.h>
 #include <kdatetime.h>
 #include <klocale.h>
 #include <kfileitem.h>
 #include <kdatetime.h>
 #include <klocale.h>

+#include <kstringhandler.h>

 
 static DolphinView::Sorting sortingTypeTable[] =
 {
 
 static DolphinView::Sorting sortingTypeTable[] =
 {


@@ -106,9 +107,7 @@ bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left,
                 return result;
             }
 
                 return result;
             }
 

-            return sortCaseSensitivity() ?
-                   (naturalCompare(leftFileItem.name(), rightFileItem.name()) < 0) :
-                   (naturalCompare(leftFileItem.name().toLower(), rightFileItem.name().toLower()) < 0);
+            return KStringHandler::naturalCompare(leftFileItem.name(), rightFileItem.name(), sortCaseSensitivity()) < 0;

         }
 
         return leftRating > rightRating;
         }
 
         return leftRating > rightRating;


@@ -127,12 +126,10 @@ bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left,
                 return result;
             }
 
                 return result;
             }
 

-            return sortCaseSensitivity() ?
-                   (naturalCompare(leftFileItem.name(), rightFileItem.name()) < 0) :
-                   (naturalCompare(leftFileItem.name().toLower(), rightFileItem.name().toLower()) < 0);
+            return KStringHandler::naturalCompare(leftFileItem.name(), rightFileItem.name(), sortCaseSensitivity()) < 0;

         }
 
         }
 

-        return naturalCompare(leftTags, rightTags) < 0;
+        return KStringHandler::naturalCompare(leftTags, rightTags) < 0;

     }
 
     default:
     }
 
     default: