[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=3724d25

The following commit has been merged in the master branch:
commit 3724d252889943c165d433b49cd428206c3ed245
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Fri Jan 28 15:16:24 2011 +0000

    Dario Review: tidy up signal/slot connection.
---
 kpeople/nepomuk-feeder/account.cpp         | 50 +++++++++++++++++-------------
 kpeople/nepomuk-feeder/contact.cpp         |  6 ++--
 kpeople/nepomuk-feeder/controller.cpp      |  4 +--
 kpeople/nepomuk-feeder/nepomuk-storage.cpp |  4 +--
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/kpeople/nepomuk-feeder/account.cpp b/kpeople/nepomuk-feeder/account.cpp
index 263580b..1a0a277 100644
--- a/kpeople/nepomuk-feeder/account.cpp
+++ b/kpeople/nepomuk-feeder/account.cpp
@@ -43,8 +43,8 @@ void Account::init()
 {
     // Connect to all the signals that indicate changes in properties we care about.
     connect(m_account.data(),
-            SIGNAL(nicknameChanged(const QString &)),
-            SLOT(onNicknameChanged(const QString &)));
+            SIGNAL(nicknameChanged(QString)),
+            SLOT(onNicknameChanged(QString)));
     connect(m_account.data(),
             SIGNAL(currentPresenceChanged(Tp::Presence)),
             SLOT(onCurrentPresenceChanged(Tp::Presence)));
@@ -54,7 +54,6 @@ void Account::init()
     // ...... and any other properties we want to sync...
     connect(m_account.data(),
             SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)),
-            this,
             SLOT(onConnectionStatusChanged(Tp::ConnectionStatus)));
 
     // Emit a signal to notify the storage that a new account has been constructed
@@ -159,24 +158,33 @@ void Account::onNewContact(const Tp::ContactPtr &contact)
         m_contacts.insert(contact, c);
 
         // Connect to all its signals
-        connect(c, SIGNAL(created(QString)),
-                this, SLOT(onContactCreated(QString)));
-        connect(c, SIGNAL(contactDestroyed(QString,Tp::ContactPtr)),
-                this, SLOT(onContactDestroyed(QString,Tp::ContactPtr)));
-        connect(c, SIGNAL(aliasChanged(QString,QString)),
-                this, SLOT(onContactAliasChanged(QString,QString)));
-        connect(c, SIGNAL(presenceChanged(QString,Tp::SimplePresence)),
-                this, SLOT(onContactPresenceChanged(QString,Tp::SimplePresence)));
-        connect(c, SIGNAL(addedToGroup(QString,QString)),
-                this, SLOT(onContactAddedToGroup(QString,QString)));
-        connect(c, SIGNAL(removedFromGroup(QString,QString)),
-                this, SLOT(onContactRemovedFromGroup(QString,QString)));
-        connect(c, SIGNAL(blockStatusChanged(QString,bool)),
-                this, SLOT(onContactBlockStatusChanged(QString,bool)));
-        connect(c, SIGNAL(publishStateChanged(QString,Tp::Contact::PresenceState)),
-                this, SLOT(onContactPublishStateChanged(QString,Tp::Contact::PresenceState)));
-        connect(c, SIGNAL(subscriptionStateChanged(QString,Tp::Contact::PresenceState)),
-                this, SLOT(onContactSubscriptionStateChanged(QString,Tp::Contact::PresenceState)));
+        connect(c,
+                SIGNAL(created(QString)),
+                SLOT(onContactCreated(QString)));
+        connect(c,
+                SIGNAL(contactDestroyed(QString,Tp::ContactPtr)),
+                SLOT(onContactDestroyed(QString,Tp::ContactPtr)));
+        connect(c,
+                SIGNAL(aliasChanged(QString,QString)),
+                SLOT(onContactAliasChanged(QString,QString)));
+        connect(c,
+                SIGNAL(presenceChanged(QString,Tp::SimplePresence)),
+                SLOT(onContactPresenceChanged(QString,Tp::SimplePresence)));
+        connect(c,
+                SIGNAL(addedToGroup(QString,QString)),
+                SLOT(onContactAddedToGroup(QString,QString)));
+        connect(c,
+                SIGNAL(removedFromGroup(QString,QString)),
+                SLOT(onContactRemovedFromGroup(QString,QString)));
+        connect(c,
+                SIGNAL(blockStatusChanged(QString,bool)),
+                SLOT(onContactBlockStatusChanged(QString,bool)));
+        connect(c,
+                SIGNAL(publishStateChanged(QString,Tp::Contact::PresenceState)),
+                SLOT(onContactPublishStateChanged(QString,Tp::Contact::PresenceState)));
+        connect(c,
+                SIGNAL(subscriptionStateChanged(QString,Tp::Contact::PresenceState)),
+                SLOT(onContactSubscriptionStateChanged(QString,Tp::Contact::PresenceState)));
 
         c->init();
     }
