X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/97415729c34851df75c77a67f27d6299c00bfbc4..187933a7a6acb7f50ab397f5170308b8aab76bbc:/src/kitemviews/kitemmodelbase.cpp

diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp
index 5c6141ce2..b846318ee 100644
--- a/src/kitemviews/kitemmodelbase.cpp
+++ b/src/kitemviews/kitemmodelbase.cpp
@@ -8,19 +8,23 @@
 
 #include "kitemmodelbase.h"
 
-KItemModelBase::KItemModelBase(QObject* parent) :
-    QObject(parent),
-    m_groupedSorting(false),
-    m_sortRole(),
-    m_sortOrder(Qt::AscendingOrder)
+KItemModelBase::KItemModelBase(QObject *parent)
+    : QObject(parent)
+    , m_groupedSorting(false)
+    , m_sortRole()
+    , m_sortOrder(Qt::AscendingOrder)
+    , m_groupRole()
+    , m_groupOrder(Qt::AscendingOrder)
 {
 }
 
-KItemModelBase::KItemModelBase(const QByteArray& sortRole, QObject* parent) :
-    QObject(parent),
-    m_groupedSorting(false),
-    m_sortRole(sortRole),
-    m_sortOrder(Qt::AscendingOrder)
+KItemModelBase::KItemModelBase(const QByteArray &sortRole, const QByteArray &groupRole, QObject *parent)
+    : QObject(parent)
+    , m_groupedSorting(false)
+    , m_sortRole(sortRole)
+    , m_sortOrder(Qt::AscendingOrder)
+    , m_groupRole(groupRole)
+    , m_groupOrder(Qt::AscendingOrder)
 {
 }
 
@@ -49,7 +53,7 @@ bool KItemModelBase::groupedSorting() const
     return m_groupedSorting;
 }
 
-void KItemModelBase::setSortRole(const QByteArray& role, bool resortItems)
+void KItemModelBase::setSortRole(const QByteArray &role, bool resortItems)
 {
     if (role != m_sortRole) {
         const QByteArray previous = m_sortRole;
@@ -64,24 +68,49 @@ QByteArray KItemModelBase::sortRole() const
     return m_sortRole;
 }
 
-void KItemModelBase::setSortOrder(Qt::SortOrder order)
+void KItemModelBase::setSortOrder(Qt::SortOrder order, bool resortItems)
 {
     if (order != m_sortOrder) {
         const Qt::SortOrder previous = m_sortOrder;
         m_sortOrder = order;
-        onSortOrderChanged(order, previous);
+        onSortOrderChanged(order, previous, resortItems);
         Q_EMIT sortOrderChanged(order, previous);
     }
 }
 
-QString KItemModelBase::roleDescription(const QByteArray& role) const
+void KItemModelBase::setGroupRole(const QByteArray &role, bool regroupItems)
 {
-    return role;
+    if (role != m_groupRole) {
+        const QByteArray previous = m_groupRole;
+        m_groupRole = role;
+        onGroupRoleChanged(role, previous, regroupItems);
+        Q_EMIT groupRoleChanged(role, previous);
+    }
+}
+
+QByteArray KItemModelBase::groupRole() const
+{
+    return m_groupRole;
+}
+
+void KItemModelBase::setGroupOrder(Qt::SortOrder order, bool resortItems)
+{
+    if (order != m_groupOrder) {
+        const Qt::SortOrder previous = m_groupOrder;
+        m_groupOrder = order;
+        onGroupOrderChanged(order, previous, resortItems);
+        Q_EMIT groupOrderChanged(order, previous);
+    }
 }
 
-QList<QPair<int, QVariant> > KItemModelBase::groups() const
+QString KItemModelBase::roleDescription(const QByteArray &role) const
 {
-    return QList<QPair<int, QVariant> >();
+    return QString::fromLatin1(role);
+}
+
+QList<QPair<int, QVariant>> KItemModelBase::groups() const
+{
+    return QList<QPair<int, QVariant>>();
 }
 
 bool KItemModelBase::setExpanded(int index, bool expanded)
@@ -109,13 +138,13 @@ int KItemModelBase::expandedParentsCount(int index) const
     return 0;
 }
 
-QMimeData* KItemModelBase::createMimeData(const KItemSet& indexes) const
+QMimeData *KItemModelBase::createMimeData(const KItemSet &indexes) const
 {
     Q_UNUSED(indexes)
     return nullptr;
 }
 
-int KItemModelBase::indexForKeyboardSearch(const QString& text, int startFromIndex) const
+int KItemModelBase::indexForKeyboardSearch(const QString &text, int startFromIndex) const
 {
     Q_UNUSED(text)
     Q_UNUSED(startFromIndex)
@@ -128,6 +157,12 @@ bool KItemModelBase::supportsDropping(int index) const
     return false;
 }
 
+bool KItemModelBase::canEnterOnHover(int index) const
+{
+    Q_UNUSED(index)
+    return false;
+}
+
 QString KItemModelBase::blacklistItemDropEventMimeType() const
 {
     return QStringLiteral("application/x-dolphin-blacklist-drop");
@@ -138,17 +173,32 @@ void KItemModelBase::onGroupedSortingChanged(bool current)
     Q_UNUSED(current)
 }
 
-void KItemModelBase::onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems)
+void KItemModelBase::onSortRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems)
+{
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+    Q_UNUSED(resortItems)
+}
+
+void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems)
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
     Q_UNUSED(resortItems)
 }
 
-void KItemModelBase::onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous)
+void KItemModelBase::onGroupRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems)
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
+    Q_UNUSED(resortItems)
+}
+
+void KItemModelBase::onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous, bool resortItems)
+{
+    Q_UNUSED(current)
+    Q_UNUSED(previous)
+    Q_UNUSED(resortItems)
 }
 
 QUrl KItemModelBase::url(int index) const
@@ -165,3 +215,5 @@ QUrl KItemModelBase::directory() const
 {
     return QUrl();
 }
+
+#include "moc_kitemmodelbase.cpp"