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

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

diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 001c8470129a01bb7da8d2d94025194bd49f9450..13554d8c7fa1999dc62e8fd355c71967096ca9e5 100644 (file)
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -272,7 +272,7 @@ Q_SIGNALS:
      * Is emitted if an error message (e.g. "Unknown location")
      * should be shown.
      */
      * Is emitted if an error message (e.g. "Unknown location")
      * should be shown.
      */

-    void errorMessage(const QString &message);
+    void errorMessage(const QString &message, const int kioErrorCode);

 
     /**
      * Is emitted if a redirection from the current URL \a oldUrl
 
     /**
      * Is emitted if a redirection from the current URL \a oldUrl


@@ -380,7 +380,7 @@ private:
         QHash<QByteArray, QVariant> values;
         ItemData *parent;
     };
         QHash<QByteArray, QVariant> values;
         ItemData *parent;
     };

-
+    

     struct ItemGroupInfo {
         int comparable;
         QString text;
     struct ItemGroupInfo {
         int comparable;
         QString text;


@@ -639,7 +639,9 @@ inline bool KFileItemModel::isRoleValueNatural(RoleType roleType)
 
 inline bool KFileItemModel::nameLessThan(const ItemData *a, const ItemData *b)
 {
 
 inline bool KFileItemModel::nameLessThan(const ItemData *a, const ItemData *b)
 {

-    return a->item.text() < b->item.text();
+    // Split extension, taking into account it can be empty
+    constexpr QString::SectionFlags flags = QString::SectionSkipEmpty | QString::SectionIncludeLeadingSep;
+    return a->item.text().section('.', 0, 0, flags) < b->item.text().section('.', 0, 0, flags);

 }
 
 inline bool KFileItemModel::isChildItem(int index) const
 }
 
 inline bool KFileItemModel::isChildItem(int index) const