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 f4c09b6c5eadd64e2319b57b5b00eed67f044ec4..13554d8c7fa1999dc62e8fd355c71967096ca9e5 100644 (file)
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -25,8 +25,9 @@ class KDirLister;
 
 class QTimer;
 
 
 class QTimer;
 

-namespace KIO {
-    class Job;
+namespace KIO
+{
+class Job;

 }
 
 /**
 }
 
 /**


@@ -44,7 +45,7 @@ class DOLPHIN_EXPORT KFileItemModel : public KItemModelBase
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    explicit KFileItemModel(QObject* parent = nullptr);
+    explicit KFileItemModel(QObject *parent = nullptr);

     ~KFileItemModel() override;
 
     /**
     ~KFileItemModel() override;
 
     /**


@@ -53,13 +54,13 @@ public:
      * indicate the current state of the loading process. The items
      * of the directory are added after the loading has been completed.
      */
      * indicate the current state of the loading process. The items
      * of the directory are added after the loading has been completed.
      */

-    void loadDirectory(const QUrl& url);
+    void loadDirectory(const QUrl &url);

 
     /**
      * Throws away all currently loaded items and refreshes the directory
      * by reloading all items again.
      */
 
     /**
      * Throws away all currently loaded items and refreshes the directory
      * by reloading all items again.
      */

-    void refreshDirectory(const QUrl& url);
+    void refreshDirectory(const QUrl &url);

 
     /**
      * @return Parent directory of the items that are shown. In case
 
     /**
      * @return Parent directory of the items that are shown. In case


@@ -77,7 +78,7 @@ public:
 
     int count() const override;
     QHash<QByteArray, QVariant> data(int index) const override;
 
     int count() const override;
     QHash<QByteArray, QVariant> data(int index) const override;

-    bool setData(int index, const QHash<QByteArray, QVariant>& values) override;
+    bool setData(int index, const QHash<QByteArray, QVariant> &values) override;

 
     /**
      * Sets a separate sorting with directories first (true) or a mixed
 
     /**
      * Sets a separate sorting with directories first (true) or a mixed


@@ -102,15 +103,17 @@ public:
     void setShowDirectoriesOnly(bool enabled);
     bool showDirectoriesOnly() const;
 
     void setShowDirectoriesOnly(bool enabled);
     bool showDirectoriesOnly() const;
 

-    QMimeData* createMimeData(const KItemSet& indexes) const override;
+    QMimeData *createMimeData(const KItemSet &indexes) const override;

 
 

-    int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const override;
+    int indexForKeyboardSearch(const QString &text, int startFromIndex = 0) const override;

 
     bool supportsDropping(int index) const override;
 
 
     bool supportsDropping(int index) const override;
 

-    QString roleDescription(const QByteArray& role) const override;
+    bool canEnterOnHover(int index) const override;
+
+    QString roleDescription(const QByteArray &role) const override;

 
 

-    QList<QPair<int, QVariant> > groups() const override;
+    QList<QPair<int, QVariant>> groups() const override;

 
     /**
      * @return The file-item for the index \a index. If the index is in a valid
 
     /**
      * @return The file-item for the index \a index. If the index is in a valid


@@ -124,14 +127,14 @@ public:
      *         URL is found KFileItem::isNull() will be true for the returned
      *         file-item. The runtime complexity of this call is O(1).
      */
      *         URL is found KFileItem::isNull() will be true for the returned
      *         file-item. The runtime complexity of this call is O(1).
      */

-    KFileItem fileItem(const QUrl& url) const;
+    KFileItem fileItem(const QUrl &url) const;

 
     /**
      * @return The index for the file-item \a item. -1 is returned if no file-item
      *         is found or if the file-item is null. The amortized runtime
      *         complexity of this call is O(1).
      */
 
     /**
      * @return The index for the file-item \a item. -1 is returned if no file-item
      *         is found or if the file-item is null. The amortized runtime
      *         complexity of this call is O(1).
      */

-    int index(const KFileItem& item) const;
+    int index(const KFileItem &item) const;

 
     /**
      * @return The index for the URL \a url. -1 is returned if no file-item
 
     /**
      * @return The index for the URL \a url. -1 is returned if no file-item


@@ -153,7 +156,7 @@ public:
     /**
      * Sets the roles that should be shown for each item.
      */
     /**
      * Sets the roles that should be shown for each item.
      */

-    void setRoles(const QSet<QByteArray>& roles);
+    void setRoles(const QSet<QByteArray> &roles);

     QSet<QByteArray> roles() const;
 
     bool setExpanded(int index, bool expanded) override;
     QSet<QByteArray> roles() const;
 
     bool setExpanded(int index, bool expanded) override;


@@ -168,27 +171,38 @@ public:
      * After calling loadDirectory() or refreshDirectory() the marked sub-directories
      * will be expanded step-by-step.
      */
      * After calling loadDirectory() or refreshDirectory() the marked sub-directories
      * will be expanded step-by-step.
      */

-    void restoreExpandedDirectories(const QSet<QUrl>& urls);
+    void restoreExpandedDirectories(const QSet<QUrl> &urls);

 
     /**
      * Expands all parent-directories of the item \a url.
      */
 
     /**
      * Expands all parent-directories of the item \a url.
      */

-    void expandParentDirectories(const QUrl& url);
+    void expandParentDirectories(const QUrl &url);

 
 

-    void setNameFilter(const QString& nameFilter);
+    void setNameFilter(const QString &nameFilter);

     QString nameFilter() const;
 
     QString nameFilter() const;
 

-    void setMimeTypeFilters(const QStringList& filters);
+    void setMimeTypeFilters(const QStringList &filters);

     QStringList mimeTypeFilters() const;
 
     QStringList mimeTypeFilters() const;
 

-    struct RoleInfo
-    {   QByteArray role;
+    void setExcludeMimeTypeFilter(const QStringList &filters);
+    QStringList excludeMimeTypeFilter() const;
+
+    struct RoleInfo {
+        QByteArray role;

         QString translation;
         QString group;
         QString translation;
         QString group;

+        QString tooltip;

         bool requiresBaloo;
         bool requiresIndexer;
     };
 
         bool requiresBaloo;
         bool requiresIndexer;
     };
 

+    /**
+     * @return Provides static information for a role that is supported
+     *         by KFileItemModel. Some roles can only be determined if
+     *         Baloo is enabled and/or the Baloo indexing is enabled.
+     */
+    static RoleInfo roleInformation(const QByteArray &role);
+

     /**
      * @return Provides static information for all available roles that
      *         are supported by KFileItemModel. Some roles can only be
     /**
      * @return Provides static information for all available roles that
      *         are supported by KFileItemModel. Some roles can only be


@@ -197,6 +211,16 @@ public:
      */
     static QList<RoleInfo> rolesInformation();
 
      */
     static QList<RoleInfo> rolesInformation();
 

+    /**
+     * @return Provides static information for all available grouping
+     *         behaviors supported by KFileItemModel but not directly
+     *         mapped to roles of KFileItemModel.
+     */
+    static QList<RoleInfo> extraGroupingInformation();
+
+    /** set to true to hide application/x-trash files */
+    void setShowTrashMime(bool show);
+

 Q_SIGNALS:
     /**
      * Is emitted if the loading of a directory has been started. It is
 Q_SIGNALS:
     /**
      * Is emitted if the loading of a directory has been started. It is


@@ -215,6 +239,11 @@ Q_SIGNALS:
      */
     void directoryLoadingCompleted();
 
      */
     void directoryLoadingCompleted();
 

+    /**
+     * Is emitted when the model is being refreshed (F5 key press)
+     */
+    void directoryRefreshing();
+

     /**
      * Is emitted after the loading of a directory has been canceled.
      */
     /**
      * Is emitted after the loading of a directory has been canceled.
      */


@@ -237,25 +266,25 @@ Q_SIGNALS:
      * Is emitted if an information message (e.g. "Connecting to host...")
      * should be shown.
      */
      * Is emitted if an information message (e.g. "Connecting to host...")
      * should be shown.
      */

-    void infoMessage(const QString& message);
+    void infoMessage(const QString &message);

 
     /**
      * 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
      * to the new URL \a newUrl has been done.
      */
 
     /**
      * Is emitted if a redirection from the current URL \a oldUrl
      * to the new URL \a newUrl has been done.
      */

-    void directoryRedirection(const QUrl& oldUrl, const QUrl& newUrl);
+    void directoryRedirection(const QUrl &oldUrl, const QUrl &newUrl);

 
     /**
      * Is emitted when the URL passed by KFileItemModel::setUrl() represents a file.
      * In this case no signal errorMessage() will be emitted.
      */
 
     /**
      * Is emitted when the URL passed by KFileItemModel::setUrl() represents a file.
      * In this case no signal errorMessage() will be emitted.
      */

-    void urlIsFileError(const QUrl& url);
+    void urlIsFileError(const QUrl &url);

 
     /**
      * It is emitted for files when they change and
 
     /**
      * It is emitted for files when they change and


@@ -263,23 +292,30 @@ Q_SIGNALS:
      */
     void fileItemsChanged(const KFileItemList &changedFileItems);
 
      */
     void fileItemsChanged(const KFileItemList &changedFileItems);
 

+    /**
+     * It is emitted when the parent directory was removed.
+     */
+    void currentDirectoryRemoved();
+

 protected:
     void onGroupedSortingChanged(bool current) override;
 protected:
     void onGroupedSortingChanged(bool current) override;

-    void onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems = true) override;
+    void onSortRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems = true) override;

     void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;
     void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;

