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

The following commit has been merged in the master branch:
commit fdb2fd6bfb299a6bea0056c8ccffb0d1eb056abc
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Mar 9 14:31:06 2015 +0100

    Remove unused relation of uri and ktp::ContactPtr
    
    It's redundant to m_contactVCards and unused
    
    Reviewed by David Edmundson.
---
 kpeople/datasourceplugin/im-persons-data-source.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 606ad41..81bb90a 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -67,7 +67,6 @@ private:
     QString createUri(const KTp::ContactPtr &contact) const;
 
     //presence names indexed by ConnectionPresenceType
-    QHash<QString, KTp::ContactPtr> m_contacts;
     QMap<QString, AbstractContact::Ptr> m_contactVCards;
 };
 
@@ -284,11 +283,10 @@ void KTpAllContacts::onAccountCurrentPresenceChanged(const Tp::Presence &current
 
 void KTpAllContacts::onAllKnownContactsChanged(const Tp::Contacts &contactsAdded, const Tp::Contacts &contactsRemoved)
 {
-    if (!m_contacts.isEmpty()) {
+    if (!m_contactVCards.isEmpty()) {
         Q_FOREACH (const Tp::ContactPtr &c, contactsRemoved) {
             const KTp::ContactPtr &contact = KTp::ContactPtr::qObjectCast(c);
             const QString uri = createUri(contact);
-            m_contacts.remove(uri);
             m_contactVCards.remove(uri);
             Q_EMIT contactRemoved(uri);
         }
@@ -310,8 +308,6 @@ void KTpAllContacts::onAllKnownContactsChanged(const Tp::Contacts &contactsAdded
         static_cast<TelepathyContact*>(vcard.data())->setContact(ktpContact);
         static_cast<TelepathyContact*>(vcard.data())->setAccount(KTp::contactManager()->accountForContact(ktpContact));
 
-        m_contacts.insert(uri, ktpContact);
-
         if (added) {
             Q_EMIT contactAdded(uri, vcard);
         } else {
@@ -350,8 +346,6 @@ void KTpAllContacts::onContactInvalidated()
     const KTp::ContactPtr contact(qobject_cast<KTp::Contact*>(sender()));
     const QString uri = createUri(contact);
 
-    m_contacts.remove(uri);
-
     //set to offline and emit changed
     AbstractContact::Ptr vcard = m_contactVCards.value(uri);
     TelepathyContact *tpContact = static_cast<TelepathyContact*>(vcard.data());

-- 
ktp-common-internals packaging