Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

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

diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp
index b846318ee799e8327c62b271d3b87ab2cc816ffc..17716f57f5d52155a5bafaa5e3fe592953a8023d 100644 (file)
--- a/src/kitemviews/kitemmodelbase.cpp
+++ b/src/kitemviews/kitemmodelbase.cpp
@@ -10,7 +10,7 @@
 
 KItemModelBase::KItemModelBase(QObject *parent)
     : QObject(parent)
-    , m_groupedSorting(false)
+    , m_groupedSorting(true)
     , m_sortRole()
     , m_sortOrder(Qt::AscendingOrder)
     , m_groupRole()
@@ -20,7 +20,7 @@ KItemModelBase::KItemModelBase(QObject *parent)
 
 KItemModelBase::KItemModelBase(const QByteArray &sortRole, const QByteArray &groupRole, QObject *parent)
     : QObject(parent)
-    , m_groupedSorting(false)
+    , m_groupedSorting(true)
     , m_sortRole(sortRole)
     , m_sortOrder(Qt::AscendingOrder)
     , m_groupRole(groupRole)
@@ -68,12 +68,12 @@ QByteArray KItemModelBase::sortRole() const
     return m_sortRole;
 }
 
-void KItemModelBase::setSortOrder(Qt::SortOrder order, bool resortItems)
+void KItemModelBase::setSortOrder(Qt::SortOrder order)
 {
     if (order != m_sortOrder) {
         const Qt::SortOrder previous = m_sortOrder;
         m_sortOrder = order;
-        onSortOrderChanged(order, previous, resortItems);
+        onSortOrderChanged(order, previous);
         Q_EMIT sortOrderChanged(order, previous);
     }
 }
@@ -93,12 +93,12 @@ QByteArray KItemModelBase::groupRole() const
     return m_groupRole;
 }
 
-void KItemModelBase::setGroupOrder(Qt::SortOrder order, bool resortItems)
+void KItemModelBase::setGroupOrder(Qt::SortOrder order)
 {
     if (order != m_groupOrder) {
         const Qt::SortOrder previous = m_groupOrder;
         m_groupOrder = order;
-        onGroupOrderChanged(order, previous, resortItems);
+        onGroupOrderChanged(order, previous);
         Q_EMIT groupOrderChanged(order, previous);
     }
 }
@@ -180,11 +180,10 @@ void KItemModelBase::onSortRoleChanged(const QByteArray &current, const QByteArr
     Q_UNUSED(resortItems)
 }
 
-void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems)
+void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
-    Q_UNUSED(resortItems)
 }
 
 void KItemModelBase::onGroupRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems)
@@ -194,11 +193,10 @@ void KItemModelBase::onGroupRoleChanged(const QByteArray &current, const QByteAr
     Q_UNUSED(resortItems)
 }
 
-void KItemModelBase::onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems)
+void KItemModelBase::onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
-    Q_UNUSED(resortItems)
 }
 
 QUrl KItemModelBase::url(int index) const