+    void onGroupRoleChanged(const QByteArray &current, const QByteArray &previous, bool resortItems = true) override;
+    void onGroupOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;

 
 private Q_SLOTS:
     /**
 
 private Q_SLOTS:
     /**

-     * Resorts all items dependent on the set sortRole(), sortOrder()
-     * and foldersFirst() settings.
+     * Resorts all items dependent on the set sortRole(), sortOrder(),
+     * groupRole(), groupOrder() and foldersFirst() settings.

      */
     void resortAllItems();
 
     void slotCompleted();
     void slotCanceled();
      */
     void resortAllItems();
 
     void slotCompleted();
     void slotCanceled();

-    void slotItemsAdded(const QUrl& directoryUrl, const KFileItemList& items);
-    void slotItemsDeleted(const KFileItemList& items);
-    void slotRefreshItems(const QList<QPair<KFileItem, KFileItem> >& items);
+    void slotItemsAdded(const QUrl &directoryUrl, const KFileItemList &items);
+    void slotItemsDeleted(const KFileItemList &items);
+    void slotRefreshItems(const QList<QPair<KFileItem, KFileItem>> &items);

     void slotClear();
     void slotSortingChoiceChanged();
     void slotListerError(KIO::Job *job);
     void slotClear();
     void slotSortingChoiceChanged();
     void slotListerError(KIO::Job *job);


