Treeview fixes (backport):

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 434a475f5964b2b249bc080075b30703875228d5..1b94e0339d2b5bd26c9a419873574851dc36a0d9 100644 (file)
--- a/src/dolphinmodel.cpp
+++ b/src/dolphinmodel.cpp
@@ -29,6 +29,7 @@
 #include <nepomuk/global.h>
 #include <nepomuk/resource.h>
 #include <nepomuk/tag.h>
 #include <nepomuk/global.h>
 #include <nepomuk/resource.h>
 #include <nepomuk/tag.h>

+#include <Soprano/Vocabulary/Xesam>

 #endif
 
 #include <kdatetime.h>
 #endif
 
 #include <kdatetime.h>


@@ -47,7 +48,7 @@
 #include <QDir>
 #include <QFileInfo>
 
 #include <QDir>
 #include <QFileInfo>
 

-static const char *others = I18N_NOOP2("@title:group Name", "Uncategorized");
+static const char *others = I18N_NOOP2("@title:group Name", "Others");

 
 DolphinModel::DolphinModel(QObject *parent)
     : KDirModel(parent)
 
 DolphinModel::DolphinModel(QObject *parent)
     : KDirModel(parent)


@@ -245,7 +246,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
             retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
 
             if (retVariant == i18nc("@title:group Name", others))
             retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
 
             if (retVariant == i18nc("@title:group Name", others))

-                retVariant = QString();
+                retVariant = QString(QChar(QChar::ReplacementCharacter));

 
             break;
         }
 
             break;
         }


@@ -331,7 +332,7 @@ quint32 DolphinModel::ratingForIndex(const QModelIndex& index)
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {

-        const Nepomuk::Resource resource(item.url().url(), Nepomuk::NFO::File());
+        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());

         rating = resource.rating();
     }
     return rating;
         rating = resource.rating();
     }
     return rating;


@@ -349,7 +350,7 @@ QString DolphinModel::tagsForIndex(const QModelIndex& index)
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {
     const DolphinModel* dolphinModel = static_cast<const DolphinModel*>(index.model());
     KFileItem item = dolphinModel->itemForIndex(index);
     if (!item.isNull()) {

-        const Nepomuk::Resource resource(item.url().url(), Nepomuk::NFO::File());
+        const Nepomuk::Resource resource(item.url().url(), Soprano::Vocabulary::Xesam::File());

         const QList<Nepomuk::Tag> tags = resource.tags();
         QStringList stringList;
         foreach (const Nepomuk::Tag& tag, tags) {
         const QList<Nepomuk::Tag> tags = resource.tags();
         QStringList stringList;
         foreach (const Nepomuk::Tag& tag, tags) {