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

The following commit has been merged in the master branch:
commit c1bc33651b3a21242ca2674980e4af898c3e36b3
Author: Alin M Elena <alinm.elena at gmail.com>
Date:   Sun Mar 3 09:30:54 2013 +0000

    porterd contact list to use the new avatarPixmap class
    REVIEW: 10923porterd contact list to use the new avatarPixmap class
    REVIEW: 109232
    FEATURE: 315965
---
 contact-delegate-compact.cpp |  9 +--------
 contact-delegate.cpp         | 22 +++++-----------------
 tooltips/contacttooltip.cpp  | 11 +++--------
 tooltips/contacttooltip.h    |  2 +-
 4 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index ee2e668..46bee7b 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -64,14 +64,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     iconRect.setSize(QSize(m_avatarSize, m_avatarSize));
     iconRect.moveTo(QPoint(iconRect.x() + m_spacing, iconRect.y() + m_spacing));
 
-    QPixmap avatar;
-    avatar.load(index.data(KTp::ContactAvatarPathRole).toString());
-
-    bool noContactAvatar = avatar.isNull();
-
-    if (noContactAvatar) {
-        avatar = SmallIcon("im-user", KIconLoader::SizeMedium);
-    }
+    QPixmap avatar(qvariant_cast<QPixmap>(index.data(KTp::ContactAvatarPixmapRole)));
 
     if (index.data(KTp::ContactUnreadMessageCountRole).toInt() > 0) {
         avatar = SmallIcon("mail-unread-new", KIconLoader::SizeMedium);
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 810594a..7110587 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -68,15 +68,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     iconRect.setSize(QSize(m_avatarSize, m_avatarSize));
     iconRect.moveTo(QPoint(iconRect.x() + m_spacing, iconRect.y() + m_spacing));
 
-    QPixmap avatar;
-    avatar.load(index.data(KTp::ContactAvatarPathRole).toString());
-
-    bool noContactAvatar = avatar.isNull();
-
-    if (noContactAvatar) {
-        avatar = SmallIcon("im-user", KIconLoader::SizeMedium);
-    }
-
+    QPixmap avatar(qvariant_cast<QPixmap>(index.data(KTp::ContactAvatarPixmapRole)));
     if (index.data(KTp::ContactUnreadMessageCountRole).toInt() > 0) {
         avatar = SmallIcon("mail-unread-new", KIconLoader::SizeMedium);
     }
@@ -84,17 +76,13 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     QPainterPath roundedPath;
     roundedPath.addRoundedRect(iconRect, 20, 20, Qt::RelativeSize);
 
-    if (!noContactAvatar) {
-        painter->save();
-        painter->setClipPath(roundedPath);
-    }
+    painter->save();
+    painter->setClipPath(roundedPath);
 
     style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
 
-    if (!noContactAvatar) {
-        painter->restore();
-        painter->drawPath(roundedPath);
-    }
+    painter->restore();
+    painter->drawPath(roundedPath);
 
     // This value is used to set the correct width for the username and the presence message.
     int rightIconsWidth = m_presenceIconSize + m_spacing;
diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index 712c4e2..7da02dd 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -44,13 +44,8 @@ ContactToolTip::ContactToolTip(const QModelIndex &index) :
     ui->avatarLabel->setScaledContents(false);
     ui->avatarLabel->setAlignment(Qt::AlignCenter);
 
-    QString avatar = index.data(KTp::ContactAvatarPathRole).toString();
-    if (avatar.isEmpty()) {
-        ui->avatarLabel->setPixmap(KIconLoader::global()->loadIcon("im-user", KIconLoader::NoGroup, 96));
-    } else {
-        QPixmap avatarPixmap(avatar);
-        ui->avatarLabel->setPixmap(avatarPixmap.scaled(ui->avatarLabel->size(), Qt::KeepAspectRatio));
-    }
+    QPixmap avatarPixmap(qvariant_cast<QPixmap>(index.data(KTp::ContactAvatarPixmapRole)));
+    ui->avatarLabel->setPixmap(avatarPixmap.scaled(ui->avatarLabel->size(), Qt::KeepAspectRatio));
 
     QString presenceMessage = index.data(KTp::ContactPresenceMessageRole).toString();
     QString presenceIconPath = index.data(KTp::ContactPresenceIconRole).toString();
@@ -115,4 +110,4 @@ QString ContactToolTip::getTextWithHyperlinks(QString text)
     }
 
     return result;
-}
+}
\ No newline at end of file
diff --git a/tooltips/contacttooltip.h b/tooltips/contacttooltip.h
index 60e8428..1b033be 100644
--- a/tooltips/contacttooltip.h
+++ b/tooltips/contacttooltip.h
@@ -38,7 +38,7 @@ public:
     explicit ContactToolTip(const QModelIndex &index);
     ~ContactToolTip();
 
-    static QString getTextWithHyperlinks(QString text);
+    static QString getTextWithHyperlinks(QString text);  
 
 public slots:
     void openLink(QString);

-- 
ktp-contact-list packaging