[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=7e16c1e

The following commit has been merged in the master branch:
commit 7e16c1e3fa00ebac655d8b6edd1d6cba3a44f57a
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Jan 24 14:10:52 2013 +0100

    Reinstate feeding contact groups
---
 kpeople/nepomuk-feeder/nepomuk-storage.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index b0067bf..e2a4e8a 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -662,23 +662,24 @@ void NepomukStorage::setContactGroups(const QString &path,
     /*
     //kDebug() << path << id << groups;
     ContactResources contact = findContact(path, id);
-    if( contact.isEmpty() )
+    if (contact.isEmpty()) {
         return;
+    }
 
-    if( groups.isEmpty() ) {
-        KJob* job = Nepomuk2::removeProperties( QList<QUrl>() << contact.personContact(),
-                                               QList<QUrl>() << NCO::belongsToGroup() );
-        connect( job, SIGNAL(finished(KJob*)), this, SLOT(onRemovePropertiesJob(KJob*)) );
+    if (groups.isEmpty()) {
+        KJob *job = Nepomuk2::removeProperties(QList<QUrl>() << contact.personContact(),
+                                               QList<QUrl>() << NCO::belongsToGroup());
+        connect(job, SIGNAL(finished(KJob*)), this, SLOT(onRemovePropertiesJob(KJob*)));
         //TODO: Maybe remove empty groups?
         return;
     }
 
     //FIXME: Ideally cache all the group uris
     QVariantList groupUris;
-    foreach( const QString& groupName, groups ) {
+    foreach (const QString &groupName, groups) {
         Nepomuk2::SimpleResource groupRes;
-        groupRes.addType( NCO::ContactGroup() );
-        groupRes.setProperty( NCO::contactGroupName(), groupName );
+        groupRes.addType(NCO::ContactGroup());
+        groupRes.setProperty(NCO::contactGroupName(), groupName);
 
         groupUris << groupRes.uri();
         m_graph << groupRes;
@@ -687,11 +688,10 @@ void NepomukStorage::setContactGroups(const QString &path,
     QUrl contactUri = contact.personContact();
 
     Nepomuk2::SimpleResource &contactRes = m_graph[contactUri];
-    contactRes.setUri( contactUri );
-    contactRes.setProperty( NCO::belongsToGroup(), groupUris );
+    contactRes.setUri(contactUri);
+    contactRes.setProperty(NCO::belongsToGroup(), groupUris);
 
     fireGraphTimer();
-    */
 }
 
 void NepomukStorage::setContactBlockStatus(const QString &path, const QString &id, bool blocked)

-- 
ktp-common-internals packaging