X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d84909dc36acbd91c37de76e793f81dca9b2ace9..d35964345eeeeaf261ecbd9679b752db6eb49e8f:/src/dolphinmodel.cpp diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp index 3b507a895..3467c8a38 100644 --- a/src/dolphinmodel.cpp +++ b/src/dolphinmodel.cpp @@ -24,14 +24,6 @@ #include "kcategorizedview.h" -#include -#ifdef HAVE_NEPOMUK -#include -#include -#include -#include -#endif - #include #include #include @@ -217,11 +209,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 +381,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; }