fixing++

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

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index f541fe20c48b28da9b848626d832d5bb1e985148..47b75f1c2b261f5e0ae73a2ef3bea5b78f835eac 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -58,22 +58,18 @@ DolphinModel::~DolphinModel()
 
 QVariant DolphinModel::data(const QModelIndex &index, int role) const
 {
 
 QVariant DolphinModel::data(const QModelIndex &index, int role) const
 {

-    if (role == KCategorizedSortFilterProxyModel::CategoryDisplayRole)
-    {
+    if (role == KCategorizedSortFilterProxyModel::CategoryDisplayRole) {

         QString retString;
 
         QString retString;
 

-        if (!index.isValid())
-        {
+        if (!index.isValid()) {

             return retString;
         }
 
         const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
         KFileItem item = dirModel->itemForIndex(index);
 
             return retString;
         }
 
         const KDirModel *dirModel = qobject_cast<const KDirModel*>(index.model());
         KFileItem item = dirModel->itemForIndex(index);
 

-        switch (index.column())
-        {
-            case KDirModel::Name:
-            {
+        switch (index.column()) {
+            case KDirModel::Name: {

                 // KDirModel checks columns to know to which role are
                 // we talking about
                 QModelIndex theIndex = index.model()->index(index.row(),
                 // KDirModel checks columns to know to which role are
                 // we talking about
                 QModelIndex theIndex = index.model()->index(index.row(),


@@ -85,8 +81,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 }
 
                 QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);
                 }
 
                 QVariant data = theIndex.model()->data(theIndex, Qt::DisplayRole);

-                if (data.toString().size())
-                {
+                if (data.toString().size()) {

                     if (!item.isHidden() && data.toString().at(0).isLetter())
                         retString = data.toString().toUpper().at(0);
                     else if (item.isHidden() && data.toString().at(0) == '.' &&
                     if (!item.isHidden() && data.toString().at(0).isLetter())
                         retString = data.toString().toUpper().at(0);
                     else if (item.isHidden() && data.toString().at(0) == '.' &&


@@ -137,8 +132,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 break;
             }
 
                 break;
             }
 

-            case KDirModel::ModifiedTime:
-            {
+            case KDirModel::ModifiedTime: {

                 KDateTime modifiedTime;
                 modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
                 modifiedTime = modifiedTime.toLocalZone();
                 KDateTime modifiedTime;
                 modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
                 modifiedTime = modifiedTime.toLocalZone();


@@ -147,8 +141,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                 break;
             }
 
                 break;
             }
 

-            case KDirModel::Permissions:
-            {
+            case KDirModel::Permissions: {

                 QString user;
                 QString group;
                 QString others;
                 QString user;
                 QString group;
                 QString others;


@@ -234,12 +227,10 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
 
         return retString;
     }
 
         return retString;
     }

-    else if (role == KCategorizedSortFilterProxyModel::CategorySortRole)
-    {
+    else if (role == KCategorizedSortFilterProxyModel::CategorySortRole) {

         QVariant retVariant;
 
         QVariant retVariant;
 

-        if (!index.isValid())
-        {
+        if (!index.isValid()) {

             return retVariant;
         }
 
             return retVariant;
         }
 


@@ -254,12 +245,19 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
 
         case KDirModel::Size: {
             const int fileSize = !item.isNull() ? item.size() : -1;
 
         case KDirModel::Size: {
             const int fileSize = !item.isNull() ? item.size() : -1;

-            retVariant = fileSize;
+            if (item.isDir()) {
+                retVariant = 0;
+            } else if (fileSize < 5242880) {
+                retVariant = 1;
+            } else if (fileSize < 10485760) {
+                retVariant = 2;
+            } else {
+                retVariant = 3;
+            }

             break;
         }
 
             break;
         }
 

-        case KDirModel::ModifiedTime:
-        {
+        case KDirModel::ModifiedTime: {

             KDateTime modifiedTime;
             modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
             modifiedTime = modifiedTime.toLocalZone();
             KDateTime modifiedTime;
             modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
             modifiedTime = modifiedTime.toLocalZone();


@@ -268,8 +266,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
             break;
         }
 
             break;
         }
 

-        case KDirModel::Permissions:
-        {
+        case KDirModel::Permissions: {

             QFileInfo info(item.url().pathOrUrl());
 
             retVariant = -KDirSortFilterProxyModel::pointsForPermissions(info);
             QFileInfo info(item.url().pathOrUrl());
 
             retVariant = -KDirSortFilterProxyModel::pointsForPermissions(info);