Use KFileItem::text() instead of KFileItem::name().

This way Nepomuk search results get their proper user readable names.
BUG: 287472
REVIEW: 103237

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 0c0a3877309abf546ee8fca4902367fe8a6f3439..c8d495db192499f968ab92d5d81e6df3116709ed 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -425,9 +425,9 @@ void DolphinViewContainer::showItemInfo(const KFileItem& item)
     } else {
         QString message;
         if (item.isDir()) {
-            message = item.name();
+            message = item.text();
         } else {
-            message = i18nc("@info:status filename (type)", "%1 (%2)", item.name(), item.mimeComment());
+            message = i18nc("@info:status filename (type)", "%1 (%2)", item.text(), item.mimeComment());
         }
         m_statusBar->setMessage(message, DolphinStatusBar::Default);
     }

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 040309dc319b62bc7751dc16f2a6d9ef6628e531..945aa82c8c4ab2dc33bd59fac2feac94780a4406 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -953,7 +953,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item)
     }
 
     if (m_requestRole[NameRole]) {
-        data.insert("name", item.name());
+        data.insert("name", item.text());
     }
 
     if (m_requestRole[SizeRole]) {

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 91d668e9d6bd8fa70d8e076f4d3b4bf9b77e5d1b..c5c13e97f4909db40c546d6c18234bf0d3d147e3 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -339,7 +339,7 @@ void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
 
     for (int index = 0; index < model->count(); index++) {
         const KFileItem item = model->fileItem(index);
-        if (pattern.exactMatch(item.name())) {
+        if (pattern.exactMatch(item.text())) {
             // An alternative approach would be to store the matching items in a QSet<int> and
             // select them in one go after the loop, but we'd need a new function
             // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)