Merge branch 'Applications/19.08'

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

diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 9814ae55d2547de7dac0e18b63aea0ce5db51cb8..c2dfd01670a96680beb9c0730b860682b1d2dedc 100644 (file)
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -21,14 +21,17 @@
 #define KFILEITEMMODEL_H
 
 #include "dolphin_export.h"
 #define KFILEITEMMODEL_H
 
 #include "dolphin_export.h"

+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/private/kfileitemmodelfilter.h"
+

 #include <KFileItem>
 #include <KFileItem>

-#include <QUrl>
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/private/kfileitemmodelfilter.h>

 
 #include <QCollator>
 #include <QHash>
 #include <QSet>
 
 #include <QCollator>
 #include <QHash>
 #include <QSet>

+#include <QUrl>
+
+#include <functional>

 
 class KFileItemModelDirLister;
 class QTimer;
 
 class KFileItemModelDirLister;
 class QTimer;


@@ -48,8 +51,8 @@ class DOLPHIN_EXPORT KFileItemModel : public KItemModelBase
     Q_OBJECT
 
 public:
     Q_OBJECT
 
 public:

-    explicit KFileItemModel(QObject* parent = 0);
-    virtual ~KFileItemModel();
+    explicit KFileItemModel(QObject* parent = nullptr);
+    ~KFileItemModel() override;

 
     /**
      * Loads the directory specified by \a url. The signals
 
     /**
      * Loads the directory specified by \a url. The signals


@@ -71,7 +74,7 @@ public:
      *         the root-parent of all items.
      * @see rootItem()
      */
      *         the root-parent of all items.
      * @see rootItem()
      */

-    QUrl directory() const;
+    QUrl directory() const override;

 
     /**
      * Cancels the loading of a directory which has been started by either
 
     /**
      * Cancels the loading of a directory which has been started by either


@@ -79,9 +82,9 @@ public:
      */
     void cancelDirectoryLoading();
 
      */
     void cancelDirectoryLoading();
 

-    virtual int count() const Q_DECL_OVERRIDE;
-    virtual QHash<QByteArray, QVariant> data(int index) const Q_DECL_OVERRIDE;
-    virtual bool setData(int index, const QHash<QByteArray, QVariant>& values) Q_DECL_OVERRIDE;
+    int count() const override;
+    QHash<QByteArray, QVariant> data(int index) const 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


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

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

 
 

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

 
 

-    virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE;
+    bool supportsDropping(int index) const override;

 
 

-    virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE;
+    QString roleDescription(const QByteArray& role) const override;

 
 

-    virtual QList<QPair<int, QVariant> > groups() const Q_DECL_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


@@ -154,10 +157,10 @@ public:
     void setRoles(const QSet<QByteArray>& roles);
     QSet<QByteArray> roles() const;
 
     void setRoles(const QSet<QByteArray>& roles);
     QSet<QByteArray> roles() const;
 

-    virtual bool setExpanded(int index, bool expanded) Q_DECL_OVERRIDE;
-    virtual bool isExpanded(int index) const Q_DECL_OVERRIDE;
-    virtual bool isExpandable(int index) const Q_DECL_OVERRIDE;
-    virtual int expandedParentsCount(int index) const Q_DECL_OVERRIDE;
+    bool setExpanded(int index, bool expanded) override;
+    bool isExpanded(int index) const override;
+    bool isExpandable(int index) const override;
+    int expandedParentsCount(int index) const override;

 
     QSet<QUrl> expandedDirectories() const;
 
 
     QSet<QUrl> expandedDirectories() const;
 


@@ -256,9 +259,9 @@ signals:
     void urlIsFileError(const QUrl& url);
 
 protected:
     void urlIsFileError(const QUrl& url);
 
 protected:

-    virtual void onGroupedSortingChanged(bool current) Q_DECL_OVERRIDE;
-    virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE;
-    virtual void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) Q_DECL_OVERRIDE;
+    void onGroupedSortingChanged(bool current) override;
+    void onSortRoleChanged(const QByteArray& current, const QByteArray& previous, bool resortItems = true) override;
+    void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) override;

 
 private slots:
     /**
 
 private slots:
     /**


@@ -280,12 +283,12 @@ private slots:
 private:
     enum RoleType {
         // User visible roles:
 private:
     enum RoleType {
         // User visible roles:

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

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

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

         // Non-visible roles:
         IsDirRole, IsLinkRole, IsHiddenRole, IsExpandedRole, IsExpandableRole, ExpandedParentsCountRole,
         // Mandatory last entry:
         // Non-visible roles:
         IsDirRole, IsLinkRole, IsHiddenRole, IsExpandedRole, IsExpandableRole, ExpandedParentsCountRole,
         // Mandatory last entry:


@@ -368,7 +371,7 @@ private:
      * 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(QList<ItemData*>::iterator begin, 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
 
     /**
      * Helper method for lessThan() and expandedParentsCountCompare(): Compares


@@ -379,11 +382,9 @@ private:
 
     int stringCompare(const QString& a, const QString& b, const QCollator& collator) const;
 
 
     int stringCompare(const QString& a, const QString& b, const QCollator& collator) const;
 

-    bool useMaximumUpdateInterval() const;
-

     QList<QPair<int, QVariant> > nameRoleGroups() const;
     QList<QPair<int, QVariant> > sizeRoleGroups() const;
     QList<QPair<int, QVariant> > nameRoleGroups() const;
     QList<QPair<int, QVariant> > sizeRoleGroups() const;

-    QList<QPair<int, QVariant> > timeRoleGroups(KFileItem::FileTimes which) 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> > permissionRoleGroups() const;
     QList<QPair<int, QVariant> > ratingRoleGroups() const;
     QList<QPair<int, QVariant> > genericStringRoleGroups(const QByteArray& typeForRole) const;


@@ -496,7 +497,6 @@ 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 KFileItemModelLessThan;       // Accesses lessThan() method

     friend class KFileItemModelRolesUpdater;   // Accesses emitSortProgress() method
     friend class KFileItemModelTest;           // For unit testing
     friend class KFileItemModelBenchmark;      // For unit testing
     friend class KFileItemModelRolesUpdater;   // Accesses emitSortProgress() method
     friend class KFileItemModelTest;           // For unit testing
     friend class KFileItemModelBenchmark;      // For unit testing