diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp index cb0696b6c2..3960cee5d0 100644 --- a/src/dolphinsortfilterproxymodel.cpp +++ b/src/dolphinsortfilterproxymodel.cpp @@ -93,8 +93,8 @@ DolphinView::Sorting DolphinSortFilterProxyModel::sortingForColumn(int column) return sortingTypeTable[column]; } -bool DolphinSortFilterProxyModel::lessThanGeneralPurpose(const QModelIndex &left, - const QModelIndex &right) const +int DolphinSortFilterProxyModel::compareCategories(const QModelIndex &left, + const QModelIndex &right) const { #ifdef HAVE_NEPOMUK DolphinModel* dolphinModel = static_cast(sourceModel()); @@ -128,11 +128,11 @@ bool DolphinSortFilterProxyModel::lessThanGeneralPurpose(const QModelIndex &left } #endif - return KDirSortFilterProxyModel::lessThanGeneralPurpose(left, right); + return KDirSortFilterProxyModel::compareCategories(left, right); } -bool DolphinSortFilterProxyModel::lessThan(const QModelIndex& left, - const QModelIndex& right) const +bool DolphinSortFilterProxyModel::subsortLessThan(const QModelIndex& left, + const QModelIndex& right) const { #ifdef HAVE_NEPOMUK DolphinModel* dolphinModel = static_cast(sourceModel()); @@ -212,8 +212,7 @@ bool DolphinSortFilterProxyModel::lessThan(const QModelIndex& left, } #endif - - return KDirSortFilterProxyModel::lessThan(left, right); + return KDirSortFilterProxyModel::subsortLessThan(left, right); } #include "dolphinsortfilterproxymodel.moc" diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h index 254a90c807..bc3828d685 100644 --- a/src/dolphinsortfilterproxymodel.h +++ b/src/dolphinsortfilterproxymodel.h @@ -84,15 +84,15 @@ public: * will go before a category with a folder with rating 8. * That's the main reason for having the lessThanGeneralPurpose() method. */ - virtual bool lessThanGeneralPurpose(const QModelIndex &left, - const QModelIndex &right) const; + virtual int compareCategories(const QModelIndex &left, + const QModelIndex &right) const; signals: void sortingRoleChanged(); protected: - virtual bool lessThan(const QModelIndex& left, - const QModelIndex& right) const; + virtual bool subsortLessThan(const QModelIndex& left, + const QModelIndex& right) const; private: DolphinView::Sorting m_sorting:16;