[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kactivities/mart/nepomuk2] src: port from ::resourceUri() to ::uri()
From:       Marco Martin <notmart () gmail ! com>
Date:       2012-07-16 11:20:59
Message-ID: 20120716112059.070AFA6094 () git ! kde ! org
[Download RAW message or body]

Git commit 1e5e1afdbe276543e82079b3dd42eb0e9a40983c by Marco Martin.
Committed on 16/07/2012 at 13:20.
Pushed by mart into branch 'mart/nepomuk2'.

port from ::resourceUri() to ::uri()

M  +1    -1    src/service/NepomukActivityManager.cpp
M  +1    -1    src/service/jobs/nepomuk/Move.cpp
M  +1    -1    src/service/plugins/sqlite/NepomukCommon.h
M  +1    -1    src/workspace/kio/kio_activities.cpp

http://commits.kde.org/kactivities/1e5e1afdbe276543e82079b3dd42eb0e9a40983c

diff --git a/src/service/NepomukActivityManager.cpp \
b/src/service/NepomukActivityManager.cpp index 242f045..019eba5 100644
--- a/src/service/NepomukActivityManager.cpp
+++ b/src/service/NepomukActivityManager.cpp
@@ -301,7 +301,7 @@ QList <KUrl> \
NepomukActivityManager::resourcesLinkedToActivity(const QString & a  if \
(resource.hasProperty(NIE::url())) {  result << \
resource.property(NIE::url()).toUrl();  } else {
-            result << resource.resourceUri();
+            result << resource.uri();
         }
     }
 
diff --git a/src/service/jobs/nepomuk/Move.cpp b/src/service/jobs/nepomuk/Move.cpp
index 6d566a6..1fcea70 100644
--- a/src/service/jobs/nepomuk/Move.cpp
+++ b/src/service/jobs/nepomuk/Move.cpp
@@ -85,7 +85,7 @@ namespace Private {
         Soprano::QueryResultIterator it
             = ResourceManager::instance()->mainModel()->executeQuery(
                 query.arg(
-                    Soprano::Node::resourceToN3(resource.resourceUri())
+                    Soprano::Node::resourceToN3(resource.uri())
                 ),
                 Soprano::Query::QueryLanguageSparql);
 
diff --git a/src/service/plugins/sqlite/NepomukCommon.h \
b/src/service/plugins/sqlite/NepomukCommon.h index ce01f2e..1edd6d9 100644
--- a/src/service/plugins/sqlite/NepomukCommon.h
+++ b/src/service/plugins/sqlite/NepomukCommon.h
@@ -62,7 +62,7 @@ inline QString resN3(const QUrl & uri)
 
 inline QString resN3(const Nepomuk2::Resource & resource)
 {
-    return Soprano::Node::resourceToN3(resource.resourceUri());
+    return Soprano::Node::resourceToN3(resource.uri());
 }
 
 inline void updateNepomukScore(const QString & activity, const QString & \
                application, const QUrl & resource, qreal score)
diff --git a/src/workspace/kio/kio_activities.cpp \
b/src/workspace/kio/kio_activities.cpp index d35d711..2ace1a9 100644
--- a/src/workspace/kio/kio_activities.cpp
+++ b/src/workspace/kio/kio_activities.cpp
@@ -206,7 +206,7 @@ public:
 
             Soprano::QueryResultIterator it
                 = Nepomuk2::ResourceManager::instance()->mainModel()->executeQuery(
-                    \
query.arg(Soprano::Node::resourceToN3(activityResource.resourceUri())), +             \
query.arg(Soprano::Node::resourceToN3(activityResource.uri())),  \
Soprano::Query::QueryLanguageSparql);  
             while (it.next()) {


[prev in list] [next in list] [prev in thread] [next in thread]