@@ -289,33 +325,75 @@ private Q_SLOTS:
 private:
     enum RoleType {
         // User visible roles:
 private:
     enum RoleType {
         // User visible roles:

-        NoRole, NameRole, SizeRole, ModificationTimeRole, CreationTimeRole, AccessTimeRole, PermissionsRole, OwnerRole,
-        GroupRole, TypeRole, ExtensionRole, DestinationRole, PathRole, DeletionTimeRole,
+        NoRole,
+        NameRole,
+        SizeRole,
+        ModificationTimeRole,
+        CreationTimeRole,
+        AccessTimeRole,
+        PermissionsRole,
+        OwnerRole,
+        GroupRole,
+        TypeRole,
+        ExtensionRole,
+        DestinationRole,
+        PathRole,
+        DeletionTimeRole,

         // User visible roles available with Baloo:
         // User visible roles available with Baloo:

-        CommentRole, TagsRole, RatingRole, DimensionsRole, WidthRole, HeightRole, ImageDateTimeRole, OrientationRole,
-        WordCountRole, TitleRole, AuthorRole, LineCountRole, ArtistRole, GenreRole, AlbumRole, DurationRole, TrackRole, ReleaseYearRole,
-        BitrateRole, OriginUrlRole, AspectRatioRole, FrameRateRole,
+        CommentRole,
+        TagsRole,
+        RatingRole,
+        DimensionsRole,
+        WidthRole,
+        HeightRole,
+        ImageDateTimeRole,
+        OrientationRole,
+        PublisherRole,
+        PageCountRole,
+        WordCountRole,
+        TitleRole,
+        AuthorRole,
+        LineCountRole,
+        ArtistRole,
+        GenreRole,
+        AlbumRole,
+        DurationRole,
+        TrackRole,
+        ReleaseYearRole,
+        BitrateRole,
+        OriginUrlRole,
+        AspectRatioRole,
+        FrameRateRole,

         // Non-visible roles:
         // Non-visible roles:

-        IsDirRole, IsLinkRole, IsHiddenRole, IsExpandedRole, IsExpandableRole, ExpandedParentsCountRole,
+        IsDirRole,
+        IsLinkRole,
+        IsHiddenRole,
+        IsExpandedRole,
+        IsExpandableRole,
+        ExpandedParentsCountRole,

         // Mandatory last entry:
         RolesCount
     };
 
         // Mandatory last entry:
         RolesCount
     };
 

