[Telepathy-commits] [telepathy-qt4/master] ContactManager: Make allKnownContacts return the cached contacts instead of a PendingOperation.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/contact-manager.cpp |    5 ++---
 TelepathyQt4/Client/contact-manager.h   |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/TelepathyQt4/Client/contact-manager.cpp b/TelepathyQt4/Client/contact-manager.cpp
index dd87bd3..63169b4 100644
--- a/TelepathyQt4/Client/contact-manager.cpp
+++ b/TelepathyQt4/Client/contact-manager.cpp
@@ -144,10 +144,9 @@ QSet<Contact::Feature> ContactManager::supportedFeatures() const
     return mPriv->supportedFeatures;
 }
 
-PendingContacts *ContactManager::allKnownContacts(
-        const QSet<Contact::Feature> &features)
+QSet<QSharedPointer<Contact> > ContactManager::allKnownContacts() const
 {
-    return upgradeContacts(mPriv->allKnownContacts().toList(), features);
+    return mPriv->allKnownContacts();
 }
 
 bool ContactManager::canRequestContactsPresenceSubscription() const
diff --git a/TelepathyQt4/Client/contact-manager.h b/TelepathyQt4/Client/contact-manager.h
index fe139d1..777d027 100644
--- a/TelepathyQt4/Client/contact-manager.h
+++ b/TelepathyQt4/Client/contact-manager.h
@@ -56,8 +56,7 @@ class ContactManager : public QObject
         bool isSupported() const;
         QSet<Contact::Feature> supportedFeatures() const;
 
-        PendingContacts *allKnownContacts(
-                const QSet<Contact::Feature> &features = QSet<Contact::Feature>());
+        QSet<QSharedPointer<Contact> > allKnownContacts() const;
 
         bool canRequestContactsPresenceSubscription() const;
         PendingOperation *requestContactsPresenceSubscription(
-- 
1.5.6.5