Merge branch 'release/19.12'

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

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index e1db504572fc9953ae13148da0b62c57d4490cb1..bf2c84c4031ffa6346dc2e5813d6c7a0ea7b1007 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -355,7 +355,7 @@ void KFileItemModelRolesUpdater::slotItemsInserted(const KItemRangeList& itemRan
 
 void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRanges)
 {
 
 void KFileItemModelRolesUpdater::slotItemsRemoved(const KItemRangeList& itemRanges)
 {

-    Q_UNUSED(itemRanges);
+    Q_UNUSED(itemRanges)

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


@@ -405,10 +405,10 @@ 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);
+    Q_UNUSED(itemRange)
+    Q_UNUSED(movedToIndexes)

 
     // The visible items might have changed.
     startUpdating();
 
     // The visible items might have changed.
     startUpdating();


@@ -417,7 +417,7 @@ void KFileItemModelRolesUpdater::slotItemsMoved(const KItemRange& itemRange, QLi
 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)

 
     // Find out if slotItemsChanged() has been done recently. If that is the
     // case, resolving the roles is postponed until a timer has exceeded
 
     // Find out if slotItemsChanged() has been done recently. If that is the
     // case, resolving the roles is postponed until a timer has exceeded


@@ -445,8 +445,8 @@ 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)

 
     if (m_resolvableRoles.contains(current)) {
         m_pendingSortRoleItems.clear();
 
     if (m_resolvableRoles.contains(current)) {
         m_pendingSortRoleItems.clear();


@@ -521,7 +521,7 @@ void KFileItemModelRolesUpdater::slotGotPreview(const KFileItem& item, const QPi
                                    scaledPixmap);
                 scaledPixmap = largeFrame;
             } else {
                                    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);
             }
                 // the available icon size
                 KPixmapModifier::applyFrame(scaledPixmap, m_iconSize);
             }


@@ -710,6 +710,8 @@ void KFileItemModelRolesUpdater::applyChangedBalooRoles(const QString& file)
         return;
     }
     applyChangedBalooRolesForItem(item);
         return;
     }
     applyChangedBalooRolesForItem(item);

+#else
+    Q_UNUSED(file)

 #endif
 }
 
 #endif
 }
 


@@ -743,7 +745,7 @@ void KFileItemModelRolesUpdater::applyChangedBalooRolesForItem(const KFileItem &
             this,    &KFileItemModelRolesUpdater::slotItemsChanged);
 #else
 #ifndef Q_CC_MSVC
             this,    &KFileItemModelRolesUpdater::slotItemsChanged);
 #else
 #ifndef Q_CC_MSVC

-    Q_UNUSED(item);
+    Q_UNUSED(item)

 #endif
 #endif
 }
 #endif
 #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
 
     // 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.
     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);
 
     // 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);
     }
 
     // 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.
     }
 
     // Continue adding items until ResolveAllItemsLimit is reached.