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

The following commit has been merged in the master branch:
commit e0b108101340ca63d3f69955dee8c11d5b1897d3
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Feb 8 17:22:11 2013 +0100

    Make it possible to call the slots directly too
    
    Reviewed-by: David Edmundson
---
 kpeople/nepomuk-feeder/account.cpp | 24 ++++++++++++++++++------
 kpeople/nepomuk-feeder/account.h   |  6 ++++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/kpeople/nepomuk-feeder/account.cpp b/kpeople/nepomuk-feeder/account.cpp
index 14e38bb..d11caef 100644
--- a/kpeople/nepomuk-feeder/account.cpp
+++ b/kpeople/nepomuk-feeder/account.cpp
@@ -182,10 +182,10 @@ void Account::onNewContact(const Tp::ContactPtr &contact)
         // Connect to all its signals
         connect(contact.data(),
                 SIGNAL(aliasChanged(QString)),
-                SLOT(onContactAliasChanged(QString)));
+                SLOT(onContactAliasChanged()));
         connect(contact.data(),
                 SIGNAL(addedToGroup(QString)),
-                SLOT(onContactAddedToGroup(QString)));
+                SLOT(onContactAddedToGroup()));
         connect(contact.data(),
                 SIGNAL(removedFromGroup(QString)),
                 SLOT(onContactRemovedFromGroup(QString)));
@@ -194,15 +194,22 @@ void Account::onNewContact(const Tp::ContactPtr &contact)
                 SLOT(onContactAvatarChanged(Tp::AvatarData)));
 
         emit contactCreated(m_account->objectPath(), contact->id());
+
+        onContactAddedToGroup(contact);
+        onContactAliasChanged(contact);
     }
 }
 
-void Account::onContactAddedToGroup(const QString &group)
+void Account::onContactAddedToGroup()
 {
-    Q_UNUSED(group);
     const Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
     Q_ASSERT(contact);
 
+    onContactAddedToGroup(contact);
+}
+
+void Account::onContactAddedToGroup(const Tp::ContactPtr &contact)
+{
     emit contactGroupsChanged(m_account->objectPath(), contact->id(), contact->groups());
 }
 
@@ -215,12 +222,17 @@ void Account::onContactRemovedFromGroup(const QString &group)
     emit contactGroupsChanged(m_account->objectPath(), contact->id(), contact->groups());
 }
 
-void Account::onContactAliasChanged(const QString &alias)
+void Account::onContactAliasChanged()
 {
     const Tp::ContactPtr contact(qobject_cast<Tp::Contact*>(sender()));
     Q_ASSERT(contact);
 
-    emit contactAliasChanged(m_account->objectPath(), contact->id(), alias);
+    onContactAliasChanged(contact);
+}
+
+void Account::onContactAliasChanged(const Tp::ContactPtr &contact)
+{
+    emit contactAliasChanged(m_account->objectPath(), contact->id(), contact->alias());
 }
 
 void Account::onContactAvatarChanged(const Tp::AvatarData &avatar)
diff --git a/kpeople/nepomuk-feeder/account.h b/kpeople/nepomuk-feeder/account.h
index 2b40da5..c09d946 100644
--- a/kpeople/nepomuk-feeder/account.h
+++ b/kpeople/nepomuk-feeder/account.h
@@ -67,9 +67,11 @@ private Q_SLOTS:
     void onNewContact(const Tp::ContactPtr &contact);
     void onAccountRemoved();
 
-    void onContactAddedToGroup(const QString &group);
+    void onContactAddedToGroup();
+    void onContactAddedToGroup(const Tp::ContactPtr &contact);
     void onContactRemovedFromGroup(const QString &group);
-    void onContactAliasChanged(const QString &alias);
+    void onContactAliasChanged();
+    void onContactAliasChanged(const Tp::ContactPtr &contact);
     void onContactAvatarChanged(const Tp::AvatarData &avatar);
 
 private:

-- 
ktp-common-internals packaging