-    struct ItemData
-    {
+    struct ItemData {

         KFileItem item;
         QHash<QByteArray, QVariant> values;
         KFileItem item;
         QHash<QByteArray, QVariant> values;

-        ItemData* parent;
+        ItemData *parent;

     };
     };

-
-    enum RemoveItemsBehavior {
-        KeepItemData,
-        DeleteItemData,
-        DeleteItemDataIfUnfiltered
+    
+    struct ItemGroupInfo {
+        int comparable;
+        QString text;
+
+        bool operator==(const ItemGroupInfo &other) const;
+        bool operator!=(const ItemGroupInfo &other) const;
+        bool operator<(const ItemGroupInfo &other) const;

     };
 
     };
 

-    void insertItems(QList<ItemData*>& items);
-    void removeItems(const KItemRangeList& itemRanges, RemoveItemsBehavior behavior);
+    enum RemoveItemsBehavior { KeepItemData, DeleteItemData, DeleteItemDataIfUnfiltered };
+
+    void insertItems(QList<ItemData *> &items);
+    void removeItems(const KItemRangeList &itemRanges, RemoveItemsBehavior behavior);

 
     /**
      * Helper method for insertItems() and removeItems(): Creates
 
     /**
      * Helper method for insertItems() and removeItems(): Creates


@@ -323,16 +401,22 @@ private:
      * Note that the ItemData instances are created dynamically and
      * must be deleted by the caller.
      */
      * Note that the ItemData instances are created dynamically and
      * must be deleted by the caller.
      */

-    QList<ItemData*> createItemDataList(const QUrl& parentUrl, const KFileItemList& items) const;
+    QList<ItemData *> createItemDataList(const QUrl &parentUrl, const KFileItemList &items) const;
+
+    /**
+     * Helper method for prepareItemsForSorting(). 
+     * For a set role, fills 'values' of ItemData non-lazily.
+     */
+    void prepareItemsWithRole(QList<ItemData *> &itemDataList, RoleType roleType);

 
     /**
      * Prepares the items for sorting. Normally, the hash 'values' in ItemData is filled
      * lazily to save time and memory, but for some sort roles, it is expected that the
      * sort role data is stored in 'values'.
      */
 
     /**
      * Prepares the items for sorting. Normally, the hash 'values' in ItemData is filled
      * lazily to save time and memory, but for some sort roles, it is expected that the
      * sort role data is stored in 'values'.
      */

-    void prepareItemsForSorting(QList<ItemData*>& itemDataList);
+    void prepareItemsForSorting(QList<ItemData *> &itemDataList);

 
 

-    static int expandedParentsCount(const ItemData* data);
+    static int expandedParentsCount(const ItemData *data);

 
     void removeExpandedItems();
 
 
     void removeExpandedItems();
 


@@ -341,7 +425,7 @@ private:
      * the itemsChanged() signal, checks if the sort order is still correct,
      * and starts m_resortAllItemsTimer if that is not the case.
      */
      * the itemsChanged() signal, checks if the sort order is still correct,
      * and starts m_resortAllItemsTimer if that is not the case.
      */

