[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=0e99bc6

The following commit has been merged in the master branch:
commit 0e99bc6e6227f5b608c51af3c78c8b2df77e0232
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 1 10:30:20 2013 +0000

    Fix GroupsTreeProxyModel to new enum
---
 KTp/Models/groups-tree-proxy-model.cpp | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/KTp/Models/groups-tree-proxy-model.cpp b/KTp/Models/groups-tree-proxy-model.cpp
index f9305e0..d393c1c 100644
--- a/KTp/Models/groups-tree-proxy-model.cpp
+++ b/KTp/Models/groups-tree-proxy-model.cpp
@@ -18,8 +18,7 @@
 
 #include "groups-tree-proxy-model.h"
 
-#include "contacts-model.h"
-#include "groups-model.h"
+#include "types.h"
 
 #include <KLocalizedString>
 
@@ -43,7 +42,7 @@ KTp::GroupsTreeProxyModel::~GroupsTreeProxyModel()
 
 QSet<QString> KTp::GroupsTreeProxyModel::groupsForIndex(const QModelIndex &sourceIndex) const
 {
-    QStringList groups = sourceIndex.data(ContactsModel::GroupsRole).value<QStringList>();
+    QStringList groups = sourceIndex.data(KTp::ContactGroupsRole).value<QStringList>();
     if (groups.isEmpty()) {
         groups.append(QLatin1String("_unsorted"));
     }
@@ -55,21 +54,15 @@ QSet<QString> KTp::GroupsTreeProxyModel::groupsForIndex(const QModelIndex &sourc
 QVariant KTp::GroupsTreeProxyModel::dataForGroup(const QString &group, int role) const
 {
     switch (role) {
-    case ContactsModel::TypeRole:
-        return ContactsModel::GroupRowType;
+    case KTp::RowTypeRole:
+        return KTp::GroupRowType;
     case Qt::DisplayRole:
         if (group == QLatin1String("_unsorted")) {
             return i18n("Unsorted");
         } else {
             return group;
         }
-    case GroupsModel::GroupNameRole:
-        if (group == QLatin1String("_unsorted")) {
-            return QString();
-        } else {
-            return group;
-        }
-    case ContactsModel::IdRole:
+    case KTp::IdRole:
         return group;
     }
     return QVariant();

-- 
ktp-common-internals packaging