Bypass a temporary (?) regression (?) with the current Qt 4.4 beta version: it seems...

[dolphin.git] / src / dolphinmodel.cpp

diff --git a/src/dolphinmodel.cpp b/src/dolphinmodel.cpp
index 3dcbf63ef051c63438bdfc3fe1cf394d6e783209..b0e5ef5c4702ad4194662e2235d4f6f2c330e5bc 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 <Soprano/Vocabulary/Xesam>
 #endif
 
 #include <kdatetime.h>
@@ -47,7 +48,7 @@
 #include <QDir>
 #include <QFileInfo>
 
-static QString others = I18N_NOOP2("@title:group Name", "Uncategorized");
+static const char *others = I18N_NOOP2("@title:group Name", "Others");
 
 DolphinModel::DolphinModel(QObject *parent)
     : KDirModel(parent)
@@ -91,7 +92,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                             if (name.size() > 1 && name.at(1).isLetter()) {
                                 retString = name.at(1).toUpper();
                             } else {
-                                retString = others;
+                                retString = i18nc("@title:group Name", others);
                             }
                         } else {
                             retString = name.at(0).toUpper();
@@ -105,14 +106,14 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
                             if (currA->isLetter()) {
                                 validCategory = true;
                             } else if (currA->isDigit()) {
-                                return others;
+                                return i18nc("@title:group Name", others);
                             } else {
                                 ++currA;
                             }
                         }
 
                         if (!validCategory) {
-                            retString = validCategory ? *currA : others;
+                            retString = validCategory ? *currA : i18nc("@title:group Name", others);
                         } else {
                             retString = *currA;
                         }
@@ -136,8 +137,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
             }
 
             case KDirModel::ModifiedTime: {
-                KDateTime modifiedTime;
-                modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
+                KDateTime modifiedTime = item.time(KFileItem::ModificationTime);
                 modifiedTime = modifiedTime.toLocalZone();
 
                 retString = modifiedTime.toString(i18nc("Prints out the month and year: %B is full month name in current locale, and %Y is full year number", "%B, %Y"));
@@ -244,8 +244,8 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
         case KDirModel::Name: {
             retVariant = data(index, KCategorizedSortFilterProxyModel::CategoryDisplayRole);
 
-            if (retVariant == others)
-                retVariant = QString();
+            if (retVariant == i18nc("@title:group Name", others))
+                retVariant = QString(QChar(QChar::ReplacementCharacter));
 
             break;
         }
@@ -265,8 +265,7 @@ QVariant DolphinModel::data(const QModelIndex &index, int role) const
         }
 
         case KDirModel::ModifiedTime: {
-            KDateTime modifiedTime;
-            modifiedTime.setTime_t(item.time(KIO::UDSEntry::UDS_MODIFICATION_TIME));
+            KDateTime modifiedTime = item.time(KFileItem::ModificationTime);
             modifiedTime = modifiedTime.toLocalZone();
 
             retVariant = -(modifiedTime.date().year() * 100 + modifiedTime.date().month());
@@ -331,7 +330,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 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;
@@ -349,7 +348,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 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) {