[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=798943e

The following commit has been merged in the master branch:
commit 798943ef0db0d8f4ce665850383128e320164fe5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri May 27 15:57:57 2011 +0100

    Replace passing round QModelIndexes with ContactModelItem* this fixes various crashes when using proxy models.
    
    Reviewed by Martin Klapetek
    
    BUG: 274148
    BUG: 274160
    REVIEW: 101448
---
 models/accounts-model.cpp | 30 ++++--------------------------
 models/accounts-model.h   |  6 +++---
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/models/accounts-model.cpp b/models/accounts-model.cpp
index c342c5b..47fc697 100644
--- a/models/accounts-model.cpp
+++ b/models/accounts-model.cpp
@@ -224,34 +224,12 @@ QVariant AccountsModel::data(const QModelIndex &index, int role) const
     return mPriv->node(index)->data(role);
 }
 
-Tp::AccountPtr AccountsModel::accountForIndex(const QModelIndex &index) const
-{
-    TreeNode *accountNode = mPriv->node(index);
-    AccountsModelItem *item = qobject_cast<AccountsModelItem *>(accountNode);
-    if (item) {
-        return item->account();
-    } else {
-        return Tp::AccountPtr();
-    }
-}
-
-Tp::ContactPtr AccountsModel::contactForIndex(const QModelIndex& index) const
-{
-    TreeNode *contactNode = mPriv->node(index);
-    ContactModelItem *item = qobject_cast<ContactModelItem *>(contactNode);
-    if (item) {
-        return item->contact();
-    } else {
-        return Tp::ContactPtr();
-    }
-}
 
-Tp::AccountPtr AccountsModel::accountForContactIndex(const QModelIndex& index) const
+Tp::AccountPtr AccountsModel::accountForContactItem(ContactModelItem *contactItem) const
 {
-    TreeNode *contactNode = mPriv->node(index);
-    AccountsModelItem *item = qobject_cast<AccountsModelItem*>(contactNode->parent());
-    if (item) {
-        return item->account();
+    AccountsModelItem *accountItem = qobject_cast<AccountsModelItem*>(contactItem->parent());
+    if (accountItem) {
+        return accountItem->account();
     } else {
         return Tp::AccountPtr();
     }
diff --git a/models/accounts-model.h b/models/accounts-model.h
index 0eda7f4..96e8994 100644
--- a/models/accounts-model.h
+++ b/models/accounts-model.h
@@ -32,6 +32,8 @@
 
 #include "accounts-model-item.h"
 
+class ContactModelItem;
+
 class AccountsModel : public QAbstractItemModel
 {
     Q_OBJECT
@@ -93,10 +95,8 @@ public:
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
     virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
     virtual QVariant data(const QModelIndex &index, int role) const;
-    Tp::AccountPtr accountForIndex(const QModelIndex &index) const;
-    Tp::ContactPtr contactForIndex(const QModelIndex &index) const;
 
-    Tp::AccountPtr accountForContactIndex(const QModelIndex &index) const;
+    Tp::AccountPtr accountForContactItem(ContactModelItem* contactItem) const;
 
     virtual Qt::ItemFlags flags(const QModelIndex &index) const;
     virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);

-- 
ktp-common-internals packaging