[Telepathy-commits] [telepathy-qt4/master] It's more natural to call PendingContacts::contactManager() just manager(), no?

[Olli Salli]

---
 TelepathyQt4/Client/pending-contacts.cpp |    4 ++--
 TelepathyQt4/Client/pending-contacts.h   |    2 +-
 tests/dbus/contacts.cpp                  |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TelepathyQt4/Client/pending-contacts.cpp b/TelepathyQt4/Client/pending-contacts.cpp
index 91b8dc9..e927769 100644
--- a/TelepathyQt4/Client/pending-contacts.cpp
+++ b/TelepathyQt4/Client/pending-contacts.cpp
@@ -79,7 +79,7 @@ PendingContacts::~PendingContacts()
     delete mPriv;
 }
 
-ContactManager *PendingContacts::contactManager() const
+ContactManager *PendingContacts::manager() const
 {
     return mPriv->manager;
 }
@@ -190,7 +190,7 @@ void PendingContacts::onHandlesFinished(PendingOperation *operation)
 
     debug() << " Success - doing nested contact query";
 
-    mPriv->nested = contactManager()->contactsForHandles(pendingHandles->handles(), features());
+    mPriv->nested = manager()->contactsForHandles(pendingHandles->handles(), features());
     connect(mPriv->nested,
             SIGNAL(finished(Telepathy::Client::PendingOperation*)),
             SLOT(onNestedFinished(Telepathy::Client::PendingOperation*)));
diff --git a/TelepathyQt4/Client/pending-contacts.h b/TelepathyQt4/Client/pending-contacts.h
index 2123ffe..361645c 100644
--- a/TelepathyQt4/Client/pending-contacts.h
+++ b/TelepathyQt4/Client/pending-contacts.h
@@ -51,7 +51,7 @@ class PendingContacts : public PendingOperation
 public:
     ~PendingContacts();
 
-    ContactManager *contactManager() const;
+    ContactManager *manager() const;
     QSet<Contact::Feature> features() const;
 
     bool isForHandles() const;
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index f4d1518..7a50575 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -199,7 +199,7 @@ void TestContacts::testForHandles()
     PendingContacts *pending = mConn->contactManager()->contactsForHandles(handles);
 
     // Test the closure accessors
-    QCOMPARE(pending->contactManager(), mConn->contactManager());
+    QCOMPARE(pending->manager(), mConn->contactManager());
     QCOMPARE(pending->features(), QSet<Contact::Feature>());
 
     QVERIFY(pending->isForHandles());
@@ -304,7 +304,7 @@ void TestContacts::testForIdentifiers()
     PendingContacts *pending = mConn->contactManager()->contactsForIdentifiers(validIDs);
 
     // Test the closure accessors
-    QCOMPARE(pending->contactManager(), mConn->contactManager());
+    QCOMPARE(pending->manager(), mConn->contactManager());
     QCOMPARE(pending->features(), QSet<Contact::Feature>());
 
     QVERIFY(!pending->isForHandles());
-- 
1.5.6.5