Interface cleanups to prepare the return of "grouped sorting"

[dolphin.git] / src / kitemviews / kfileitemmodel.cpp

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index ddb89533c3b7cd6aa21aebb5895b4a57d900ce30..3a49135f903755dea13b5baeb07f6e1b10394d9f 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -31,11 +31,10 @@
 #define KFILEITEMMODEL_DEBUG
 
 KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :
 #define KFILEITEMMODEL_DEBUG
 
 KFileItemModel::KFileItemModel(KDirLister* dirLister, QObject* parent) :

-    KItemModelBase(QByteArray(), "name", parent),
+    KItemModelBase("name", parent),

     m_dirLister(dirLister),
     m_naturalSorting(true),
     m_sortFoldersFirst(true),
     m_dirLister(dirLister),
     m_naturalSorting(true),
     m_sortFoldersFirst(true),

-    m_groupRole(NoRole),

     m_sortRole(NameRole),
     m_caseSensitivity(Qt::CaseInsensitive),
     m_sortedItems(),
     m_sortRole(NameRole),
     m_caseSensitivity(Qt::CaseInsensitive),
     m_sortedItems(),


@@ -127,16 +126,6 @@ bool KFileItemModel::setData(int index, const QHash<QByteArray, QVariant>& value
     return false;
 }
 
     return false;
 }
 

-bool KFileItemModel::supportsGrouping() const
-{
-    return true;
-}
-
-bool KFileItemModel::supportsSorting() const
-{
-    return true;
-}
-

 void KFileItemModel::setSortFoldersFirst(bool foldersFirst)
 {
     if (foldersFirst != m_sortFoldersFirst) {
 void KFileItemModel::setSortFoldersFirst(bool foldersFirst)
 {
     if (foldersFirst != m_sortFoldersFirst) {


@@ -234,6 +223,20 @@ QString KFileItemModel::roleDescription(const QByteArray& role) const
     return descr;
 }
 
     return descr;
 }
 

+QList<QPair<int, QVariant> > KFileItemModel::groups() const
+{
+    // TODO:
+    QPair<int, QVariant> group1(0, "Group 1");
+    QPair<int, QVariant> group2(5, "Group 2");
+    QPair<int, QVariant> group3(10, "Group 3");
+
+    QList<QPair<int, QVariant> > groups;
+    groups.append(group1);
+    groups.append(group2);
+    groups.append(group3);
+    return groups;
+}
+

 KFileItem KFileItemModel::fileItem(int index) const
 {
     if (index >= 0 && index < count()) {
 KFileItem KFileItemModel::fileItem(int index) const
 {
     if (index >= 0 && index < count()) {


@@ -403,10 +406,9 @@ void KFileItemModel::restoreExpandedUrls(const QSet<KUrl>& urls)
     m_restoredExpandedUrls = urls;
 }
 
     m_restoredExpandedUrls = urls;
 }
 

-void KFileItemModel::onGroupRoleChanged(const QByteArray& current, const QByteArray& previous)
+void KFileItemModel::onGroupedSortingChanged(bool current)

 {
 {

-    Q_UNUSED(previous);
-    m_groupRole = roleIndex(current);
+    Q_UNUSED(current);

 }
 
 void KFileItemModel::onSortRoleChanged(const QByteArray& current, const QByteArray& previous)
 }
 
 void KFileItemModel::onSortRoleChanged(const QByteArray& current, const QByteArray& previous)