[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=897af79

The following commit has been merged in the master branch:
commit 897af79f846a979bc737cbbd752e93de299ed2ff
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Jul 22 17:32:43 2011 +0200

    Switch to QPixmap::load to avoid duplicating pixmap construction
    
    Reviewed-by: David Edmunson <kde at davidedmundson.co.uk>
---
 contact-delegate-compact.cpp | 3 ++-
 contact-delegate.cpp         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index 45cd282..4415af8 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -74,7 +74,8 @@ void ContactDelegateCompact::paint(QPainter * painter, const QStyleOptionViewIte
         iconRect.setSize(QSize(AVATAR_SIZE, AVATAR_SIZE));
         iconRect.moveTo(QPoint(iconRect.x() + SPACING, iconRect.y() + SPACING));
 
-        QPixmap avatar = QPixmap::fromImage(QImage(index.data(AccountsModel::AvatarRole).toString()));
+        QPixmap avatar;
+        avatar.load(index.data(AccountsModel::AvatarRole).toString());
 
         bool noContactAvatar = avatar.isNull();
 
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 159894f..e75d094 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -75,7 +75,8 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
         iconRect.setSize(QSize(AVATAR_SIZE, AVATAR_SIZE));
         iconRect.moveTo(QPoint(iconRect.x() + SPACING, iconRect.y() + SPACING));
 
-        QPixmap avatar = QPixmap::fromImage(QImage(index.data(AccountsModel::AvatarRole).toString()));
+        QPixmap avatar;
+        avatar.load(index.data(AccountsModel::AvatarRole).toString());
 
         bool noContactAvatar = avatar.isNull();
 

-- 
ktp-contact-list packaging