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

The following commit has been merged in the master branch:
commit ca988288eb9711c518ad6c082b41e9ef0de952ba
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Jan 15 16:19:02 2013 +0100

    Coding style
---
 KTp/Models/abstract-grouping-proxy-model.cpp | 14 +++--
 KTp/Models/contacts-list-model.cpp           | 88 ++++++++++++++--------------
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/KTp/Models/abstract-grouping-proxy-model.cpp b/KTp/Models/abstract-grouping-proxy-model.cpp
index 2c545ef..ea9044d 100644
--- a/KTp/Models/abstract-grouping-proxy-model.cpp
+++ b/KTp/Models/abstract-grouping-proxy-model.cpp
@@ -98,7 +98,8 @@ GroupNode::GroupNode(const QString &groupId):
 {
 }
 
-QString GroupNode::group() const {
+QString GroupNode::group() const
+{
     return m_groupId;
 }
 
@@ -109,7 +110,8 @@ QVariant GroupNode::data(int role) const
     return proxyModel->dataForGroup(m_groupId, role);
 }
 
-void GroupNode::setForced(bool forced) {
+void GroupNode::setForced(bool forced)
+{
     m_forced = forced;
 }
 
@@ -171,14 +173,14 @@ void KTp::AbstractGroupingProxyModel::onRowsInserted(const QModelIndex &sourcePa
 {
     //if top level in root model
     if (!sourceParent.parent().isValid()) {
-        for (int i = start; i<=end; i++) {
+        for (int i = start; i <= end; i++) {
             QModelIndex index = d->source->index(i, 0, sourceParent);
             Q_FOREACH(const QString &group, groupsForIndex(index)) {
                 addProxyNode(index, itemForGroup(group));
             }
         }
     } else {
-        for (int i = start; i<=end; i++) {
+        for (int i = start; i <= end; i++) {
             QModelIndex index = d->source->index(i, 0, sourceParent);
             QHash<QPersistentModelIndex, ProxyNode*>::const_iterator it = d->proxyMap.find(index);
             while (it != d->proxyMap.end()  && it.key() == index) {
@@ -245,7 +247,7 @@ void KTp::AbstractGroupingProxyModel::onRowsRemoved(const QModelIndex &sourcePar
 
 void KTp::AbstractGroupingProxyModel::onDataChanged(const QModelIndex &sourceTopLeft, const QModelIndex &sourceBottomRight)
 {
-    for (int i=sourceTopLeft.row() ; i<=sourceBottomRight.row() ; i++) {
+    for (int i = sourceTopLeft.row(); i <= sourceBottomRight.row(); i++) {
         QPersistentModelIndex index = d->source->index(i, 0, sourceTopLeft.parent());
 
         //if top level item
@@ -258,7 +260,7 @@ void KTp::AbstractGroupingProxyModel::onDataChanged(const QModelIndex &sourceTop
                 //loop through existing proxy nodes, and check each one is still valid.
                 QHash<QPersistentModelIndex, ProxyNode*>::const_iterator it = d->proxyMap.find(index);
                 QList<ProxyNode*> removedItems;
-                while (it != d->proxyMap.end()  && it.key() == index) {
+                while (it != d->proxyMap.end() && it.key() == index) {
                     // if proxy's group is still in the item's groups.
                     if (itemGroups.contains(it.value()->group())) {
                         itemGroups.remove(it.value()->group());
diff --git a/KTp/Models/contacts-list-model.cpp b/KTp/Models/contacts-list-model.cpp
index fb19731..e8bcd76 100644
--- a/KTp/Models/contacts-list-model.cpp
+++ b/KTp/Models/contacts-list-model.cpp
@@ -123,49 +123,51 @@ void KTp::ContactsListModel::onContactsChanged(const Tp::Contacts &added, const
         KTp::ContactPtr contact = KTp::ContactPtr::qObjectCast(contact_uncasted);
 
         connect(contact.data(),
-                    SIGNAL(aliasChanged(QString)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(avatarTokenChanged(QString)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(avatarDataChanged(Tp::AvatarData)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(presenceChanged(Tp::Presence)),
-                    SLOT(onChanged()));
-            connect(contact->manager()->connection()->selfContact().data(),
-                    SIGNAL(capabilitiesChanged(Tp::ContactCapabilities)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(capabilitiesChanged(Tp::ContactCapabilities)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(locationUpdated(Tp::LocationInfo)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(infoFieldsChanged(Tp::Contact::InfoFields)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(subscriptionStateChanged(Tp::Contact::PresenceState)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(publishStateChanged(Tp::Contact::PresenceState,QString)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(blockStatusChanged(bool)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(clientTypesChanged(QStringList)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(addedToGroup(QString)),
-                    SLOT(onChanged()));
-            connect(contact.data(),
-                    SIGNAL(removedFromGroup(QString)),
-                    SLOT(onChanged()));
-
-            connect(contact.data(), SIGNAL(invalidated()), SLOT(onConnectionDropped()));
+                SIGNAL(aliasChanged(QString)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(avatarTokenChanged(QString)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(avatarDataChanged(Tp::AvatarData)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(presenceChanged(Tp::Presence)),
+                SLOT(onChanged()));
+        connect(contact->manager()->connection()->selfContact().data(),
+                SIGNAL(capabilitiesChanged(Tp::ContactCapabilities)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(capabilitiesChanged(Tp::ContactCapabilities)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(locationUpdated(Tp::LocationInfo)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(infoFieldsChanged(Tp::Contact::InfoFields)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(subscriptionStateChanged(Tp::Contact::PresenceState)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(publishStateChanged(Tp::Contact::PresenceState,QString)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(blockStatusChanged(bool)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(clientTypesChanged(QStringList)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(addedToGroup(QString)),
+                SLOT(onChanged()));
+        connect(contact.data(),
+                SIGNAL(removedFromGroup(QString)),
+                SLOT(onChanged()));
+
+        connect(contact.data(),
+                SIGNAL(invalidated()),
+                SLOT(onConnectionDropped()));
     }
 
     if (added.size() > 0) {

-- 
ktp-common-internals packaging