[telepathy-qt4/master] Connection: Renamed getContactAttributes method to contactAttributes.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/connection.cpp                 |    8 ++++----
 TelepathyQt4/connection.h                   |    2 +-
 TelepathyQt4/pending-contact-attributes.cpp |    4 ++--
 TelepathyQt4/pending-contacts.cpp           |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TelepathyQt4/connection.cpp b/TelepathyQt4/connection.cpp
index 1c6d26c..dd65564 100644
--- a/TelepathyQt4/connection.cpp
+++ b/TelepathyQt4/connection.cpp
@@ -1465,7 +1465,7 @@ PendingOperation *Connection::requestDisconnect()
  * \return Pointer to a newly constructed PendingContactAttributes, tracking the progress of the
  *         request.
  */
-PendingContactAttributes *Connection::getContactAttributes(const UIntList &handles,
+PendingContactAttributes *Connection::contactAttributes(const UIntList &handles,
         const QStringList &interfaces, bool reference)
 {
     debug() << "Request for attributes for" << handles.size() << "contacts";
@@ -1474,16 +1474,16 @@ PendingContactAttributes *Connection::getContactAttributes(const UIntList &handl
         new PendingContactAttributes(ConnectionPtr(this),
                 handles, interfaces, reference);
     if (!isReady()) {
-        warning() << "Connection::getContactAttributes() used when not ready";
+        warning() << "Connection::contactAttributes() used when not ready";
         pending->failImmediately(TELEPATHY_ERROR_NOT_AVAILABLE, "The connection isn't ready");
         return pending;
     } /* FIXME: readd this check when Connection isn't FSCKING broken anymore: else if (status() != StatusConnected) {
-        warning() << "Connection::getContactAttributes() used with status" << status() << "!= StatusConnected";
+        warning() << "Connection::contactAttributes() used with status" << status() << "!= StatusConnected";
         pending->failImmediately(TELEPATHY_ERROR_NOT_AVAILABLE,
                 "The connection isn't Connected");
         return pending;
     } */else if (!this->interfaces().contains(TELEPATHY_INTERFACE_CONNECTION_INTERFACE_CONTACTS)) {
-        warning() << "Connection::getContactAttributes() used without the remote object supporting"
+        warning() << "Connection::contactAttributes() used without the remote object supporting"
                   << "the Contacts interface";
         pending->failImmediately(TELEPATHY_ERROR_NOT_IMPLEMENTED,
                 "The connection doesn't support the Contacts interface");
diff --git a/TelepathyQt4/connection.h b/TelepathyQt4/connection.h
index 0d3519b..d2e0618 100644
--- a/TelepathyQt4/connection.h
+++ b/TelepathyQt4/connection.h
@@ -107,7 +107,7 @@ public:
     PendingHandles *requestHandles(uint handleType, const QStringList &names);
     PendingHandles *referenceHandles(uint handleType, const UIntList &handles);
 
-    PendingContactAttributes *getContactAttributes(const UIntList &handles,
+    PendingContactAttributes *contactAttributes(const UIntList &handles,
             const QStringList &interfaces, bool reference = true);
     QStringList contactAttributeInterfaces() const;
     ContactManager *contactManager() const;
diff --git a/TelepathyQt4/pending-contact-attributes.cpp b/TelepathyQt4/pending-contact-attributes.cpp
index b1d032a..62a9bb6 100644
--- a/TelepathyQt4/pending-contact-attributes.cpp
+++ b/TelepathyQt4/pending-contact-attributes.cpp
@@ -56,7 +56,7 @@ namespace Tp
  * \headerfile <TelepathyQt4/pending-contact-attributes.h> <TelepathyQt4/PendingContactAttributes>
  *
  * Class containing the parameters of and the reply to an asynchronous request for raw contact
- * attributes, as used in the Connection::getContactAttributes() low-level convenience method
+ * attributes, as used in the Connection::contactAttributes() low-level convenience method
  * wrapping the ConnectionInterfaceContactsInterface::GetContactAttributes() D-Bus method.
  */
 
@@ -125,7 +125,7 @@ const QStringList &PendingContactAttributes::interfacesRequested() const
 /**
  * Returns whether it was requested that the contact handles should be referenced in addition to
  * fetching their attributes. This corresponds to the <code>reference</code> argument to
- * Connection::getContactAttributes().
+ * Connection::contactAttributes().
  *
  * \return Whether the handles should be referenced or not.
  */
diff --git a/TelepathyQt4/pending-contacts.cpp b/TelepathyQt4/pending-contacts.cpp
index 6e14583..7b602b6 100644
--- a/TelepathyQt4/pending-contacts.cpp
+++ b/TelepathyQt4/pending-contacts.cpp
@@ -363,7 +363,7 @@ PendingContacts::PendingContacts(ContactManager *manager,
         if (conn->interfaces().contains(TELEPATHY_INTERFACE_CONNECTION_INTERFACE_CONTACTS)) {
             debug() << " Building contacts using contact attributes";
             PendingContactAttributes *attributes =
-                conn->getContactAttributes(otherContacts.toList(),
+                conn->contactAttributes(otherContacts.toList(),
                         interfaces, true);
 
             connect(attributes,
-- 
1.5.6.5