Port to Qt6

[dolphin.git] / src / kitemviews / kfileitemmodelrolesupdater.cpp

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index d9594de4178f8a19ff268b0fb9d41a5435d7ce10..4ff7306524af7d6fac143667abbc83d43d80f95b 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -13,7 +13,6 @@
 
 #include <KConfig>
 #include <KConfigGroup>
 
 #include <KConfig>
 #include <KConfigGroup>

-#include <KIO/JobUiDelegate>

 #include <KIO/PreviewJob>
 #include <KIconLoader>
 #include <KJobWidgets>
 #include <KIO/PreviewJob>
 #include <KIconLoader>
 #include <KJobWidgets>


@@ -21,71 +20,74 @@
 #include <KPluginMetaData>
 #include <KSharedConfig>
 
 #include <KPluginMetaData>
 #include <KSharedConfig>
 

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

 #include "private/kbaloorolesprovider.h"
 #include <Baloo/File>
 #include <Baloo/FileMonitor>
 #endif
 
 #include <QApplication>
 #include "private/kbaloorolesprovider.h"
 #include <Baloo/File>
 #include <Baloo/FileMonitor>
 #endif
 
 #include <QApplication>

+#include <QElapsedTimer>

 #include <QFileInfo>
 #include <QFileInfo>

-#include <QIcon>

 #include <QPainter>
 #include <QPluginLoader>
 #include <QPainter>
 #include <QPluginLoader>

-#include <QElapsedTimer>

 #include <QTimer>
 #include <QTimer>

+#include <chrono>
+
+using namespace std::chrono_literals;

 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
 
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
 

-namespace {
-    // Maximum time in ms that the KFileItemModelRolesUpdater
-    // may perform a blocking operation
-    const int MaxBlockTimeout = 200;
+namespace
+{
+// Maximum time in ms that the KFileItemModelRolesUpdater
+// may perform a blocking operation
+const int MaxBlockTimeout = 200;

 
 

-    // If the number of items is smaller than ResolveAllItemsLimit,
-    // the roles of all items will be resolved.
-    const int ResolveAllItemsLimit = 500;
+// If the number of items is smaller than ResolveAllItemsLimit,
+// the roles of all items will be resolved.
+const int ResolveAllItemsLimit = 500;

 
 

-    // Not only the visible area, but up to ReadAheadPages before and after
-    // this area will be resolved.
-    const int ReadAheadPages = 5;
+// Not only the visible area, but up to ReadAheadPages before and after
+// this area will be resolved.
+const int ReadAheadPages = 5;

 }
 
 }
 

-KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QObject* parent) :
-    QObject(parent),
-    m_state(Idle),
-    m_previewChangedDuringPausing(false),
-    m_iconSizeChangedDuringPausing(false),
-    m_rolesChangedDuringPausing(false),
-    m_previewShown(false),
-    m_enlargeSmallPreviews(true),
-    m_clearPreviews(false),
-    m_finishedItems(),
-    m_model(model),
-    m_iconSize(),
-    m_firstVisibleIndex(0),
-    m_lastVisibleIndex(-1),
-    m_maximumVisibleItems(50),
-    m_roles(),
-    m_resolvableRoles(),
-    m_enabledPlugins(),
-    m_localFileSizePreviewLimit(0),
-    m_scanDirectories(true),
-    m_pendingSortRoleItems(),
-    m_pendingIndexes(),
-    m_pendingPreviewItems(),
-    m_previewJob(),
-    m_hoverSequenceItem(),
-    m_hoverSequenceIndex(0),
-    m_hoverSequencePreviewJob(nullptr),
-    m_hoverSequenceNumSuccessiveFailures(0),
-    m_recentlyChangedItemsTimer(nullptr),
-    m_recentlyChangedItems(),
-    m_changedItems(),
-    m_directoryContentsCounter(nullptr)
-  #ifdef HAVE_BALOO
-   , m_balooFileMonitor(nullptr)
-  #endif
+KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel *model, QObject *parent)
+    : QObject(parent)
+    , m_state(Idle)
+    , m_previewChangedDuringPausing(false)
+    , m_iconSizeChangedDuringPausing(false)
+    , m_rolesChangedDuringPausing(false)
+    , m_previewShown(false)
+    , m_enlargeSmallPreviews(true)
+    , m_clearPreviews(false)
+    , m_finishedItems()
+    , m_model(model)
+    , m_iconSize()
+    , m_firstVisibleIndex(0)
+    , m_lastVisibleIndex(-1)
+    , m_maximumVisibleItems(50)
+    , m_roles()
+    , m_resolvableRoles()
+    , m_enabledPlugins()
+    , m_localFileSizePreviewLimit(0)
+    , m_scanDirectories(true)
+    , m_pendingSortRoleItems()
+    , m_pendingIndexes()
+    , m_pendingPreviewItems()
+    , m_previewJob()
+    , m_hoverSequenceItem()
+    , m_hoverSequenceIndex(0)
+    , m_hoverSequencePreviewJob(nullptr)
+    , m_hoverSequenceNumSuccessiveFailures(0)
+    , m_recentlyChangedItemsTimer(nullptr)
+    , m_recentlyChangedItems()
+    , m_changedItems()
+    , m_directoryContentsCounter(nullptr)
+#if HAVE_BALOO
+    , m_balooFileMonitor(nullptr)
+#endif

 {
     Q_ASSERT(model);
 
 {
     Q_ASSERT(model);
 


@@ -93,36 +95,31 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO
     m_enabledPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());
     m_localFileSizePreviewLimit = static_cast<qulonglong>(globalConfig.readEntry("MaximumSize", 0));
 
     m_enabledPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());
     m_localFileSizePreviewLimit = static_cast<qulonglong>(globalConfig.readEntry("MaximumSize", 0));
 

-    connect(m_model, &KFileItemModel::itemsInserted,
-            this,    &KFileItemModelRolesUpdater::slotItemsInserted);
-    connect(m_model, &KFileItemModel::itemsRemoved,
-            this,    &KFileItemModelRolesUpdater::slotItemsRemoved);
-    connect(m_model, &KFileItemModel::itemsChanged,
-            this,    &KFileItemModelRolesUpdater::slotItemsChanged);
-    connect(m_model, &KFileItemModel::itemsMoved,
-            this,    &KFileItemModelRolesUpdater::slotItemsMoved);
-    connect(m_model, &KFileItemModel::sortRoleChanged,
-            this,    &KFileItemModelRolesUpdater::slotSortRoleChanged);
+    connect(m_model, &KFileItemModel::itemsInserted, this, &KFileItemModelRolesUpdater::slotItemsInserted);
+    connect(m_model, &KFileItemModel::itemsRemoved, this, &KFileItemModelRolesUpdater::slotItemsRemoved);
+    connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);
+    connect(m_model, &KFileItemModel::itemsMoved, this, &KFileItemModelRolesUpdater::slotItemsMoved);
+    connect(m_model, &KFileItemModel::sortRoleChanged, this, &KFileItemModelRolesUpdater::slotSortRoleChanged);

 
     // Use a timer to prevent that each call of slotItemsChanged() results in a synchronous
     // resolving of the roles. Postpone the resolving until no update has been done for 100 ms.
     m_recentlyChangedItemsTimer = new QTimer(this);
 
     // Use a timer to prevent that each call of slotItemsChanged() results in a synchronous
     // resolving of the roles. Postpone the resolving until no update has been done for 100 ms.
     m_recentlyChangedItemsTimer = new QTimer(this);

