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

The following commit has been merged in the master branch:
commit c9a339338955992707467bd44bc27794f43b8e8d
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Jan 14 22:41:42 2012 +1100

    Remove support for setting a ConversationTarget's Tp::ContactPtr
    
    Removes the setContact() method and contactChanged() signal.
    Also removes removeContactSignals() method, as it's no longer
    needed.
---
 KTp/Declarative/conversation-target.cpp | 18 ------------------
 KTp/Declarative/conversation-target.h   |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/KTp/Declarative/conversation-target.cpp b/KTp/Declarative/conversation-target.cpp
index f3b600b..1388613 100644
--- a/KTp/Declarative/conversation-target.cpp
+++ b/KTp/Declarative/conversation-target.cpp
@@ -96,24 +96,6 @@ Tp::ContactPtr ConversationTarget::contact() const
     return d->contact;
 }
 
-void ConversationTarget::setContact(const Tp::ContactPtr &contact)
-{
-    if (d->contact) {
-        removeContactSignals(d->contact);
-    }
-
-    d->contact = contact;
-    setupContactSignals(d->contact);
-    Q_EMIT contactChanged(contact);
-}
-
-void ConversationTarget::removeContactSignals(Tp::ContactPtr contact)
-{
-    disconnect(contact.constData(), SIGNAL(aliasChanged(QString)), this, SIGNAL(nickChanged(QString)));
-    disconnect(contact.constData(), SIGNAL(avatarDataChanged(Tp::AvatarData)), this, SLOT(onAvatarDataChanged(Tp::AvatarData)));
-    disconnect(contact.constData(), SIGNAL(presenceChanged(Tp::Presence)), this, SLOT(onPresenceChanged(Tp::Presence)));
-}
-
 ConversationTarget::~ConversationTarget()
 {
     delete d;
diff --git a/KTp/Declarative/conversation-target.h b/KTp/Declarative/conversation-target.h
index 858388e..6dcb44d 100644
--- a/KTp/Declarative/conversation-target.h
+++ b/KTp/Declarative/conversation-target.h
@@ -47,14 +47,12 @@ public:
     QIcon   presenceIcon() const;
 
     Tp::ContactPtr contact() const;
-    void setContact(const Tp::ContactPtr &contact);
 
 Q_SIGNALS:
     void avatarChanged(QIcon avatar);
     void nickChanged(QString nick);
     void presenceIconChanged(QIcon icon);
 
-    void contactChanged(Tp::ContactPtr contact);
 
 private Q_SLOTS:
     void onAvatarDataChanged(const Tp::AvatarData&);
@@ -62,7 +60,6 @@ private Q_SLOTS:
 
 private:
     void setupContactSignals(Tp::ContactPtr contact);
-    void removeContactSignals(Tp::ContactPtr contact);
     void updateAvatar();
 
     class ConversationTargetPrivate;

-- 
ktp-common-internals packaging