-    void emitItemsChangedAndTriggerResorting(const KItemRangeList& itemRanges, const QSet<QByteArray>& changedRoles);
+    void emitItemsChangedAndTriggerResorting(const KItemRangeList &itemRanges, const QSet<QByteArray> &changedRoles);

 
     /**
      * Resets all values from m_requestRole to false.
 
     /**
      * Resets all values from m_requestRole to false.


@@ -352,7 +436,7 @@ private:
      * @return Role-type for the given role.
      *         Runtime complexity is O(1).
      */
      * @return Role-type for the given role.
      *         Runtime complexity is O(1).
      */

-    RoleType typeForRole(const QByteArray& role) const;
+    RoleType typeForRole(const QByteArray &role) const;

 
     /**
      * @return Role-byte-array for the given role-type.
 
     /**
      * @return Role-byte-array for the given role-type.


@@ -360,7 +444,7 @@ private:
      */
     QByteArray roleForType(RoleType roleType) const;
 
      */
     QByteArray roleForType(RoleType roleType) const;
 

-    QHash<QByteArray, QVariant> retrieveData(const KFileItem& item, const ItemData* parent) const;
+    QHash<QByteArray, QVariant> retrieveData(const KFileItem &item, const ItemData *parent) const;

 
     /**
      * @return True if role values benefit from natural or case insensitive sorting.
 
     /**
      * @return True if role values benefit from natural or case insensitive sorting.


@@ -371,35 +455,51 @@ private:
      * @return True if \a a has a KFileItem whose text is 'less than' the one
      *         of \a b according to QString::operator<(const QString&).
      */
      * @return True if \a a has a KFileItem whose text is 'less than' the one
      *         of \a b according to QString::operator<(const QString&).
      */

-    static bool nameLessThan(const ItemData* a, const ItemData* b);
+    static bool nameLessThan(const ItemData *a, const ItemData *b);

 
     /**
      * @return True if the item-data \a a should be ordered before the item-data
      *         \b. The item-data may have different parent-items.
      */
 
     /**
      * @return True if the item-data \a a should be ordered before the item-data
      *         \b. The item-data may have different parent-items.
      */

-    bool lessThan(const ItemData* a, const ItemData* b, const QCollator& collator) const;
+    bool lessThan(const ItemData *a, const ItemData *b, const QCollator &collator) const;

 
     /**
      * Sorts the items between \a begin and \a end using the comparison
      * function lessThan().
      */
 
     /**
      * Sorts the items between \a begin and \a end using the comparison
      * function lessThan().
      */

-    void sort(const QList<ItemData*>::iterator &begin, const QList<ItemData*>::iterator &end) const;
+    void sort(const QList<ItemData *>::iterator &begin, const QList<ItemData *>::iterator &end) const;

 
     /**
      * Helper method for lessThan() and expandedParentsCountCompare(): Compares
      * the passed item-data using m_sortRole as criteria. Both items must
      * have the same parent item, otherwise the comparison will be wrong.
      */
 
     /**
      * Helper method for lessThan() and expandedParentsCountCompare(): Compares
      * the passed item-data using m_sortRole as criteria. Both items must
      * have the same parent item, otherwise the comparison will be wrong.
      */

-    int sortRoleCompare(const ItemData* a, const ItemData* b, const QCollator& collator) const;
+    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;

 
 