-    m_recentlyChangedItemsTimer->setInterval(100);
+    m_recentlyChangedItemsTimer->setInterval(100ms);

     m_recentlyChangedItemsTimer->setSingleShot(true);
     connect(m_recentlyChangedItemsTimer, &QTimer::timeout, this, &KFileItemModelRolesUpdater::resolveRecentlyChangedItems);
 
     m_resolvableRoles.insert("size");
     m_resolvableRoles.insert("type");
     m_resolvableRoles.insert("isExpandable");
     m_recentlyChangedItemsTimer->setSingleShot(true);
     connect(m_recentlyChangedItemsTimer, &QTimer::timeout, this, &KFileItemModelRolesUpdater::resolveRecentlyChangedItems);
 
     m_resolvableRoles.insert("size");
     m_resolvableRoles.insert("type");
     m_resolvableRoles.insert("isExpandable");

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     m_resolvableRoles += KBalooRolesProvider::instance().roles();
 #endif
 
     m_directoryContentsCounter = new KDirectoryContentsCounter(m_model, this);
     m_resolvableRoles += KBalooRolesProvider::instance().roles();
 #endif
 
     m_directoryContentsCounter = new KDirectoryContentsCounter(m_model, this);

-    connect(m_directoryContentsCounter, &KDirectoryContentsCounter::result,
-            this,                       &KFileItemModelRolesUpdater::slotDirectoryContentsCountReceived);
+    connect(m_directoryContentsCounter, &KDirectoryContentsCounter::result, this, &KFileItemModelRolesUpdater::slotDirectoryContentsCountReceived);

 
 

-    const auto plugins = KPluginMetaData::findPlugins(QStringLiteral("kf5/overlayicon"));
+    const QString pluginNamespace = QStringLiteral("kf" QT_STRINGIFY(QT_MAJOR_VERSION)) + QStringLiteral("/overlayicon");
+    const auto plugins = KPluginMetaData::findPlugins(pluginNamespace, {}, KPluginMetaData::AllowEmptyMetaData);

     for (const KPluginMetaData &data : plugins) {
         auto instance = QPluginLoader(data.fileName()).instance();
         auto plugin = qobject_cast<KOverlayIconPlugin *>(instance);
     for (const KPluginMetaData &data : plugins) {
         auto instance = QPluginLoader(data.fileName()).instance();
         auto plugin = qobject_cast<KOverlayIconPlugin *>(instance);


@@ -141,7 +138,7 @@ KFileItemModelRolesUpdater::~KFileItemModelRolesUpdater()
     killPreviewJob();
 }
 
     killPreviewJob();
 }
 

