Merge branch 'Applications/18.08'

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

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index e1db504572fc9953ae13148da0b62c57d4490cb1..1d45e44c5deb554de1fadca2ebb0dc5fb5195877 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -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);
             }
@@ -1148,7 +1148,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 +1165,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.