warnings-- / fix for fileSize > 2GB

svn path=/trunk/KDE/kdebase/apps/; revision=791169

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index eab1204bf5109224d7307a2f45ce64da4acfe98c..9108d2c46be4d5cf9409f77dda41cca5566a1ca5 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -190,7 +190,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
     }
 
     case KDirModel::Size: {
     }
 
     case KDirModel::Size: {

-        const int fileSize = !item.isNull() ? item.size() : -1;
+        const KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;

         if (!item.isNull() && item.isDir()) {
             retString = i18nc("@title:group Size", "Folders");
         } else if (fileSize < 5242880) {
         if (!item.isNull() && item.isDir()) {
             retString = i18nc("@title:group Size", "Folders");
         } else if (fileSize < 5242880) {


@@ -343,7 +343,7 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
     }
 
     case KDirModel::Size: {
     }
 
     case KDirModel::Size: {

-        const int fileSize = !item.isNull() ? item.size() : -1;
+        const KIO::filesize_t fileSize = !item.isNull() ? item.size() : ~0U;

         if (item.isDir()) {
             retVariant = 0;
         } else if (fileSize < 5242880) {
         if (item.isDir()) {
             retVariant = 0;
         } else if (fileSize < 5242880) {