From: Peter Penz Date: Fri, 18 Apr 2008 17:11:43 +0000 (+0000) Subject: don't use deprecated methods X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/01f53f01b4de69a70e030927716025eab4cc52b5 don't use deprecated methods svn path=/trunk/KDE/kdebase/apps/; revision=798611 --- diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp index 9cf3ca633..da903c92f 100644 --- a/src/dolphinsortfilterproxymodel.cpp +++ b/src/dolphinsortfilterproxymodel.cpp @@ -29,6 +29,7 @@ #include #include #include +#include static DolphinView::Sorting sortingTypeTable[] = { @@ -106,9 +107,7 @@ bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left, 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; @@ -127,12 +126,10 @@ bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left, 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: