Commit c910021e authored by Raphael Kubo da Costa's avatar Raphael Kubo da Costa
Browse files

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 eaeae8d1).

CCMAIL: nepomuk@kde.org
parent 328fbfd8
...@@ -101,7 +101,7 @@ namespace { ...@@ -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 // The empty property is for comparison terms which do not have a property
// in that case we want to monitor all properties // in that case we want to monitor all properties
bool emptyProperty = false; bool emptyProperty = false;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment