- Fixed issue that the items inside the "Other" category are sorted in a wrong manner.

- Removed redundant code.

BUG: 173027

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

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 3b507a8957d7ced2c63bfcc4ab28bfa0fe8f7a6f..503c1086d7a40ae4a1f6c4dada745aad22b56f36 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -217,11 +217,7 @@ QVariant DolphinModel::displayRoleData(const QModelIndex& index) const
                     }
                 }
 
-                if (!validCategory) {
-                    retString = validCategory ? *currA : i18nc("@title:group Name", m_others);
-                } else {
-                    retString = *currA;
-                }
+                retString = validCategory ? *currA : i18nc("@title:group Name", m_others);
             }
         }
         break;
@@ -393,7 +389,7 @@ QVariant DolphinModel::sortRoleData(const QModelIndex& index) const
         retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
         if (retVariant == i18nc("@title:group Name", m_others)) {
             // assure that the "Others" group is always the last categorization
-            retVariant = QString(QChar(QChar::ReplacementCharacter));
+            retVariant = QString('Z').append(QChar::ReplacementCharacter);
         }
         break;
     }