[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=85f11d8

The following commit has been merged in the master branch:
commit 85f11d83af9fc009b829abc1c0e368b963d284c9
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Mar 30 16:59:40 2012 +0200

    Use KIcon instead of QIcon and copy constructors instead of assignment operator
---
 src/accounts-list-delegate.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/accounts-list-delegate.cpp b/src/accounts-list-delegate.cpp
index 7f431d6..60e3c40 100644
--- a/src/accounts-list-delegate.cpp
+++ b/src/accounts-list-delegate.cpp
@@ -123,14 +123,14 @@ void AccountsListDelegate::updateItemWidgets(const QList<QWidget *> widgets, con
     Q_ASSERT(connectionErrorLabel);
 
 
-    bool isSelected = itemView()->selectionModel()->isSelected(index) && itemView()->hasFocus();
-    bool isEnabled = index.data(Qt::CheckStateRole).toBool();
-    QIcon accountIcon = index.data(Qt::DecorationRole).value<QIcon>();
-    QIcon statusIcon = index.data(AccountsListModel::ConnectionStateIconRole).value<QIcon>();
-    QString statusText = index.data(AccountsListModel::ConnectionStateDisplayRole).toString();
-    QString displayName = index.data(Qt::DisplayRole).toString();
-    QString connectionError = index.data(AccountsListModel::ConnectionErrorMessageDisplayRole).toString();
-    Tp::AccountPtr account = index.data(AccountsListModel::AccountItemRole).value<AccountItem*>()->account();
+    bool isSelected(itemView()->selectionModel()->isSelected(index) && itemView()->hasFocus());
+    bool isEnabled(index.data(Qt::CheckStateRole).toBool());
+    KIcon accountIcon(index.data(Qt::DecorationRole).value<QIcon>());
+    KIcon statusIcon(index.data(AccountsListModel::ConnectionStateIconRole).value<QIcon>());
+    QString statusText(index.data(AccountsListModel::ConnectionStateDisplayRole).toString());
+    QString displayName(index.data(Qt::DisplayRole).toString());
+    QString connectionError(index.data(AccountsListModel::ConnectionErrorMessageDisplayRole).toString());
+    Tp::AccountPtr account(index.data(AccountsListModel::AccountItemRole).value<AccountItem*>()->account());
 
 
     QRect outerRect(0, 0, option.rect.width(), option.rect.height());

-- 
ktp-accounts-kcm packaging