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

The following commit has been merged in the master branch:
commit 7c3512b397149fa820c6f6efd52e1b4ddbd74c44
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Dec 21 07:15:31 2012 +0000

    Remove metatype usage in Filter Model
---
 KTp/Models/accounts-filter-model.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/KTp/Models/accounts-filter-model.cpp b/KTp/Models/accounts-filter-model.cpp
index dd911ac..95afc85 100644
--- a/KTp/Models/accounts-filter-model.cpp
+++ b/KTp/Models/accounts-filter-model.cpp
@@ -893,14 +893,14 @@ bool AccountsFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sou
 {
     QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
 
-    int type = index.data(ContactsModel::ItemRole).userType();
-    if (type == qMetaTypeId<ContactModelItem*>()) {
+    int type = index.data(ContactsModel::TypeRole).toInt();
+    if (type == ContactsModel::ContactRowType) {
         return d->filterAcceptsContact(index);
     }
-    else if (type == qMetaTypeId<AccountsModelItem*>()) {
+    else if (type == ContactsModel::AccountRowType) {
         return d->filterAcceptsAccount(index);
     }
-    else if (type == qMetaTypeId<GroupsModelItem*>()) {
+    else if (type == ContactsModel::GroupRowType) {
         return d->filterAcceptsGroup(index);
     }
     else {

-- 
ktp-common-internals packaging