[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=c59a722

The following commit has been merged in the master branch:
commit c59a722ae4356655a32608a46c41f31b55428068
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Sep 15 14:06:28 2013 +0200

    Remove redundant code from EntityModel
---
 logviewer/entity-model.cpp | 32 --------------------------------
 logviewer/entity-model.h   |  3 +--
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/logviewer/entity-model.cpp b/logviewer/entity-model.cpp
index c7aa55c..f933aa8 100644
--- a/logviewer/entity-model.cpp
+++ b/logviewer/entity-model.cpp
@@ -149,41 +149,9 @@ void EntityModel::onEntitiesSearchFinished(KTp::PendingLoggerOperation *operatio
         endInsertRows();
     }
 
-// Fetch the names only when we don't have KPeople.
-#ifdef HAVE_KPEOPLE
-    if (!KTp::kpeopleEnabled()) {
-#endif
-        if (pendingEntities->account()->connection()) {
-            Tp::PendingOperation *op =
-            pendingEntities->account()->connection()->contactManager()->contactsForIdentifiers(ids);
-            connect(op, SIGNAL(finished(Tp::PendingOperation*)),
-                    this, SLOT(onEntityContactRetrieved(Tp::PendingOperation*)));
-        }
-#ifdef HAVE_KPEOPLE
-    }
-#endif
-
     Q_ASSERT(m_pendingOperations.contains(operation));
     m_pendingOperations.removeAll(operation);
     if (m_pendingOperations.isEmpty()) {
         Q_EMIT modelInitialized();
     }
 }
-
-void EntityModel::onEntityContactRetrieved(Tp::PendingOperation *op)
-{
-    Tp::PendingContacts *pc = qobject_cast<Tp::PendingContacts*>(op);
-    Q_ASSERT(pc);
-
-    const QStringList keys = m_items.uniqueKeys();
-    Q_FOREACH (const Tp::ContactPtr &contact, pc->contacts()) {
-        EntityModelItem *item = m_items.value(contact->id());
-        Q_ASSERT(item);
-
-        item->displayName = contact->alias();
-
-        const QModelIndex changedIndex = index(keys.indexOf(contact->id()), 0);
-        Q_EMIT dataChanged(changedIndex, changedIndex);
-    }
-
-}
diff --git a/logviewer/entity-model.h b/logviewer/entity-model.h
index 8d0d6a7..ccb0cc0 100644
--- a/logviewer/entity-model.h
+++ b/logviewer/entity-model.h
@@ -24,8 +24,8 @@
 #include <QAbstractItemModel>
 
 #include <TelepathyQt/Types>
-
 #include <TelepathyQt/Account>
+
 #include <KTp/types.h>
 
 /**
@@ -75,7 +75,6 @@ Q_SIGNALS:
 
 private Q_SLOTS:
     void onEntitiesSearchFinished(KTp::PendingLoggerOperation*);
-    void onEntityContactRetrieved(Tp::PendingOperation*);
 
 private:
     QMap<QString /* id */,EntityModelItem*> m_items;

-- 
ktp-text-ui packaging