[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=38d07a6

The following commit has been merged in the master branch:
commit 38d07a678288b40bcf24dfe5c2c854ee3262c003
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Dec 8 00:51:42 2013 +0100

    Don't try to scale avatar QPixmap is it's null
    
    When contact does not have an avatar a null QPixmap is returned from model.
    Calling scale() on an empty QPixmap generates a Qt warning, which spams
    console a lot (if you have many such contacts).
---
 contact-delegate-compact.cpp | 4 +++-
 contact-delegate.cpp         | 4 +++-
 tooltips/contacttooltip.cpp  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 509814f..15fc814 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -73,7 +73,9 @@ void ContactDelegateCompact::paintContact(QPainter *painter, const QStyleOptionV
         avatar = SmallIcon("mail-unread-new", KIconLoader::SizeMedium);
     }
 
-    style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    if (!avatar.isNull()) {
+        style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    }
 
     // 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/contact-delegate.cpp b/contact-delegate.cpp
index b5366b0..537e204 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -79,7 +79,9 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     painter->save();
     painter->setClipPath(roundedPath);
 
-    style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    if (!avatar.isNull()) {
+        style->drawItemPixmap(painter, iconRect, Qt::AlignCenter, avatar.scaled(iconRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    }
 
     painter->restore();
 
diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index 61fc405..67e6bc7 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -45,7 +45,9 @@ ContactToolTip::ContactToolTip(const QModelIndex &index) :
     ui->avatarLabel->setAlignment(Qt::AlignCenter);
 
     QPixmap avatarPixmap(qvariant_cast<QPixmap>(index.data(KTp::ContactAvatarPixmapRole)));
-    ui->avatarLabel->setPixmap(avatarPixmap.scaled(ui->avatarLabel->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    if (!avatarPixmap.isNull()) {
+        ui->avatarLabel->setPixmap(avatarPixmap.scaled(ui->avatarLabel->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+    }
 
     KTp::Presence presence(Tp::Presence((Tp::ConnectionPresenceType)index.data(KTp::ContactPresenceTypeRole).toUInt(),
                                         QString(), //the presence name is not needed, saves one call to the model

-- 
ktp-contact-list packaging