[Nepomuk] [nepomuk-core/KDE/4.9] services/queryservice: Fix the build with gcc 4.2 and clang.

Raphael Kubo da Costa rakuco at FreeBSD.org
Mon Sep 3 22:02:17 UTC 2012

Git commit c910021ee37ff0356eddbc3df725f8f3f598d019 by Raphael Kubo da Costa.
Committed on 03/09/2012 at 23:23.
Pushed by rkcosta into branch 'KDE/4.9'.

Fix the build with gcc 4.2 and clang.

The Nepomuk2 and Nepomuk2::Query namespaces are included, which causes some
ambiguity in the `query' argument of intiWatcherForQuery(), which can be
expanded as both Nepomuk2::Query::Query (from libnepomukcore/query/query.h)
or Nepomuk2::Query (from libnepomukcore/query/negationterm.h).

Meanwhile, this was fixed in master by someone else who didn't fix the
KDE/4.9 branch (see eaeae8d).

CCMAIL: nepomuk at kde.org

M  +1    -1    services/queryservice/folder.cpp


diff --git a/services/queryservice/folder.cpp b/services/queryservice/folder.cpp
index b7125cb..b4ab5c6 100644
--- a/services/queryservice/folder.cpp
+++ b/services/queryservice/folder.cpp
@@ -101,7 +101,7 @@ namespace {
-    void intiWatcherForQuery(ResourceWatcher* watcher, const Query::Query& query) {
+    void intiWatcherForQuery(ResourceWatcher* watcher, const Nepomuk2::Query::Query& query) {
         // The empty property is for comparison terms which do not have a property
         // in that case we want to monitor all properties
         bool emptyProperty = false;

More information about the Nepomuk mailing list