[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=eae086d

The following commit has been merged in the master branch:
commit eae086df7994ad6f00bf4bd09a64865d6f0c22bf
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Nov 18 10:53:34 2012 +0900

    Remove more ContactModelItem references
---
 abstract-contact-delegate.cpp | 10 +++-------
 main-widget.h                 |  1 -
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index bf18f23..6340e3a 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -35,7 +35,6 @@
 #include <KTp/Models/contacts-model.h>
 #include <KTp/Models/accounts-model-item.h>
 #include <KTp/Models/groups-model.h>
-#include <KTp/Models/contact-model-item.h>
 #include <KDebug>
 
 const int SPACING = 2;
@@ -52,9 +51,7 @@ AbstractContactDelegate::~AbstractContactDelegate()
 
 void AbstractContactDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
-    bool isContact = index.data(ContactsModel::ItemRole).userType() == qMetaTypeId<ContactModelItem*>();
-
-    if (isContact) {
+    if (index.data(ContactsModel::TypeRole).toInt() == ContactsModel::ContactRowType) {
         paintContact(painter, option, index);
     } else {
         paintHeader(painter, option, index);
@@ -64,9 +61,8 @@ void AbstractContactDelegate::paint(QPainter* painter, const QStyleOptionViewIte
 QSize AbstractContactDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     Q_UNUSED(option);
-    bool isContact = index.data(ContactsModel::ItemRole).userType() == qMetaTypeId<ContactModelItem*>();
 
-    if (isContact) {
+    if (index.data(ContactsModel::TypeRole).toInt() == ContactsModel::ContactRowType) {
         return sizeHintContact(option, index);
     } else {
         return sizeHintHeader(option, index);
@@ -105,7 +101,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
     QString counts = QString(" (%1/%2)").arg(index.data(ContactsModel::OnlineUsersCountRole).toString(),
                      index.data(ContactsModel::TotalUsersCountRole).toString());
 
-    if (index.data(ContactsModel::ItemRole).userType() == qMetaTypeId<AccountsModelItem*>()) {
+    if (index.data(ContactsModel::TypeRole).toInt() == ContactsModel::AccountRowType) {
         painter->drawPixmap(accountGroupRect, KIcon(index.data(ContactsModel::IconRole).toString())
                             .pixmap(32));
     } else {
diff --git a/main-widget.h b/main-widget.h
index 7f33560..d14a669 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -44,7 +44,6 @@ class AccountsFilterModel;
 class ContactDelegate;
 class FilterBar;
 class KJob;
-class ContactModelItem;
 
 class MainWidget : public KMainWindow, Ui::MainWindow
 {

-- 
ktp-contact-list packaging