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

The following commit has been merged in the master branch:
commit eb93fbc9e4ce5d03cf3792137cd8876aa8b6c6f5
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Mar 11 20:36:39 2011 +0100

    Remove the AccountsModel::contactForIndex method, which we can replace by accessing AccountsModel::data(index, ItemRole) as suggested by David Edmundson
---
 models/accounts-model.cpp | 11 -----------
 models/accounts-model.h   |  1 -
 2 files changed, 12 deletions(-)

diff --git a/models/accounts-model.cpp b/models/accounts-model.cpp
index b1f8e03..dacb5a7 100644
--- a/models/accounts-model.cpp
+++ b/models/accounts-model.cpp
@@ -233,17 +233,6 @@ Tp::AccountPtr AccountsModel::accountForIndex(const QModelIndex &index) const
     }
 }
 
-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
 {
     TreeNode *contactNode = mPriv->node(index);
diff --git a/models/accounts-model.h b/models/accounts-model.h
index c503c60..319d537 100644
--- a/models/accounts-model.h
+++ b/models/accounts-model.h
@@ -94,7 +94,6 @@ public:
     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;
 
     virtual Qt::ItemFlags flags(const QModelIndex &index) const;

-- 
ktp-common-internals packaging