diff --git a/kpeople/nepomuk-feeder/contact.cpp b/kpeople/nepomuk-feeder/contact.cpp
index 91bdcfd..24324e1 100644
--- a/kpeople/nepomuk-feeder/contact.cpp
+++ b/kpeople/nepomuk-feeder/contact.cpp
@@ -60,13 +60,13 @@ void Contact::init()
             SIGNAL(capabilitiesChanged(Tp::ContactCapabilities)),
             SLOT(onCapabilitiesChanged(Tp::ContactCapabilities)));
     connect(m_contact.data(),
-            SIGNAL(subscriptionStateChanged(Tp::Contact::PresenceState, Tp::Channel::GroupMemberChangeDetails)),
+            SIGNAL(subscriptionStateChanged(Tp::Contact::PresenceState,Tp::Channel::GroupMemberChangeDetails)),
             SLOT(onSubscriptionStateChanged(Tp::Contact::PresenceState)));
     connect(m_contact.data(),
-            SIGNAL(publishStateChanged(Tp::Contact::PresenceState, Tp::Channel::GroupMemberChangeDetails)),
+            SIGNAL(publishStateChanged(Tp::Contact::PresenceState,Tp::Channel::GroupMemberChangeDetails)),
             SLOT(onPublishStateChanged(Tp::Contact::PresenceState)));
     connect(m_contact.data(),
-            SIGNAL(blockStatusChanged(bool, Tp::Channel::GroupMemberChangeDetails)),
+            SIGNAL(blockStatusChanged(bool,Tp::Channel::GroupMemberChangeDetails)),
             SLOT(onBlockStatusChanged(bool)));
     // FIXME: Connect to any other signals of sync-worthy properties here.
 
diff --git a/kpeople/nepomuk-feeder/controller.cpp b/kpeople/nepomuk-feeder/controller.cpp
index 23f6a46..501ebc3 100644
--- a/kpeople/nepomuk-feeder/controller.cpp
+++ b/kpeople/nepomuk-feeder/controller.cpp
@@ -98,8 +98,8 @@ void Controller::onAccountManagerReady(Tp::PendingOperation *op)
 
      // Account Manager is now ready. We should watch for any new accounts being created.
     connect(m_accountManager.data(),
-            SIGNAL(newAccount(const Tp::AccountPtr &)),
-            SLOT(onNewAccount(const Tp::AccountPtr &)));
+            SIGNAL(newAccount(Tp::AccountPtr)),
+            SLOT(onNewAccount(Tp::AccountPtr)));
 
     // Take into account (ha ha) the accounts that already existed when the AM object became ready.
     foreach (const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.cpp b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
index 7c4a25e..6bb3a30 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.cpp
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.cpp
@@ -114,8 +114,8 @@ NepomukStorage::NepomukStorage(QObject *parent)
     m_resourceManager = Nepomuk::ResourceManager::instance();
 
     connect(m_resourceManager,
-            SIGNAL(error(QString, int)),
-            SLOT(onNepomukError(QString, int)));
+            SIGNAL(error(QString,int)),
+            SLOT(onNepomukError(QString,int)));
 
     // Here we get the "me" person contact.
     // FIXME: Port to new OSCAF standard for accessing "me" as soon as it

-- 
ktp-common-internals packaging