From 1041f340a2ddb634476c5d84585a56c29e5a70fd Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Fri, 3 Feb 2012 23:07:33 +0100
Subject: Show the value "Unknown" for the item-count only after it has been
 verified

During determining the item-count for directories just show an empty string
until either the item-count has been calculated or if the item-count is unknown.

Thanks to Nikita Skovoroda for the initial proof-of-concept patch.

BUG: 291823
FIXED-IN: 4.8.1
---
 src/kitemviews/kfileitemmodel.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'src/kitemviews/kfileitemmodel.cpp')

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 95c960b3d..db9b71189 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -1313,12 +1313,20 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b) const
             } else if (valueB.isNull()) {
                 result = +1;
             } else {
-                result = fileSizeCompare(valueA.value<KIO::filesize_t>(), valueB.value<KIO::filesize_t>());
+                result = valueA.toInt() - valueB.toInt();
             }
         } else {
             // See "if (m_sortFoldersFirst || m_sortRole == SizeRole)" in KFileItemModel::lessThan():
             Q_ASSERT(!itemB.isDir());
-            result = fileSizeCompare(itemA.size(), itemB.size());
+            const KIO::filesize_t sizeA = itemA.size();
+            const KIO::filesize_t sizeB = itemB.size();
+            if (sizeA > sizeB) {
+                result = +1;
+            } else if (sizeA < sizeB) {
+                result = -1;
+            } else {
+                result = 0;
+            }
         }
         break;
     }
@@ -1943,15 +1951,4 @@ KFileItemList KFileItemModel::childItems(const KFileItem& item) const
     return items;
 }
 
-int KFileItemModel::fileSizeCompare(KIO::filesize_t a, KIO::filesize_t b)
-{
-    if (a > b) {
-        return +1;
-    } else if (a < b) {
-        return -1;
-    } else {
-        return 0;
-    }
-}
-
 #include "kfileitemmodel.moc"
-- 
cgit v1.3