From: Rafael Fernández López Date: Mon, 3 Dec 2007 20:38:37 +0000 (+0000) Subject: Changes to kdelibs were made, updating X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f42b43647189126112b10e2fd02218c512ccc1a9 Changes to kdelibs were made, updating svn path=/trunk/KDE/kdebase/apps/; revision=744509 --- diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp index 79d1e2f06..d62072830 100644 --- a/src/dolphinsortfilterproxymodel.cpp +++ b/src/dolphinsortfilterproxymodel.cpp @@ -130,7 +130,7 @@ int DolphinSortFilterProxyModel::compareCategories(const QModelIndex &left, return KDirSortFilterProxyModel::compareCategories(left, right); } -bool DolphinSortFilterProxyModel::subsortLessThan(const QModelIndex& left, +bool DolphinSortFilterProxyModel::subSortLessThan(const QModelIndex& left, const QModelIndex& right) const { #ifdef HAVE_NEPOMUK @@ -211,7 +211,7 @@ bool DolphinSortFilterProxyModel::subsortLessThan(const QModelIndex& left, } #endif - return KDirSortFilterProxyModel::subsortLessThan(left, right); + return KDirSortFilterProxyModel::subSortLessThan(left, right); } #include "dolphinsortfilterproxymodel.moc" diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h index bc3828d68..a1dd5ff18 100644 --- a/src/dolphinsortfilterproxymodel.h +++ b/src/dolphinsortfilterproxymodel.h @@ -91,7 +91,7 @@ signals: void sortingRoleChanged(); protected: - virtual bool subsortLessThan(const QModelIndex& left, + virtual bool subSortLessThan(const QModelIndex& left, const QModelIndex& right) const; private: