[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=2693da1

The following commit has been merged in the master branch:
commit 2693da185f6149ad4ae0a4f0d7ae6ccf7dcaa442
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jun 26 14:16:09 2013 +0100

    Update to new model initialisation
---
 KTp/Models/contacts-model.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/KTp/Models/contacts-model.cpp b/KTp/Models/contacts-model.cpp
index fa4a575..52f382f 100644
--- a/KTp/Models/contacts-model.cpp
+++ b/KTp/Models/contacts-model.cpp
@@ -29,6 +29,8 @@
 
 #ifdef HAVE_KPEOPLE
 #include <KPeople/PersonsModel>
+#include <kpeople/personsmodelfeature.h>
+
 #include "kpeopletranslationproxy.h"
 #endif
 
@@ -60,10 +62,11 @@ KTp::ContactsModel::ContactsModel(QObject *parent)
     d->groupMode = NoGrouping;
     d->trackUnread = false;
 #ifdef HAVE_KPEOPLE
-    KPeople::PersonsModel *personsModel = new KPeople::PersonsModel(KPeople::PersonsModel::FeatureIM,
-                                              KPeople::PersonsModel::FeatureAvatars |
-                                              KPeople::PersonsModel::FeatureGroups,
-                                              this);
+    KPeople::PersonsModel *personsModel = new KPeople::PersonsModel(this);
+
+    personsModel->startQuery(QList<KPeople::PersonsModelFeature>() << KPeople::PersonsModelFeature::imModelFeature(false)
+                                                          << KPeople::PersonsModelFeature::avatarModelFeature(true)
+                                                          << KPeople::PersonsModelFeature::groupsModelFeature(true));
     d->source = new KPeopleTranslationProxy(this);
     d->source->setSourceModel(personsModel);
 #else

-- 
ktp-common-internals packaging