kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt to changes done on kdelibs

Browse source 
CCMAIL: peter.penz@gmx.at

svn path=/trunk/KDE/kdebase/apps/; revision=744218
This commit is contained in:
Rafael Fernández López 2007-12-02 23:50:21 +00:00
parent 2128e27bbf
commit e71af0e7c1
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/dolphinsortfilterproxymodel.cpp
View file

@ -93,8 +93,8 @@ DolphinView::Sorting DolphinSortFilterProxyModel::sortingForColumn(int column)
return sortingTypeTable[column]; return sortingTypeTable[column];
} }
bool DolphinSortFilterProxyModel::lessThanGeneralPurpose(const QModelIndex &left, int DolphinSortFilterProxyModel::compareCategories(const QModelIndex &left,
const QModelIndex &right) const const QModelIndex &right) const
{ {
#ifdef HAVE_NEPOMUK #ifdef HAVE_NEPOMUK
DolphinModel* dolphinModel = static_cast<DolphinModel*>(sourceModel()); DolphinModel* dolphinModel = static_cast<DolphinModel*>(sourceModel());
@ -128,11 +128,11 @@ bool DolphinSortFilterProxyModel::lessThanGeneralPurpose(const QModelIndex &left
} }
#endif #endif
return KDirSortFilterProxyModel::lessThanGeneralPurpose(left, right); return KDirSortFilterProxyModel::compareCategories(left, right);
} }
bool DolphinSortFilterProxyModel::lessThan(const QModelIndex& left, bool DolphinSortFilterProxyModel::subsortLessThan(const QModelIndex& left,
const QModelIndex& right) const const QModelIndex& right) const
{ {
#ifdef HAVE_NEPOMUK #ifdef HAVE_NEPOMUK
DolphinModel* dolphinModel = static_cast<DolphinModel*>(sourceModel()); DolphinModel* dolphinModel = static_cast<DolphinModel*>(sourceModel());
@ -212,8 +212,7 @@ bool DolphinSortFilterProxyModel::lessThan(const QModelIndex& left,
} }
#endif #endif
return KDirSortFilterProxyModel::subsortLessThan(left, right);
return KDirSortFilterProxyModel::lessThan(left, right);
} }
#include "dolphinsortfilterproxymodel.moc" #include "dolphinsortfilterproxymodel.moc"

8
src/dolphinsortfilterproxymodel.h
View file

@ -84,15 +84,15 @@ public:
* will go before a category with a folder with rating 8. * will go before a category with a folder with rating 8.
* That's the main reason for having the lessThanGeneralPurpose() method. * That's the main reason for having the lessThanGeneralPurpose() method.
*/ */
virtual bool lessThanGeneralPurpose(const QModelIndex &left, virtual int compareCategories(const QModelIndex &left,
const QModelIndex &right) const; const QModelIndex &right) const;
signals: signals:
void sortingRoleChanged(); void sortingRoleChanged();
protected: protected:
virtual bool lessThan(const QModelIndex& left, virtual bool subsortLessThan(const QModelIndex& left,
const QModelIndex& right) const; const QModelIndex& right) const;
private: private:
DolphinView::Sorting m_sorting:16; DolphinView::Sorting m_sorting:16;