[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=6f84fae

The following commit has been merged in the master branch:
commit 6f84faedd30c57defc1fc5f6850c0bb891b18987
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Jan 19 21:00:42 2012 +0100

    Cleanup
---
 KTp/Models/accounts-model.cpp       |  6 +++---
 KTp/Models/accounts-model.h         |  2 +-
 KTp/Models/contact-model-item.h     |  1 -
 KTp/Widgets/contact-grid-widget.cpp | 14 +++++++-------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/KTp/Models/accounts-model.cpp b/KTp/Models/accounts-model.cpp
index 13aaa4c..748bced 100644
--- a/KTp/Models/accounts-model.cpp
+++ b/KTp/Models/accounts-model.cpp
@@ -64,7 +64,7 @@ AccountsModel::AccountsModel(QObject *parent)
     connect(mPriv->mTree,
             SIGNAL(childrenRemoved(TreeNode*,int,int)),
             SLOT(onItemsRemoved(TreeNode*,int,int)));
-    
+
     QHash<int, QByteArray> roles;
     roles[ItemRole] = "item";
     roles[IdRole] = "id";
@@ -119,7 +119,7 @@ void AccountsModel::setAccountManager(const Tp::AccountManagerPtr &am)
     if (! mPriv->mAM.isNull()) {
         kDebug() << "account manager already set, ignoring";
     }
-    
+
     if (!am->isReady()) {
         kDebug() << "Ready Account Manager expected";
     }
@@ -127,7 +127,7 @@ void AccountsModel::setAccountManager(const Tp::AccountManagerPtr &am)
     Q_FOREACH (Tp::AccountPtr account, mPriv->mAM->allAccounts()) {
        onNewAccount(account);
     }
-    
+
     connect(mPriv->mAM.data(),
             SIGNAL(newAccount(Tp::AccountPtr)),
             SLOT(onNewAccount(Tp::AccountPtr)));
diff --git a/KTp/Models/accounts-model.h b/KTp/Models/accounts-model.h
index c86d8cf..cca956a 100644
--- a/KTp/Models/accounts-model.h
+++ b/KTp/Models/accounts-model.h
@@ -97,7 +97,7 @@ public:
 
     explicit AccountsModel(QObject *parent = 0);
     virtual ~AccountsModel();
-    
+
     void setAccountManager(const Tp::AccountManagerPtr &am);
 
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
diff --git a/KTp/Models/contact-model-item.h b/KTp/Models/contact-model-item.h
index 2bb845c..4d8ce51 100644
--- a/KTp/Models/contact-model-item.h
+++ b/KTp/Models/contact-model-item.h
@@ -61,5 +61,4 @@ private:
 
 Q_DECLARE_METATYPE(ContactModelItem*);
 
-
 #endif // TELEPATHY_CONTACT_MODEL_ITEM_H
diff --git a/KTp/Widgets/contact-grid-widget.cpp b/KTp/Widgets/contact-grid-widget.cpp
index d82cb49..c1fd4d3 100644
--- a/KTp/Widgets/contact-grid-widget.cpp
+++ b/KTp/Widgets/contact-grid-widget.cpp
@@ -49,21 +49,21 @@ KTp::ContactGridDelegate::~ContactGridDelegate()
 void KTp::ContactGridDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     QStyle *style = QApplication::style();
-    int textHeight = option.fontMetrics.height()*2;
+    int textHeight = option.fontMetrics.height() * 2;
 
     style->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter);
 
-    QRect avatarRect = option.rect.adjusted(0,0,0,-textHeight);
-    QRect textRect = option.rect.adjusted(0,option.rect.height()-textHeight,0,-3);
+    QRect avatarRect = option.rect.adjusted(0, 0, 0, -textHeight);
+    QRect textRect = option.rect.adjusted(0, option.rect.height() - textHeight, 0, -3);
 
     QPixmap avatar = index.data(Qt::DecorationRole).value<QPixmap>();
     if (avatar.isNull()) {
-        avatar = KIcon(QLatin1String("im-user-online")).pixmap(QSize(70,70));
+        avatar = KIcon(QLatin1String("im-user-online")).pixmap(QSize(70, 70));
     }
 
     //resize larger avatars
-    if (avatar.width() > 80 || avatar.height()> 80) {
-        avatar = avatar.scaled(QSize(80,80), Qt::KeepAspectRatio);
+    if (avatar.width() > 80 || avatar.height() > 80) {
+        avatar = avatar.scaled(QSize(80, 80), Qt::KeepAspectRatio);
         //draw leaving paddings on smaller (or non square) avatars
     }
     style->drawItemPixmap(painter, avatarRect, Qt::AlignCenter, avatar);
@@ -79,7 +79,7 @@ void KTp::ContactGridDelegate::paint(QPainter *painter, const QStyleOptionViewIt
 QSize KTp::ContactGridDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     Q_UNUSED(index);
-    int textHeight = option.fontMetrics.height()*2;
+    int textHeight = option.fontMetrics.height() * 2;
     return QSize(84, 80 + textHeight + 3);
 }
 

-- 
ktp-common-internals packaging