From 93cc4808031cb45da9237dfc0c7759f668259331 Mon Sep 17 00:00:00 2001 From: Sebastian Trueg Date: Fri, 25 Nov 2011 16:02:49 +0100 Subject: [PATCH] Use KFileItem::text() instead of KFileItem::name(). This way Nepomuk search results get their proper user readable names. BUG: 287472 REVIEW: 103237 --- src/dolphinviewcontainer.cpp | 4 ++-- src/kitemviews/kfileitemmodel.cpp | 2 +- src/views/dolphinview.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 0c0a38773..c8d495db1 100644 --- 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 040309dc3..945aa82c8 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -953,7 +953,7 @@ QHash 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 91d668e9d..c5c13e97f 100644 --- 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 and // select them in one go after the loop, but we'd need a new function // KItemListSelectionManager::setSelected(QSet, SelectionMode mode) -- 2.47.3