[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=69e3e28

The following commit has been merged in the master branch:
commit 69e3e28c10bbc8fcef0e7c7bc51d8bca0905faf2
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Feb 1 10:31:27 2013 +0100

    Port to KTp roles
---
 KTp/Models/accounts-tree-proxy-model.cpp | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/KTp/Models/accounts-tree-proxy-model.cpp b/KTp/Models/accounts-tree-proxy-model.cpp
index ead34f6..9207278 100644
--- a/KTp/Models/accounts-tree-proxy-model.cpp
+++ b/KTp/Models/accounts-tree-proxy-model.cpp
@@ -18,7 +18,7 @@
 
 #include "accounts-tree-proxy-model.h"
 
-#include "contacts-model.h"
+#include "types.h"
 
 #include <TelepathyQt/Account>
 #include <TelepathyQt/AccountManager>
@@ -51,7 +51,7 @@ KTp::AccountsTreeProxyModel::AccountsTreeProxyModel(QAbstractItemModel *sourceMo
 
 QSet<QString> KTp::AccountsTreeProxyModel::groupsForIndex(const QModelIndex &sourceIndex) const
 {
-    const Tp::AccountPtr account = sourceIndex.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+    const Tp::AccountPtr account = sourceIndex.data(KTp::AccountRole).value<Tp::AccountPtr>();
     if (account) {
         return QSet<QString>() << account->objectPath();
     } else {
@@ -70,28 +70,16 @@ QVariant KTp::AccountsTreeProxyModel::dataForGroup(const QString &group, int rol
             return account->normalizedName();
         }
         break;
-    case ContactsModel::IconRole:
+    case Qt::DecorationRole:
         account = d->accountManager->accountForObjectPath(group);
         if (account) {
             return account->iconName();
         }
         break;
-    case ContactsModel::AccountRole:
+    case KTp::AccountRole:
         return QVariant::fromValue(d->accountManager->accountForObjectPath(group));
-    case ContactsModel::TypeRole:
-        return ContactsModel::AccountRowType;
-    case ContactsModel::EnabledRole:
-        account = d->accountManager->accountForObjectPath(group);
-        if (account) {
-            return account->isEnabled();
-        }
-        return true;
-    case ContactsModel::ConnectionStatusRole:
-        account = d->accountManager->accountForObjectPath(group);
-        if (account) {
-            return account->connectionStatus();
-        }
-        return Tp::ConnectionStatusConnected;
+    case KTp::RowTypeRole:
+        return KTp::AccountRowType;
     }
 
     return QVariant();

-- 
ktp-common-internals packaging