Fix trunk compilation using proper soprano Vocabulary, since moved from nie.h nepomuk.

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe51614ac84007279a544bcf51309d86a01eba54..0b759df75f25476c10f5b24c5a8c18a5c33529ca 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -210,7 +210,6 @@ if (Nepomuk_FOUND)
         ${NEPOMUK_LIBRARIES}
         ${SOPRANO_LIBRARIES}
         ${NEPOMUK_QUERY_LIBRARIES}
         ${NEPOMUK_LIBRARIES}
         ${SOPRANO_LIBRARIES}
         ${NEPOMUK_QUERY_LIBRARIES}

-        nepomukannotation

     )
 endif (Nepomuk_FOUND)
 
     )
 endif (Nepomuk_FOUND)
 

diff --git a/src/search/searchcriterionselector.cpp b/src/search/searchcriterionselector.cpp
index 7917d1b8f5ab34ed04b8cf8c7b9a9e4b182c0913..addbb6b9f7ff078269bca5f4fbf8434ba30a9d89 100644 (file)
--- a/src/search/searchcriterionselector.cpp
+++ b/src/search/searchcriterionselector.cpp
@@ -22,13 +22,13 @@
 
 #define DISABLE_NEPOMUK_LEGACY
 #include <nepomuk/comparisonterm.h>
 
 #define DISABLE_NEPOMUK_LEGACY
 #include <nepomuk/comparisonterm.h>

-#include <nepomuk/nie.h>

 #include <nepomuk/literalterm.h>
 #include <nepomuk/query.h>
 
 #include "searchcriterionvalue.h"
 
 #include <Soprano/LiteralValue>
 #include <nepomuk/literalterm.h>
 #include <nepomuk/query.h>
 
 #include "searchcriterionvalue.h"
 
 #include <Soprano/LiteralValue>

+#include <Soprano/Vocabulary/NAO>

 
 #include <QComboBox>
 #include <QHBoxLayout>
 
 #include <QComboBox>
 #include <QHBoxLayout>


@@ -98,7 +98,7 @@ Nepomuk::Query::Term SearchCriterionSelector::queryTerm() const
     }
 
     Nepomuk::Query::LiteralTerm literalTerm(Soprano::LiteralValue("dummy"));
     }
 
     Nepomuk::Query::LiteralTerm literalTerm(Soprano::LiteralValue("dummy"));

-    Nepomuk::Query::ComparisonTerm term(Nepomuk::Vocabulary::NIE::lastModified(),
+    Nepomuk::Query::ComparisonTerm term(Soprano::Vocabulary::NAO::lastModified(),

                                         literalTerm,
                                         Nepomuk::Query::ComparisonTerm::Smaller);
     return term;
                                         literalTerm,
                                         Nepomuk::Query::ComparisonTerm::Smaller);
     return term;