Minor adjustments for searching: at least searching for tags works now again :-)

svn path=/trunk/KDE/kdebase/apps/; revision=1058137

1 files changed, 6 insertions, 2 deletions

diff --git a/src/search/searchcriterionselector.cpp b/src/search/searchcriterionselector.cpp
index ab447bb83..f9c122d46 100644
--- a/src/search/searchcriterionselector.cpp
+++ b/src/search/searchcriterionselector.cpp
@@ -210,12 +210,16 @@ void SearchCriterionSelector::createDescriptions()
     QList<SearchCriterionDescription::Comparator> tagComps;
     tagComps.append(SearchCriterionDescription::Comparator(i18nc("@label All (tags)", "All")));
     tagComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "Equal to"), Nepomuk::Query::ComparisonTerm::Equal));
-    tagComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "Not Equal to"), Nepomuk::Query::ComparisonTerm::Equal)); // TODO
+    // It is unclear yet how to express != for tags with the new Nepomuk query API. Disable it for KDE 4.4,
+    // but leave the translation string there to be able to enable this functionality for KDE 4.4.x:
+    const QString dummy = i18nc("@label", "Not Equal to");
+    Q_UNUSED(dummy);
+    //tagComps.append(SearchCriterionDescription::Comparator(i18nc("@label", "Not Equal to"), Nepomuk::Query::ComparisonTerm::Equal)); // TODO
 
     TagValue* tagValue = new TagValue(this);
     tagValue->hide();
     SearchCriterionDescription tag(i18nc("@label", "Tag:"),
-                                   Soprano::Vocabulary::NAO::Tag(),
+                                   Soprano::Vocabulary::NAO::hasTag(),
                                    tagComps,
                                    tagValue);
     Q_ASSERT(static_cast<int>(SearchCriterionSelector::Tag) == 2);