-void KFileItemModelRolesUpdater::setIconSize(const QSize& size)
+void KFileItemModelRolesUpdater::setIconSize(const QSize &size)

 {
     if (size != m_iconSize) {
         m_iconSize = size;
 {
     if (size != m_iconSize) {
         m_iconSize = size;


@@ -220,7 +217,7 @@ bool KFileItemModelRolesUpdater::enlargeSmallPreviews() const
     return m_enlargeSmallPreviews;
 }
 
     return m_enlargeSmallPreviews;
 }
 

-void KFileItemModelRolesUpdater::setEnabledPlugins(const QStringList& list)
+void KFileItemModelRolesUpdater::setEnabledPlugins(const QStringList &list)

 {
     if (m_enabledPlugins != list) {
         m_enabledPlugins = list;
 {
     if (m_enabledPlugins != list) {
         m_enabledPlugins = list;


@@ -240,8 +237,7 @@ void KFileItemModelRolesUpdater::setPaused(bool paused)
         m_state = Paused;
         killPreviewJob();
     } else {
         m_state = Paused;
         killPreviewJob();
     } else {

-        const bool updatePreviews = (m_iconSizeChangedDuringPausing && m_previewShown) ||
-                                    m_previewChangedDuringPausing;
+        const bool updatePreviews = (m_iconSizeChangedDuringPausing && m_previewShown) || m_previewChangedDuringPausing;

         const bool resolveAll = updatePreviews || m_rolesChangedDuringPausing;
         if (resolveAll) {
             m_finishedItems.clear();
         const bool resolveAll = updatePreviews || m_rolesChangedDuringPausing;
         if (resolveAll) {
             m_finishedItems.clear();


@@ -262,21 +258,21 @@ void KFileItemModelRolesUpdater::setPaused(bool paused)
     }
 }
 
     }
 }
 

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

 {
     if (m_roles != roles) {
         m_roles = roles;
 
 {
     if (m_roles != roles) {
         m_roles = roles;
 

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

         // Check whether there is at least one role that must be resolved
         // with the help of Baloo. If this is the case, a (quite expensive)
         // resolving will be done in KFileItemModelRolesUpdater::rolesData() and
         // the role gets watched for changes.
         // Check whether there is at least one role that must be resolved
         // with the help of Baloo. If this is the case, a (quite expensive)
         // resolving will be done in KFileItemModelRolesUpdater::rolesData() and
         // the role gets watched for changes.

-        const KBalooRolesProvider& rolesProvider = KBalooRolesProvider::instance();
+        const KBalooRolesProvider &rolesProvider = KBalooRolesProvider::instance();

         bool hasBalooRole = false;
         QSetIterator<QByteArray> it(roles);
         while (it.hasNext()) {
         bool hasBalooRole = false;
         QSetIterator<QByteArray> it(roles);
         while (it.hasNext()) {

-            const QByteArray& role = it.next();
+            const QByteArray &role = it.next();

             if (rolesProvider.roles().contains(role)) {
                 hasBalooRole = true;
                 break;
             if (rolesProvider.roles().contains(role)) {
                 hasBalooRole = true;
                 break;


@@ -285,8 +281,7 @@ void KFileItemModelRolesUpdater::setRoles(const QSet<QByteArray>& roles)
 
         if (hasBalooRole && m_balooConfig.fileIndexingEnabled() && !m_balooFileMonitor) {
             m_balooFileMonitor = new Baloo::FileMonitor(this);
 
         if (hasBalooRole && m_balooConfig.fileIndexingEnabled() && !m_balooFileMonitor) {
             m_balooFileMonitor = new Baloo::FileMonitor(this);

-            connect(m_balooFileMonitor, &Baloo::FileMonitor::fileMetaDataChanged,
-                    this, &KFileItemModelRolesUpdater::applyChangedBalooRoles);
+            connect(m_balooFileMonitor, &Baloo::FileMonitor::fileMetaDataChanged, this, &KFileItemModelRolesUpdater::applyChangedBalooRoles);

         } else if (!hasBalooRole && m_balooFileMonitor) {
             delete m_balooFileMonitor;
             m_balooFileMonitor = nullptr;
         } else if (!hasBalooRole && m_balooFileMonitor) {
             delete m_balooFileMonitor;
             m_balooFileMonitor = nullptr;


@@ -336,7 +331,7 @@ bool KFileItemModelRolesUpdater::scanDirectories() const
     return m_scanDirectories;
 }
 
     return m_scanDirectories;
 }
 

-void KFileItemModelRolesUpdater::setHoverSequenceState(const QUrl& itemUrl, int seqIdx)
+void KFileItemModelRolesUpdater::setHoverSequenceState(const QUrl &itemUrl, int seqIdx)

 {
     const KFileItem item = m_model->fileItem(itemUrl);
 
 {
     const KFileItem item = m_model->fileItem(itemUrl);
 


@@ -356,7 +351,7 @@ void KFileItemModelRolesUpdater::setHoverSequenceState(const QUrl& itemUrl, int
     loadNextHoverSequencePreview();
 }
 
     loadNextHoverSequencePreview();
 }
 

-void KFileItemModelRolesUpdater::slotItemsInserted(const KItemRangeList& itemRanges)
+void KFileItemModelRolesUpdater::slotItemsInserted(const KItemRangeList &itemRanges)

 {
     QElapsedTimer timer;
     timer.start();
 {
     QElapsedTimer timer;
     timer.start();


@@ -364,7 +359,7 @@ void KFileItemModelRolesUpdater::slotItemsInserted(const KItemRangeList& itemRan
     // Determine the sort role synchronously for as many items as possible.
     if (m_resolvableRoles.contains(m_model->sortRole())) {
         int insertedCount = 0;
     // Determine the sort role synchronously for as many items as possible.
     if (m_resolvableRoles.contains(m_model->sortRole())) {
         int insertedCount = 0;

-        for (const KItemRange& range : itemRanges) {
+        for (const KItemRange &range : itemRanges) {

             const int lastIndex = insertedCount + range.index + range.count - 1;
             for (int i = insertedCount + range.index; i <= lastIndex; ++i) {
                 if (timer.elapsed() < MaxBlockTimeout) {
             const int lastIndex = insertedCount + range.index + range.count - 1;
             for (int i = insertedCount + range.index; i <= lastIndex; ++i) {
                 if (timer.elapsed() < MaxBlockTimeout) {


@@ -391,13 +386,13 @@ void KFileItemModelRolesUpdater::slotItemsInserted(const KItemRangeList& itemRan
     startUpdating();
 }
 
     startUpdating();
 }
 

-void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRanges)
+void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList &itemRanges)

 {
     Q_UNUSED(itemRanges)
 
     const bool allItemsRemoved = (m_model->count() == 0);
 
 {
     Q_UNUSED(itemRanges)
 
     const bool allItemsRemoved = (m_model->count() == 0);
 

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     if (m_balooFileMonitor) {
         // Don't let the FileWatcher watch for removed items
         if (allItemsRemoved) {
     if (m_balooFileMonitor) {
         // Don't let the FileWatcher watch for removed items
         if (allItemsRemoved) {


@@ -405,7 +400,7 @@ void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRang
         } else {
             QStringList newFileList;
             const QStringList oldFileList = m_balooFileMonitor->files();
         } else {
             QStringList newFileList;
             const QStringList oldFileList = m_balooFileMonitor->files();

-            for (const QString& file : oldFileList) {
+            for (const QString &file : oldFileList) {

                 if (m_model->index(QUrl::fromLocalFile(file)) >= 0) {
                     newFileList.append(file);
                 }
                 if (m_model->index(QUrl::fromLocalFile(file)) >= 0) {
                     newFileList.append(file);
                 }


@@ -428,6 +423,10 @@ void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRang
         m_hoverSequenceLoadedItems.clear();
 
         killPreviewJob();
         m_hoverSequenceLoadedItems.clear();
 
         killPreviewJob();

+
+        if (m_scanDirectories) {
+            m_directoryContentsCounter->stopWorker();
+        }

     } else {
         // Only remove the items from m_finishedItems. They will be removed
         // from the other sets later on.
     } else {
         // Only remove the items from m_finishedItems. They will be removed
         // from the other sets later on.


@@ -441,7 +440,7 @@ void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRang
         }
 
         // Removed items won't have hover previews loaded anymore.
         }
 
         // Removed items won't have hover previews loaded anymore.

-        for (const KItemRange& itemRange : itemRanges) {
+        for (const KItemRange &itemRange : itemRanges) {

             int index = itemRange.index;
             for (int count = itemRange.count; count > 0; --count) {
                 const KFileItem item = m_model->fileItem(index);
             int index = itemRange.index;
             for (int count = itemRange.count; count > 0; --count) {
                 const KFileItem item = m_model->fileItem(index);


@@ -455,7 +454,7 @@ void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRang
     }
 }
 
     }
 }
 

-void KFileItemModelRolesUpdater::slotItemsMoved(const KItemRange& itemRange, const QList<int> &movedToIndexes)
+void KFileItemModelRolesUpdater::slotItemsMoved(KItemRange itemRange, const QList<int> &movedToIndexes)

 {
     Q_UNUSED(itemRange)
     Q_UNUSED(movedToIndexes)
 {
     Q_UNUSED(itemRange)
     Q_UNUSED(movedToIndexes)


@@ -464,8 +463,7 @@ void KFileItemModelRolesUpdater::slotItemsMoved(const KItemRange& itemRange, con
     startUpdating();
 }
 
     startUpdating();
 }
 

-void KFileItemModelRolesUpdater::slotItemsChanged(const KItemRangeList& itemRanges,
-                                                  const QSet<QByteArray>& roles)
+void KFileItemModelRolesUpdater::slotItemsChanged(const KItemRangeList &itemRanges, const QSet<QByteArray> &roles)

 {
     Q_UNUSED(roles)
 
 {
     Q_UNUSED(roles)
 


@@ -474,9 +472,9 @@ void KFileItemModelRolesUpdater::slotItemsChanged(const KItemRangeList& itemRang
     // to prevent expensive repeated updates if files are updated frequently.
     const bool itemsChangedRecently = m_recentlyChangedItemsTimer->isActive();
 
     // to prevent expensive repeated updates if files are updated frequently.
     const bool itemsChangedRecently = m_recentlyChangedItemsTimer->isActive();
 

-    QSet<KFileItem>& targetSet = itemsChangedRecently ? m_recentlyChangedItems : m_changedItems;
+    QSet<KFileItem> &targetSet = itemsChangedRecently ? m_recentlyChangedItems : m_changedItems;

 
 

-    for (const KItemRange& itemRange : itemRanges) {
+    for (const KItemRange &itemRange : itemRanges) {

         int index = itemRange.index;
         for (int count = itemRange.count; count > 0; --count) {
             const KFileItem item = m_model->fileItem(index);
         int index = itemRange.index;
         for (int count = itemRange.count; count > 0; --count) {
             const KFileItem item = m_model->fileItem(index);


@@ -492,8 +490,7 @@ void KFileItemModelRolesUpdater::slotItemsChanged(const KItemRangeList& itemRang
     }
 }
 
     }
 }
 

-void KFileItemModelRolesUpdater::slotSortRoleChanged(const QByteArray& current,
-                                                     const QByteArray& previous)
+void KFileItemModelRolesUpdater::slotSortRoleChanged(const QByteArray &current, const QByteArray &previous)

 {
     Q_UNUSED(current)
     Q_UNUSED(previous)
 {
     Q_UNUSED(current)
     Q_UNUSED(previous)


@@ -530,7 +527,7 @@ void KFileItemModelRolesUpdater::slotSortRoleChanged(const QByteArray& current,
     }
 }
 
     }
 }
 

-void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPixmap& pixmap)
+void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem &item, const QPixmap &pixmap)

 {
     if (m_state != PreviewJobRunning) {
         return;
 {
     if (m_state != PreviewJobRunning) {
         return;


@@ -545,7 +542,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
 
     QPixmap scaledPixmap = transformPreviewPixmap(pixmap);
 
 
     QPixmap scaledPixmap = transformPreviewPixmap(pixmap);
 

-    QHash<QByteArray, QVariant> data = rolesData(item);
+    QHash<QByteArray, QVariant> data = rolesData(item, index);

 
     const QStringList overlays = data["iconOverlays"].toStringList();
     // Strangely KFileItem::overlays() returns empty string-values, so
 
     const QStringList overlays = data["iconOverlays"].toStringList();
     // Strangely KFileItem::overlays() returns empty string-values, so


@@ -554,7 +551,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
     // assumes that an overlay will be drawn and has some additional
     // setup time.
     if (!scaledPixmap.isNull()) {
     // assumes that an overlay will be drawn and has some additional
     // setup time.
     if (!scaledPixmap.isNull()) {

-        for (const QString& overlay : overlays) {
+        for (const QString &overlay : overlays) {

             if (!overlay.isEmpty()) {
                 // There is at least one overlay, draw all overlays above m_pixmap
                 // and cancel the check
             if (!overlay.isEmpty()) {
                 // There is at least one overlay, draw all overlays above m_pixmap
                 // and cancel the check


@@ -566,16 +563,14 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
 
     data.insert("iconPixmap", scaledPixmap);
 
 
     data.insert("iconPixmap", scaledPixmap);
 

-    disconnect(m_model, &KFileItemModel::itemsChanged,
-               this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+    disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

     m_model->setData(index, data);
     m_model->setData(index, data);

-    connect(m_model, &KFileItemModel::itemsChanged,
-            this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+    connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

 
     m_finishedItems.insert(item);
 }
 
 
     m_finishedItems.insert(item);
 }
 

-void KFileItemModelRolesUpdater::slotPreviewFailed(const KFileItem& item)
+void KFileItemModelRolesUpdater::slotPreviewFailed(const KFileItem &item)

 {
     if (m_state != PreviewJobRunning) {
         return;
 {
     if (m_state != PreviewJobRunning) {
         return;


@@ -588,11 +583,9 @@ void KFileItemModelRolesUpdater::slotPreviewFailed(const KFileItem& item)
         QHash<QByteArray, QVariant> data;
         data.insert("iconPixmap", QPixmap());
 
         QHash<QByteArray, QVariant> data;
         data.insert("iconPixmap", QPixmap());
 

-        disconnect(m_model, &KFileItemModel::itemsChanged,
-                   this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+        disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

         m_model->setData(index, data);
         m_model->setData(index, data);

-        connect(m_model, &KFileItemModel::itemsChanged,
-                this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+        connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

 
         applyResolvedRoles(index, ResolveAll);
         m_finishedItems.insert(item);
 
         applyResolvedRoles(index, ResolveAll);
         m_finishedItems.insert(item);


@@ -618,7 +611,7 @@ void KFileItemModelRolesUpdater::slotPreviewJobFinished()
     }
 }
 
     }
 }
 

-void KFileItemModelRolesUpdater::slotHoverSequenceGotPreview(const KFileItem& item, const QPixmap& pixmap)
+void KFileItemModelRolesUpdater::slotHoverSequenceGotPreview(const KFileItem &item, const QPixmap &pixmap)

 {
     const int index = m_model->index(item);
     if (index < 0) {
 {
     const int index = m_model->index(item);
     if (index < 0) {


@@ -652,8 +645,7 @@ void KFileItemModelRolesUpdater::slotHoverSequenceGotPreview(const KFileItem& it
 
         m_model->setData(index, data);
 
 
         m_model->setData(index, data);
 

-        const auto loadedIt = std::find(m_hoverSequenceLoadedItems.begin(),
-                m_hoverSequenceLoadedItems.end(), item);
+        const auto loadedIt = std::find(m_hoverSequenceLoadedItems.begin(), m_hoverSequenceLoadedItems.end(), item);

         if (loadedIt == m_hoverSequenceLoadedItems.end()) {
             m_hoverSequenceLoadedItems.push_back(item);
             trimHoverSequenceLoadedItems();
         if (loadedIt == m_hoverSequenceLoadedItems.end()) {
             m_hoverSequenceLoadedItems.push_back(item);
             trimHoverSequenceLoadedItems();


@@ -663,7 +655,7 @@ void KFileItemModelRolesUpdater::slotHoverSequenceGotPreview(const KFileItem& it
     m_hoverSequenceNumSuccessiveFailures = 0;
 }
 
     m_hoverSequenceNumSuccessiveFailures = 0;
 }
 

-void KFileItemModelRolesUpdater::slotHoverSequencePreviewFailed(const KFileItem& item)
+void KFileItemModelRolesUpdater::slotHoverSequencePreviewFailed(const KFileItem &item)

 {
     const int index = m_model->index(item);
     if (index < 0) {
 {
     const int index = m_model->index(item);
     if (index < 0) {


@@ -675,11 +667,8 @@ void KFileItemModelRolesUpdater::slotHoverSequencePreviewFailed(const KFileItem&
     QHash<QByteArray, QVariant> data = m_model->data(index);
     QVector<QPixmap> pixmaps = data["hoverSequencePixmaps"].value<QVector<QPixmap>>();
 
     QHash<QByteArray, QVariant> data = m_model->data(index);
     QVector<QPixmap> pixmaps = data["hoverSequencePixmaps"].value<QVector<QPixmap>>();
 

-    qCDebug(DolphinDebug).nospace()
-            << "Failed to generate hover sequence preview #" << pixmaps.size()
-            << " for file " << item.url().toString()
-            << " (attempt " << (m_hoverSequenceNumSuccessiveFailures+1)
-            << "/" << (numRetries+1) << ")";
+    qCDebug(DolphinDebug).nospace() << "Failed to generate hover sequence preview #" << pixmaps.size() << " for file " << item.url().toString() << " (attempt "
+                                    << (m_hoverSequenceNumSuccessiveFailures + 1) << "/" << (numRetries + 1) << ")";

 
     if (m_hoverSequenceNumSuccessiveFailures >= numRetries) {
         // Give up and simply duplicate the previous sequence image (if any)
 
     if (m_hoverSequenceNumSuccessiveFailures >= numRetries) {
         // Give up and simply duplicate the previous sequence image (if any)


@@ -754,11 +743,9 @@ void KFileItemModelRolesUpdater::resolveNextSortRole()
         m_state = Idle;
 
         // Prevent that we try to update the items twice.
         m_state = Idle;
 
         // Prevent that we try to update the items twice.

-        disconnect(m_model, &KFileItemModel::itemsMoved,
-                   this,    &KFileItemModelRolesUpdater::slotItemsMoved);
+        disconnect(m_model, &KFileItemModel::itemsMoved, this, &KFileItemModelRolesUpdater::slotItemsMoved);

         applySortProgressToModel();
         applySortProgressToModel();

-        connect(m_model, &KFileItemModel::itemsMoved,
-                this,    &KFileItemModelRolesUpdater::slotItemsMoved);
+        connect(m_model, &KFileItemModel::itemsMoved, this, &KFileItemModelRolesUpdater::slotItemsMoved);

         startUpdating();
     }
 }
         startUpdating();
     }
 }


@@ -795,18 +782,13 @@ void KFileItemModelRolesUpdater::resolveNextPendingRoles()
                 data.insert("iconPixmap", QPixmap());
                 data.insert("hoverSequencePixmaps", QVariant::fromValue(QVector<QPixmap>()));
 
                 data.insert("iconPixmap", QPixmap());
                 data.insert("hoverSequencePixmaps", QVariant::fromValue(QVector<QPixmap>()));
 

-                disconnect(m_model, &KFileItemModel::itemsChanged,
-                           this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+                disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

                 for (int index = 0; index <= m_model->count(); ++index) {
                 for (int index = 0; index <= m_model->count(); ++index) {

-                    if (m_model->data(index).contains("iconPixmap") ||
-                        m_model->data(index).contains("hoverSequencePixmaps"))
-                    {
+                    if (m_model->data(index).contains("iconPixmap") || m_model->data(index).contains("hoverSequencePixmaps")) {

                         m_model->setData(index, data);
                     }
                 }
                         m_model->setData(index, data);
                     }
                 }

-                connect(m_model, &KFileItemModel::itemsChanged,
-                        this,    &KFileItemModelRolesUpdater::slotItemsChanged);
-
+                connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

             }
             m_clearPreviews = false;
         }
             }
             m_clearPreviews = false;
         }


@@ -824,9 +806,9 @@ void KFileItemModelRolesUpdater::resolveRecentlyChangedItems()
     updateChangedItems();
 }
 
     updateChangedItems();
 }
 

-void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& file)
+void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString &file)

 {
 {

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     const KFileItem item = m_model->fileItem(QUrl::fromLocalFile(file));
 
     if (item.isNull()) {
     const KFileItem item = m_model->fileItem(QUrl::fromLocalFile(file));
 
     if (item.isNull()) {


@@ -842,15 +824,15 @@ void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& file)
 
 void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &item)
 {
 
 void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &item)
 {

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     Baloo::File file(item.localPath());
     file.load();
 
     Baloo::File file(item.localPath());
     file.load();
 

-    const KBalooRolesProvider& rolesProvider = KBalooRolesProvider::instance();
+    const KBalooRolesProvider &rolesProvider = KBalooRolesProvider::instance();

     QHash<QByteArray, QVariant> data;
 
     const auto roles = rolesProvider.roles();
     QHash<QByteArray, QVariant> data;
 
     const auto roles = rolesProvider.roles();

-    for (const QByteArray& role : roles) {
+    for (const QByteArray &role : roles) {

         // Overwrite all the role values with an empty QVariant, because the roles
         // provider doesn't overwrite it when the property value list is empty.
         // See bug 322348
         // Overwrite all the role values with an empty QVariant, because the roles
         // provider doesn't overwrite it when the property value list is empty.
         // See bug 322348


@@ -863,12 +845,10 @@ void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &
         data.insert(it.key(), it.value());
     }
 
         data.insert(it.key(), it.value());
     }
 

-    disconnect(m_model, &KFileItemModel::itemsChanged,
-               this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+    disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

     const int index = m_model->index(item);
     m_model->setData(index, data);
     const int index = m_model->index(item);
     m_model->setData(index, data);

-    connect(m_model, &KFileItemModel::itemsChanged,
-            this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+    connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

 #else
 #ifndef Q_CC_MSVC
     Q_UNUSED(item)
 #else
 #ifndef Q_CC_MSVC
     Q_UNUSED(item)


@@ -876,7 +856,7 @@ void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &
 #endif
 }
 
 #endif
 }
 

-void KFileItemModelRolesUpdater::slotDirectoryContentsCountReceived(const QString& path, int count, long size)
+void KFileItemModelRolesUpdater::slotDirectoryContentsCountReceived(const QString &path, int count, long size)

 {
     const bool getSizeRole = m_roles.contains("size");
     const bool getIsExpandableRole = m_roles.contains("isExpandable");
 {
     const bool getSizeRole = m_roles.contains("size");
     const bool getIsExpandableRole = m_roles.contains("isExpandable");


@@ -894,11 +874,9 @@ void KFileItemModelRolesUpdater::slotDirectoryContentsCountReceived(const QStrin
                 data.insert("isExpandable", count > 0);
             }
 
                 data.insert("isExpandable", count > 0);
             }
 

-            disconnect(m_model, &KFileItemModel::itemsChanged,
-                       this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+            disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

             m_model->setData(index, data);
             m_model->setData(index, data);

-            connect(m_model, &KFileItemModel::itemsChanged,
-                       this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+            connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

         }
     }
 }
         }
     }
 }


@@ -994,8 +972,7 @@ void KFileItemModelRolesUpdater::startPreviewJob()
     // by PreviewJob if a smaller size is requested. For images KFileItemModelRolesUpdater must
     // do a downscaling anyhow because of the frame, so in this case only the provided
     // cache sizes are requested.
     // by PreviewJob if a smaller size is requested. For images KFileItemModelRolesUpdater must
     // do a downscaling anyhow because of the frame, so in this case only the provided
     // cache sizes are requested.

-    const QSize cacheSize = (m_iconSize.width() > 128) || (m_iconSize.height() > 128)
-                             ? QSize(256, 256) : QSize(128, 128);
+    const QSize cacheSize = (m_iconSize.width() > 128) || (m_iconSize.height() > 128) ? QSize(256, 256) : QSize(128, 128);

 
     // KIO::filePreview() will request the MIME-type of all passed items, which (in the
     // worst case) might block the application for several seconds. To prevent such
 
     // KIO::filePreview() will request the MIME-type of all passed items, which (in the
     // worst case) might block the application for several seconds. To prevent such


@@ -1025,38 +1002,32 @@ void KFileItemModelRolesUpdater::startPreviewJob()
         } while (!m_pendingPreviewItems.isEmpty() && timer.elapsed() < MaxBlockTimeout);
     }
 
         } while (!m_pendingPreviewItems.isEmpty() && timer.elapsed() < MaxBlockTimeout);
     }
 

-    KIO::PreviewJob* job = new KIO::PreviewJob(itemSubSet, cacheSize, &m_enabledPlugins);
+    KIO::PreviewJob *job = new KIO::PreviewJob(itemSubSet, cacheSize, &m_enabledPlugins);

 
     job->setIgnoreMaximumSize(itemSubSet.first().isLocalFile() && !itemSubSet.first().isSlow() && m_localFileSizePreviewLimit <= 0);
     if (job->uiDelegate()) {
         KJobWidgets::setWindow(job, qApp->activeWindow());
     }
 
 
     job->setIgnoreMaximumSize(itemSubSet.first().isLocalFile() && !itemSubSet.first().isSlow() && m_localFileSizePreviewLimit <= 0);
     if (job->uiDelegate()) {
         KJobWidgets::setWindow(job, qApp->activeWindow());
     }
 

-    connect(job,  &KIO::PreviewJob::gotPreview,
-            this, &KFileItemModelRolesUpdater::slotGotPreview);
-    connect(job,  &KIO::PreviewJob::failed,
-            this, &KFileItemModelRolesUpdater::slotPreviewFailed);
-    connect(job,  &KIO::PreviewJob::finished,
-            this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);
+    connect(job, &KIO::PreviewJob::gotPreview, this, &KFileItemModelRolesUpdater::slotGotPreview);
+    connect(job, &KIO::PreviewJob::failed, this, &KFileItemModelRolesUpdater::slotPreviewFailed);
+    connect(job, &KIO::PreviewJob::finished, this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);

 
     m_previewJob = job;
 }
 
 
     m_previewJob = job;
 }
 

-QPixmap KFileItemModelRolesUpdater::transformPreviewPixmap(const QPixmap& pixmap)
+QPixmap KFileItemModelRolesUpdater::transformPreviewPixmap(const QPixmap &pixmap)

 {
     QPixmap scaledPixmap = pixmap;
 
 {
     QPixmap scaledPixmap = pixmap;
 

-    if (!pixmap.hasAlpha() && !pixmap.isNull()
-        && m_iconSize.width()  > KIconLoader::SizeSmallMedium
-        && m_iconSize.height() > KIconLoader::SizeSmallMedium) {
+    if (!pixmap.hasAlpha() && !pixmap.isNull() && m_iconSize.width() > KIconLoader::SizeSmallMedium && m_iconSize.height() > KIconLoader::SizeSmallMedium) {

         if (m_enlargeSmallPreviews) {
             KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
         } else {
             // Assure that small previews don't get enlarged. Instead they
             // should be shown centered within the frame.
             const QSize contentSize = KPixmapModifier::sizeInsideFrame(m_iconSize);
         if (m_enlargeSmallPreviews) {
             KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
         } else {
             // Assure that small previews don't get enlarged. Instead they
             // should be shown centered within the frame.
             const QSize contentSize = KPixmapModifier::sizeInsideFrame(m_iconSize);

-            const bool enlargingRequired = scaledPixmap.width()  < contentSize.width() &&
-                                           scaledPixmap.height() < contentSize.height();
+            const bool enlargingRequired = scaledPixmap.width() < contentSize.width() && scaledPixmap.height() < contentSize.height();

             if (enlargingRequired) {
                 QSize frameSize = scaledPixmap.size() / scaledPixmap.devicePixelRatio();
                 frameSize.scale(m_iconSize, Qt::KeepAspectRatio);
             if (enlargingRequired) {
                 QSize frameSize = scaledPixmap.size() / scaledPixmap.devicePixelRatio();
                 frameSize.scale(m_iconSize, Qt::KeepAspectRatio);


@@ -1067,7 +1038,7 @@ QPixmap KFileItemModelRolesUpdater::transformPreviewPixmap(const QPixmap& pixmap
                 KPixmapModifier::applyFrame(largeFrame, frameSize);
 
                 QPainter painter(&largeFrame);
                 KPixmapModifier::applyFrame(largeFrame, frameSize);
 
                 QPainter painter(&largeFrame);

-                painter.drawPixmap((largeFrame.width()  - scaledPixmap.width() / scaledPixmap.devicePixelRatio()) / 2,
+                painter.drawPixmap((largeFrame.width() - scaledPixmap.width() / scaledPixmap.devicePixelRatio()) / 2,

                                    (largeFrame.height() - scaledPixmap.height() / scaledPixmap.devicePixelRatio()) / 2,
                                    scaledPixmap);
                 scaledPixmap = largeFrame;
                                    (largeFrame.height() - scaledPixmap.height() / scaledPixmap.devicePixelRatio()) / 2,
                                    scaledPixmap);
                 scaledPixmap = largeFrame;


@@ -1097,7 +1068,7 @@ void KFileItemModelRolesUpdater::loadNextHoverSequencePreview()
     }
 
     // We generate the next few sequence indices in advance (buffering)
     }
 
     // We generate the next few sequence indices in advance (buffering)

-    const int maxSeqIdx = m_hoverSequenceIndex+5;
+    const int maxSeqIdx = m_hoverSequenceIndex + 5;

 
     QHash<QByteArray, QVariant> data = m_model->data(index);
 
 
     QHash<QByteArray, QVariant> data = m_model->data(index);
 


@@ -1130,10 +1101,9 @@ void KFileItemModelRolesUpdater::loadNextHoverSequencePreview()
     // by PreviewJob if a smaller size is requested. For images KFileItemModelRolesUpdater must
     // do a downscaling anyhow because of the frame, so in this case only the provided
     // cache sizes are requested.
     // by PreviewJob if a smaller size is requested. For images KFileItemModelRolesUpdater must
     // do a downscaling anyhow because of the frame, so in this case only the provided
     // cache sizes are requested.

-    const QSize cacheSize = (m_iconSize.width() > 128) || (m_iconSize.height() > 128)
-                             ? QSize(256, 256) : QSize(128, 128);
+    const QSize cacheSize = (m_iconSize.width() > 128) || (m_iconSize.height() > 128) ? QSize(256, 256) : QSize(128, 128);

 
 

-    KIO::PreviewJob* job = new KIO::PreviewJob({m_hoverSequenceItem}, cacheSize, &m_enabledPlugins);
+    KIO::PreviewJob *job = new KIO::PreviewJob({m_hoverSequenceItem}, cacheSize, &m_enabledPlugins);

 
     job->setSequenceIndex(loadSeqIdx);
     job->setIgnoreMaximumSize(m_hoverSequenceItem.isLocalFile() && !m_hoverSequenceItem.isSlow() && m_localFileSizePreviewLimit <= 0);
 
     job->setSequenceIndex(loadSeqIdx);
     job->setIgnoreMaximumSize(m_hoverSequenceItem.isLocalFile() && !m_hoverSequenceItem.isSlow() && m_localFileSizePreviewLimit <= 0);


@@ -1141,12 +1111,9 @@ void KFileItemModelRolesUpdater::loadNextHoverSequencePreview()
         KJobWidgets::setWindow(job, qApp->activeWindow());
     }
 
         KJobWidgets::setWindow(job, qApp->activeWindow());
     }
 

-    connect(job,  &KIO::PreviewJob::gotPreview,
-            this, &KFileItemModelRolesUpdater::slotHoverSequenceGotPreview);
-    connect(job,  &KIO::PreviewJob::failed,
-            this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewFailed);
-    connect(job,  &KIO::PreviewJob::finished,
-            this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewJobFinished);
+    connect(job, &KIO::PreviewJob::gotPreview, this, &KFileItemModelRolesUpdater::slotHoverSequenceGotPreview);
+    connect(job, &KIO::PreviewJob::failed, this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewFailed);
+    connect(job, &KIO::PreviewJob::finished, this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewJobFinished);

 
     m_hoverSequencePreviewJob = job;
 }
 
     m_hoverSequencePreviewJob = job;
 }


@@ -1154,12 +1121,9 @@ void KFileItemModelRolesUpdater::loadNextHoverSequencePreview()
 void KFileItemModelRolesUpdater::killHoverSequencePreviewJob()
 {
     if (m_hoverSequencePreviewJob) {
 void KFileItemModelRolesUpdater::killHoverSequencePreviewJob()
 {
     if (m_hoverSequencePreviewJob) {

-        disconnect(m_hoverSequencePreviewJob,  &KIO::PreviewJob::gotPreview,
-                   this, &KFileItemModelRolesUpdater::slotHoverSequenceGotPreview);
-        disconnect(m_hoverSequencePreviewJob,  &KIO::PreviewJob::failed,
-                   this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewFailed);
-        disconnect(m_hoverSequencePreviewJob,  &KIO::PreviewJob::finished,
-                   this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewJobFinished);
+        disconnect(m_hoverSequencePreviewJob, &KIO::PreviewJob::gotPreview, this, &KFileItemModelRolesUpdater::slotHoverSequenceGotPreview);
+        disconnect(m_hoverSequencePreviewJob, &KIO::PreviewJob::failed, this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewFailed);
+        disconnect(m_hoverSequencePreviewJob, &KIO::PreviewJob::finished, this, &KFileItemModelRolesUpdater::slotHoverSequencePreviewJobFinished);

         m_hoverSequencePreviewJob->kill();
         m_hoverSequencePreviewJob = nullptr;
     }
         m_hoverSequencePreviewJob->kill();
         m_hoverSequencePreviewJob = nullptr;
     }


@@ -1198,7 +1162,7 @@ void KFileItemModelRolesUpdater::updateChangedItems()
 
     auto changedItemsIt = m_changedItems.begin();
     while (changedItemsIt != m_changedItems.end()) {
 
     auto changedItemsIt = m_changedItems.begin();
     while (changedItemsIt != m_changedItems.end()) {

-        const auto& item = *changedItemsIt;
+        const auto &item = *changedItemsIt;

         const int index = m_model->index(item);
 
         if (index < 0) {
         const int index = m_model->index(item);
 
         if (index < 0) {


@@ -1250,21 +1214,16 @@ void KFileItemModelRolesUpdater::applySortRole(int index)
         }
 
         data.insert("type", item.mimeComment());
         }
 
         data.insert("type", item.mimeComment());

-    } else if (m_model->sortRole() == "size" && item.isLocalFile() && item.isDir()) {
-        const QString path = item.localPath();
-        if (m_scanDirectories) {
-            m_directoryContentsCounter->scanDirectory(path);
-        }
+    } else if (m_model->sortRole() == "size" && item.isLocalFile() && !item.isSlow() && item.isDir()) {
+        startDirectorySizeCounting(item, index);

     } else {
         // Probably the sort role is a baloo role - just determine all roles.
     } else {
         // Probably the sort role is a baloo role - just determine all roles.

-        data = rolesData(item);
+        data = rolesData(item, index);

     }
 
     }
 

-    disconnect(m_model, &KFileItemModel::itemsChanged,
-               this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+    disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

     m_model->setData(index, data);
     m_model->setData(index, data);

-    connect(m_model, &KFileItemModel::itemsChanged,
-            this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+    connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

 }
 
 void KFileItemModelRolesUpdater::applySortProgressToModel()
 }
 
 void KFileItemModelRolesUpdater::applySortProgressToModel()


@@ -1295,7 +1254,7 @@ bool KFileItemModelRolesUpdater::applyResolvedRoles(int index, ResolveHint hint)
 
         QHash<QByteArray, QVariant> data;
         if (resolveAll) {
 
         QHash<QByteArray, QVariant> data;
         if (resolveAll) {

-            data = rolesData(item);
+            data = rolesData(item, index);

         }
 
         if (!item.iconName().isEmpty()) {
         }
 
         if (!item.iconName().isEmpty()) {


@@ -1307,35 +1266,36 @@ bool KFileItemModelRolesUpdater::applyResolvedRoles(int index, ResolveHint hint)
             data.insert("hoverSequencePixmaps", QVariant::fromValue(QVector<QPixmap>()));
         }
 
             data.insert("hoverSequencePixmaps", QVariant::fromValue(QVector<QPixmap>()));
         }
 

-        disconnect(m_model, &KFileItemModel::itemsChanged,
-                   this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+        disconnect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

         m_model->setData(index, data);
         m_model->setData(index, data);

-        connect(m_model, &KFileItemModel::itemsChanged,
-                this,    &KFileItemModelRolesUpdater::slotItemsChanged);
+        connect(m_model, &KFileItemModel::itemsChanged, this, &KFileItemModelRolesUpdater::slotItemsChanged);

         return true;
     }
 
     return false;
 }
 
         return true;
     }
 
     return false;
 }
 

-QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileItem& item)
+void KFileItemModelRolesUpdater::startDirectorySizeCounting(const KFileItem &item, int index)
+{
+    // Tell m_directoryContentsCounter that we want to count the items
+    // inside the directory. The result will be received in slotDirectoryContentsCountReceived.
+    if (m_scanDirectories && item.isLocalFile()) {
+        const QString path = item.localPath();
+        const auto priority = index >= m_firstVisibleIndex && index <= m_lastVisibleIndex ? KDirectoryContentsCounter::PathCountPriority::High
+                                                                                          : KDirectoryContentsCounter::PathCountPriority::Normal;
+        m_directoryContentsCounter->scanDirectory(path, priority);
+    }
+}
+
+QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileItem &item, int index)

 {
     QHash<QByteArray, QVariant> data;
 
     const bool getSizeRole = m_roles.contains("size");
     const bool getIsExpandableRole = m_roles.contains("isExpandable");
 
 {
     QHash<QByteArray, QVariant> data;
 
     const bool getSizeRole = m_roles.contains("size");
     const bool getIsExpandableRole = m_roles.contains("isExpandable");
 

-    if ((getSizeRole || getIsExpandableRole) && item.isDir()) {
-        if (item.isLocalFile()) {
-            // Tell m_directoryContentsCounter that we want to count the items
-            // inside the directory. The result will be received in slotDirectoryContentsCountReceived.
-            if (m_scanDirectories) {
-                const QString path = item.localPath();
-                m_directoryContentsCounter->scanDirectory(path);
-            }
-        } else if (getSizeRole) {
-            data.insert("size", -1); // -1 indicates an unknown number of items
-        }
+    if ((getSizeRole || getIsExpandableRole) && !item.isSlow() && item.isDir()) {
+        startDirectorySizeCounting(item, index);

     }
 
     if (m_roles.contains("extension")) {
     }
 
     if (m_roles.contains("extension")) {


@@ -1350,9 +1310,11 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte
     for (KOverlayIconPlugin *it : qAsConst(m_overlayIconsPlugin)) {
         overlays.append(it->getOverlays(item.url()));
     }
     for (KOverlayIconPlugin *it : qAsConst(m_overlayIconsPlugin)) {
         overlays.append(it->getOverlays(item.url()));
     }

-    data.insert("iconOverlays", overlays);
+    if (!overlays.isEmpty()) {
+        data.insert("iconOverlays", overlays);
+    }

 
 

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

     if (m_balooFileMonitor) {
         m_balooFileMonitor->addFile(item.localPath());
         applyChangedBalooRolesForItem(item);
     if (m_balooFileMonitor) {
         m_balooFileMonitor->addFile(item.localPath());
         applyChangedBalooRolesForItem(item);


@@ -1361,14 +1323,14 @@ QHash<QByteArray, QVariant> KFileItemModelRolesUpdater::rolesData(const KFileIte
     return data;
 }
 
     return data;
 }
 

-void KFileItemModelRolesUpdater::slotOverlaysChanged(const QUrl& url, const QStringList &)
+void KFileItemModelRolesUpdater::slotOverlaysChanged(const QUrl &url, const QStringList &)

 {
     const KFileItem item = m_model->fileItem(url);
     if (item.isNull()) {
         return;
     }
     const int index = m_model->index(item);
 {
     const KFileItem item = m_model->fileItem(url);
     if (item.isNull()) {
         return;
     }
     const int index = m_model->index(item);

-    QHash<QByteArray, QVariant> data =  m_model->data(index);
+    QHash<QByteArray, QVariant> data = m_model->data(index);

     QStringList overlays = item.overlays();
     for (KOverlayIconPlugin *it : qAsConst(m_overlayIconsPlugin)) {
         overlays.append(it->getOverlays(url));
     QStringList overlays = item.overlays();
     for (KOverlayIconPlugin *it : qAsConst(m_overlayIconsPlugin)) {
         overlays.append(it->getOverlays(url));


@@ -1390,12 +1352,9 @@ void KFileItemModelRolesUpdater::updateAllPreviews()
 void KFileItemModelRolesUpdater::killPreviewJob()
 {
     if (m_previewJob) {
 void KFileItemModelRolesUpdater::killPreviewJob()
 {
     if (m_previewJob) {

-        disconnect(m_previewJob,  &KIO::PreviewJob::gotPreview,
-                   this, &KFileItemModelRolesUpdater::slotGotPreview);
-        disconnect(m_previewJob,  &KIO::PreviewJob::failed,
-                   this, &KFileItemModelRolesUpdater::slotPreviewFailed);
-        disconnect(m_previewJob,  &KIO::PreviewJob::finished,
-                   this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);
+        disconnect(m_previewJob, &KIO::PreviewJob::gotPreview, this, &KFileItemModelRolesUpdater::slotGotPreview);
+        disconnect(m_previewJob, &KIO::PreviewJob::failed, this, &KFileItemModelRolesUpdater::slotPreviewFailed);
+        disconnect(m_previewJob, &KIO::PreviewJob::finished, this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);

         m_previewJob->kill();
         m_previewJob = nullptr;
         m_pendingPreviewItems.clear();
         m_previewJob->kill();
         m_previewJob = nullptr;
         m_pendingPreviewItems.clear();


@@ -1407,9 +1366,7 @@ QList<int> KFileItemModelRolesUpdater::indexesToResolve() const
     const int count = m_model->count();
 
     QList<int> result;
     const int count = m_model->count();
 
     QList<int> result;

-    result.reserve(qMin(count, (m_lastVisibleIndex - m_firstVisibleIndex + 1) +
-                               ResolveAllItemsLimit +
-                               (2 * m_maximumVisibleItems)));
+    result.reserve(qMin(count, (m_lastVisibleIndex - m_firstVisibleIndex + 1) + ResolveAllItemsLimit + (2 * m_maximumVisibleItems)));

 
     // Add visible items.
     // Resolve files first, their previews are quicker.
 
     // Add visible items.
     // Resolve files first, their previews are quicker.


@@ -1489,4 +1446,3 @@ void KFileItemModelRolesUpdater::trimHoverSequenceLoadedItems()
         }
     }
 }
         }
     }
 }

-