-    int stringCompare(const QString& a, const QString& b, const QCollator& collator) const;
+    ItemGroupInfo nameRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo sizeRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo timeRoleGroup(const std::function<QDateTime(const ItemData *)> &fileTimeCb, const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo permissionRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo ratingRoleGroup(const ItemData *itemData, bool withString = true) const;
+    ItemGroupInfo typeRoleGroup(const ItemData *itemData) const;
+    ItemGroupInfo genericStringRoleGroup(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;
-    QList<QPair<int, QVariant> > permissionRoleGroups() const;
-    QList<QPair<int, QVariant> > ratingRoleGroups() const;
-    QList<QPair<int, QVariant> > genericStringRoleGroups(const QByteArray& typeForRole) 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;
+    QList<QPair<int, QVariant>> permissionRoleGroups() const;
+    QList<QPair<int, QVariant>> ratingRoleGroups() const;
+    QList<QPair<int, QVariant>> typeRoleGroups() const;
+    QList<QPair<int, QVariant>> genericStringRoleGroups(const QByteArray &typeForRole) const;

 
     /**
      * Helper method for all xxxRoleGroups() methods to check whether the
 
     /**
      * Helper method for all xxxRoleGroups() methods to check whether the


@@ -411,6 +511,8 @@ private:
      */
     bool isChildItem(int index) const;
 
      */
     bool isChildItem(int index) const;
 

+    void scheduleResortAllItems();
+

     /**
      * Is invoked by KFileItemModelRolesUpdater and results in emitting the
      * sortProgress signal with a percent-value of the progress.
     /**
      * Is invoked by KFileItemModelRolesUpdater and results in emitting the
      * sortProgress signal with a percent-value of the progress.


@@ -426,7 +528,7 @@ private:
      * Removes filtered items whose expanded parents have been deleted
      * or collapsed via setExpanded(parentIndex, false).
      */
      * Removes filtered items whose expanded parents have been deleted
      * or collapsed via setExpanded(parentIndex, false).
      */

-    void removeFilteredChildren(const KItemRangeList& parents);
+    void removeFilteredChildren(const KItemRangeList &parents);

 
     /**
      * Loads the selected choice of sorting method from Dolphin General Settings
 
     /**
      * Loads the selected choice of sorting method from Dolphin General Settings


@@ -437,12 +539,12 @@ private:
      * Maps the QByteArray-roles to RoleTypes and provides translation- and
      * group-contexts.
      */
      * Maps the QByteArray-roles to RoleTypes and provides translation- and
      * group-contexts.
      */

-    struct RoleInfoMap
-    {
-        const char* const role;
+    struct RoleInfoMap {
+        const char *const role;

         const RoleType roleType;
         const KLazyLocalizedString roleTranslation;
         const KLazyLocalizedString groupTranslation;
         const RoleType roleType;
         const KLazyLocalizedString roleTranslation;
         const KLazyLocalizedString groupTranslation;

+        const KLazyLocalizedString tooltipTranslation;

         const bool requiresBaloo;
         const bool requiresIndexer;
     };
         const bool requiresBaloo;
         const bool requiresIndexer;
     };


@@ -450,19 +552,19 @@ private:
     /**
      * @return Map of user visible roles that are accessible by KFileItemModel::rolesInformation().
      */
     /**
      * @return Map of user visible roles that are accessible by KFileItemModel::rolesInformation().
      */

-    static const RoleInfoMap* rolesInfoMap(int& count);
+    static const RoleInfoMap *rolesInfoMap(int &count);

 
     /**
      * Determines the MIME-types of all items that can be done within
      * the given timeout.
      */
 
     /**
      * Determines the MIME-types of all items that can be done within
      * the given timeout.
      */

-    static void determineMimeTypes(const KFileItemList& items, int timeout);
+    static void determineMimeTypes(const KFileItemList &items, int timeout);

 
     /**
      * @return Returns a copy of \a value that is implicitly shared
      * with other users to save memory.
      */
 
     /**
      * @return Returns a copy of \a value that is implicitly shared
      * with other users to save memory.
      */

-    static QByteArray sharedValue(const QByteArray& value);
+    static QByteArray sharedValue(const QByteArray &value);

 
     /**
      * Checks if the model's internal data structures are consistent.
 
     /**
      * Checks if the model's internal data structures are consistent.


@@ -487,10 +589,14 @@ private:
     bool m_sortHiddenLast;
 
     RoleType m_sortRole;
     bool m_sortHiddenLast;
 
     RoleType m_sortRole;

+    RoleType m_groupRole;
+    QByteArray m_sortExtraInfo;
+    QByteArray m_groupExtraInfo;
+

     int m_sortingProgressPercent; // Value of directorySortingProgress() signal
     QSet<QByteArray> m_roles;
 
     int m_sortingProgressPercent; // Value of directorySortingProgress() signal
     QSet<QByteArray> m_roles;
 

-    QList<ItemData*> m_itemData;
+    QList<ItemData *> m_itemData;

 
     // m_items is a cache for the method index(const QUrl&). If it contains N
     // entries, it is guaranteed that these correspond to the first N items in
 
     // m_items is a cache for the method index(const QUrl&). If it contains N
     // entries, it is guaranteed that these correspond to the first N items in


@@ -499,16 +605,16 @@ private:
     mutable QHash<QUrl, int> m_items;
 
     KFileItemModelFilter m_filter;
     mutable QHash<QUrl, int> m_items;
 
     KFileItemModelFilter m_filter;

-    QHash<KFileItem, ItemData*> m_filteredItems; // Items that got hidden by KFileItemModel::setNameFilter()
+    QHash<KFileItem, ItemData *> m_filteredItems; // Items that got hidden by KFileItemModel::setNameFilter()

 
     bool m_requestRole[RolesCount];
 
 
     bool m_requestRole[RolesCount];
 

-    QTimer* m_maximumUpdateIntervalTimer;
-    QTimer* m_resortAllItemsTimer;
-    QList<ItemData*> m_pendingItemsToInsert;
+    QTimer *m_maximumUpdateIntervalTimer;
+    QTimer *m_resortAllItemsTimer;
+    QList<ItemData *> m_pendingItemsToInsert;

 
     // Cache for KFileItemModel::groups()
 
     // Cache for KFileItemModel::groups()

-    mutable QList<QPair<int, QVariant> > m_groups;
+    mutable QList<QPair<int, QVariant>> m_groups;

 
     // Stores the URLs (key: target url, value: url) of the expanded directories.
     QHash<QUrl, QUrl> m_expandedDirs;
 
     // Stores the URLs (key: target url, value: url) of the expanded directories.
     QHash<QUrl, QUrl> m_expandedDirs;


@@ -517,33 +623,25 @@ private:
     // and done step after step in slotCompleted().
     QSet<QUrl> m_urlsToExpand;
 
     // and done step after step in slotCompleted().
     QSet<QUrl> m_urlsToExpand;
 

-    friend class KFileItemModelRolesUpdater;   // Accesses emitSortProgress() method
-    friend class KFileItemModelTest;           // For unit testing
-    friend class KFileItemModelBenchmark;      // For unit testing
-    friend class KFileItemListViewTest;        // For unit testing
-    friend class DolphinPart;                  // Accesses m_dirLister
+    friend class KFileItemModelRolesUpdater; // Accesses emitSortProgress() method
+    friend class KFileItemModelTest; // For unit testing
+    friend class KFileItemModelBenchmark; // For unit testing
+    friend class KFileItemListViewTest; // For unit testing
+    friend class DolphinPart; // Accesses m_dirLister

 };
 
 inline bool KFileItemModel::isRoleValueNatural(RoleType roleType)
 {
 };
 
 inline bool KFileItemModel::isRoleValueNatural(RoleType roleType)
 {

-    return (roleType == TypeRole ||
-            roleType == ExtensionRole ||
-            roleType == TagsRole ||
-            roleType == CommentRole ||
-            roleType == TitleRole ||
-            roleType == ArtistRole ||
-            roleType == GenreRole ||
-            roleType == AlbumRole ||
-            roleType == PathRole ||
-            roleType == DestinationRole ||
-            roleType == OriginUrlRole ||
-            roleType == OwnerRole ||
-            roleType == GroupRole);
+    return (roleType == TypeRole || roleType == ExtensionRole || roleType == TagsRole || roleType == CommentRole || roleType == TitleRole
+            || roleType == ArtistRole || roleType == GenreRole || roleType == AlbumRole || roleType == PathRole || roleType == DestinationRole
+            || roleType == OriginUrlRole || roleType == OwnerRole || roleType == GroupRole);

 }
 
 }
 

-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


@@ -555,6 +653,14 @@ inline bool KFileItemModel::isChildItem(int index) const
     }
 }
 
     }
 }
 

-#endif
+inline bool KFileItemModel::ItemGroupInfo::operator==(const ItemGroupInfo &other) const
+{
+    return comparable == other.comparable && text == other.text;
+}

 
 

+inline bool KFileItemModel::ItemGroupInfo::operator!=(const ItemGroupInfo &other) const
+{
+    return comparable != other.comparable || text != other.text;
+}

 
 

+#endif