Reverted resortAllItems() in favor of a group comparator for lessThan. Minor bug...

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

diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 6cbfab6037aa25d2e25efa05423e1f155da6de14..725ba71bdbe503593db89d9f724ba8a2cbcafa98 100644 (file)
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -454,8 +454,22 @@ private:
      */
     int sortRoleCompare(const ItemData *a, const ItemData *b, const QCollator &collator) const;
 
+    /**
+     * Helper method for lessThan() and expandedParentsCountCompare(): Compares
+     * the passed item-data using m_groupRole as criteria. Both items must
+     * have the same parent item, otherwise the comparison will be wrong.
+     */
+    int groupRoleCompare(const ItemData *a, const ItemData *b, const QCollator &collator) const;
+
     int stringCompare(const QString &a, const QString &b, const QCollator &collator) const;
 
+    QVariant getNameRoleGroup(const ItemData *itemData, bool asString = true) const;
+    QVariant getSizeRoleGroup(const ItemData *itemData, bool asString = true) const;
+    QVariant getTimeRoleGroup(const std::function<QDateTime(const ItemData *)> &fileTimeCb, const ItemData *itemData, bool asString = true) const;
+    QVariant getPermissionRoleGroup(const ItemData *itemData, bool asString = true) const;
+    QVariant getRatingRoleGroup(const ItemData *itemData, bool asString = true) const;
+    QString getGenericStringRoleGroup(const QByteArray &role, const ItemData *itemData) const;
+
     QList<QPair<int, QVariant>> nameRoleGroups() const;
     QList<QPair<int, QVariant>> sizeRoleGroups() const;
     QList<QPair<int, QVariant>> timeRoleGroups(const std::function<QDateTime(const ItemData *)> &fileTimeCb) const;