Merge branch 'Applications/19.08'

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

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index e1db504572fc9953ae13148da0b62c57d4490cb1..6e0103c793b54787dd5f9f4535915e3484d81be6 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -405,7 +405,7 @@ void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRang
     }
 }
 
-void KFileItemModelRolesUpdater::slotItemsMoved(const KItemRange& itemRange, QList<int> movedToIndexes)
+void KFileItemModelRolesUpdater::slotItemsMoved(const KItemRange& itemRange, const QList<int> &movedToIndexes)
 {
     Q_UNUSED(itemRange);
     Q_UNUSED(movedToIndexes);
@@ -521,7 +521,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
                                    scaledPixmap);
                 scaledPixmap = largeFrame;
             } else {
-                // The image must be shrinked as it is too large to fit into
+                // The image must be shrunk as it is too large to fit into
                 // the available icon size
                 KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
             }
@@ -710,6 +710,8 @@ void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& file)
         return;
     }
     applyChangedBalooRolesForItem(item);
+#else
+    Q_UNUSED(file);
 #endif
 }
 
@@ -1148,7 +1150,7 @@ QList<int> KFileItemModelRolesUpdater::indexesToResolve() const
 
     // We need a reasonable upper limit for number of items to resolve after
     // and before the visible range. m_maximumVisibleItems can be quite large
-    // when using Compace View.
+    // when using Compact View.
     const int readAheadItems = qMin(ReadAheadPages * m_maximumVisibleItems, ResolveAllItemsLimit / 2);
 
     // Add items after the visible range.
@@ -1165,18 +1167,14 @@ QList<int> KFileItemModelRolesUpdater::indexesToResolve() const
 
     // Add items on the last page.
     const int beginLastPage = qMax(qMin(endExtendedVisibleRange + 1, count - 1), count - m_maximumVisibleItems);
-    if (beginLastPage < count - 1) {
-        for (int i = beginLastPage; i < count; ++i) {
-            result.append(i);
-        }
+    for (int i = beginLastPage; i < count; ++i) {
+        result.append(i);
     }
 
     // Add items on the first page.
     const int endFirstPage = qMin(qMax(beginExtendedVisibleRange - 1, 0), m_maximumVisibleItems);
-    if (beginExtendedVisibleRange > 0) {
-        for (int i = 0; i <= endFirstPage; ++i) {
-            result.append(i);
-        }
+    for (int i = 0; i <= endFirstPage; ++i) {
+        result.append(i);
     }
 
     // Continue adding items until ResolveAllItemsLimit is reached.