Use the ontologies compiled into libnepomuk

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86d46bd56dec719241181dbdd141d47e1d245f29..8cd67436b77d3c227468edf49aea6bd0d094e209 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -150,9 +150,6 @@ if(Nepomuk_FOUND)
         ${dolphin_SRCS}
         panels/filter/filterpanel.cpp
     )
         ${dolphin_SRCS}
         panels/filter/filterpanel.cpp
     )

-    include(SopranoAddOntology)
-    soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Nepomuk::Vocabulary" "trig")
-    soprano_add_ontology(dolphin_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Nepomuk::Vocabulary" "trig")

 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index d41aba605932eac4c7473fdac8d193224cb1114b..2e4b58d9f6013f6d3bf52a927b04515774515dff 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -48,7 +48,7 @@
     #include <nepomuk/resourcemanager.h>
     #include <nepomuk/resourcetypeterm.h>
     #include <nepomuk/comparisonterm.h>
     #include <nepomuk/resourcemanager.h>
     #include <nepomuk/resourcetypeterm.h>
     #include <nepomuk/comparisonterm.h>

-    #include "nfo.h"
+    #include <nepomuk/nfo.h>

 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
 #endif
 
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :