[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=e8ff816

The following commit has been merged in the master branch:
commit e8ff816d519a1818a44af3886ab2756e0b118f90
Author: Vishesh Handa <me at vhanda.in>
Date:   Thu Aug 9 17:26:06 2012 +0530

    Compile++
    
    Resource::resourceUri -> Resource::uri
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp    | 4 ++--
 kpeople/nepomuk-feeder/tests/contact-test.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 810dc02..c432a50 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -423,7 +423,7 @@ void NepomukStorage::onAccountsQueryNewEntries(const QList<Nepomuk2::Query::Resu
     kDebug();
     // Iterate over all the IMAccounts found.
     foreach (const Nepomuk2::Query::Result &result, entries) {
-        QUrl foundImAccount(result.resource().resourceUri());
+        QUrl foundImAccount(result.resource().uri());
         kDebug() << this << ": Found IM Account: " << foundImAccount;
 
         // If no Telepathy identifier, then the account is ignored.
@@ -526,7 +526,7 @@ void NepomukStorage::onContactsQueryNewEntries(const QList< Nepomuk2::Query::Res
     // Iterate over all the IMAccounts found.
     foreach (const Nepomuk2::Query::Result &result, entries) {
 
-        QUrl foundImAccount(result.resource().resourceUri());
+        QUrl foundImAccount(result.resource().uri());
         QUrl foundPersonContact(result.additionalBinding("personContact").toUrl());
         QUrl foundPerson(result.additionalBinding("person").toUrl());
         QUrl foundImAccountAccessedBy(result.additionalBinding("accessedBy").toUrl());
diff --git a/kpeople/nepomuk-feeder/tests/contact-test.cpp b/kpeople/nepomuk-feeder/tests/contact-test.cpp
index 5976b14..a795e20 100644
--- a/kpeople/nepomuk-feeder/tests/contact-test.cpp
+++ b/kpeople/nepomuk-feeder/tests/contact-test.cpp
@@ -100,7 +100,7 @@ void ContactTest::testAccountCreation()
 
     // Let's wait for the nepomuk resource to become available
     QString query = QString("select distinct ?a where { %1 %2 ?a . ?a a %3 }")
-                            .arg(Soprano::Node::resourceToN3(mePersonContact().resourceUri()))
+                            .arg(Soprano::Node::resourceToN3(mePersonContact().uri()))
                             .arg(Soprano::Node::resourceToN3(Nepomuk2::Vocabulary::NCO::hasIMAccount()))
                             .arg(Soprano::Node::resourceToN3(Nepomuk2::Vocabulary::NCO::IMAccount()));
 

-- 
ktp-common-internals packaging