From a9b04801db0d981db4eb26b282da8ac7de77d32d Mon Sep 17 00:00:00 2001
From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Mon, 15 Oct 2012 21:46:59 +0200
Subject: Port Dolphin from Nepomuk to Nepomuk2 according to the Nepomuk2Port
 mini guide on techbase -
 http://techbase.kde.org/Projects/Nepomuk/Nepomuk2Port

REVIEW: 106825
---
 src/panels/places/placesitemmodel.cpp | 32 ++++++++++++++++----------------
 src/panels/places/placesitemmodel.h   |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/panels')

diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 4770c6b10..8bc33e329 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -51,13 +51,13 @@
 #include <views/viewproperties.h>
 
 #ifdef HAVE_NEPOMUK
-    #include <Nepomuk/ResourceManager>
-    #include <Nepomuk/Query/ComparisonTerm>
-    #include <Nepomuk/Query/LiteralTerm>
-    #include <Nepomuk/Query/FileQuery>
-    #include <Nepomuk/Query/ResourceTypeTerm>
-    #include <Nepomuk/Vocabulary/NFO>
-    #include <Nepomuk/Vocabulary/NIE>
+    #include <Nepomuk2/ResourceManager>
+    #include <Nepomuk2/Query/ComparisonTerm>
+    #include <Nepomuk2/Query/LiteralTerm>
+    #include <Nepomuk2/Query/FileQuery>
+    #include <Nepomuk2/Query/ResourceTypeTerm>
+    #include <Nepomuk2/Vocabulary/NFO>
+    #include <Nepomuk2/Vocabulary/NIE>
 #endif
 
 namespace {
@@ -87,7 +87,7 @@ PlacesItemModel::PlacesItemModel(QObject* parent) :
     m_storageSetupInProgress()
 {
 #ifdef HAVE_NEPOMUK
-    if (Nepomuk::ResourceManager::instance()->initialized()) {
+    if (Nepomuk2::ResourceManager::instance()->initialized()) {
         KConfig config("nepomukserverrc");
         m_fileIndexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
     }
@@ -1150,15 +1150,15 @@ KUrl PlacesItemModel::createSearchUrl(const KUrl& url)
 #ifdef HAVE_NEPOMUK
     const QString path = url.pathOrUrl();
     if (path.endsWith(QLatin1String("documents"))) {
-        searchUrl = searchUrlForTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Document()));
+        searchUrl = searchUrlForTerm(Nepomuk2::Query::ResourceTypeTerm(Nepomuk2::Vocabulary::NFO::Document()));
     } else if (path.endsWith(QLatin1String("images"))) {
-        searchUrl = searchUrlForTerm(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Image()));
+        searchUrl = searchUrlForTerm(Nepomuk2::Query::ResourceTypeTerm(Nepomuk2::Vocabulary::NFO::Image()));
     } else if (path.endsWith(QLatin1String("audio"))) {
-        searchUrl = searchUrlForTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
-                                                                    Nepomuk::Query::LiteralTerm("audio")));
+        searchUrl = searchUrlForTerm(Nepomuk2::Query::ComparisonTerm(Nepomuk2::Vocabulary::NIE::mimeType(),
+                                                                    Nepomuk2::Query::LiteralTerm("audio")));
     } else if (path.endsWith(QLatin1String("videos"))) {
-        searchUrl = searchUrlForTerm(Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
-                                                                    Nepomuk::Query::LiteralTerm("video")));
+        searchUrl = searchUrlForTerm(Nepomuk2::Query::ComparisonTerm(Nepomuk2::Vocabulary::NIE::mimeType(),
+                                                                    Nepomuk2::Query::LiteralTerm("video")));
     } else {
         Q_ASSERT(false);
     }
@@ -1170,9 +1170,9 @@ KUrl PlacesItemModel::createSearchUrl(const KUrl& url)
 }
 
 #ifdef HAVE_NEPOMUK
-KUrl PlacesItemModel::searchUrlForTerm(const Nepomuk::Query::Term& term)
+KUrl PlacesItemModel::searchUrlForTerm(const Nepomuk2::Query::Term& term)
 {
-    const Nepomuk::Query::FileQuery query(term);
+    const Nepomuk2::Query::FileQuery query(term);
     return query.toSearchUrl();
 }
 #endif
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index 463e564e3..e42187860 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -38,7 +38,7 @@ class QAction;
 class QTimer;
 
 #ifdef HAVE_NEPOMUK
-    namespace Nepomuk
+    namespace Nepomuk2
     {
         namespace Query
         {
@@ -255,7 +255,7 @@ private:
      * @return URL that can be listed by KIO and results in searching
      *         for the given term.
      */
-    static KUrl searchUrlForTerm(const Nepomuk::Query::Term& term);
+    static KUrl searchUrlForTerm(const Nepomuk2::Query::Term& term);
 #endif
 
 #ifdef PLACESITEMMODEL_DEBUG
-- 
cgit v1.3