[telepathy-qt4/master] PendingContactAttributes: Return ConnectionPtr on connection() method.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/pending-contact-attributes.cpp |   19 +++++++++++--------
 TelepathyQt4/Client/pending-contact-attributes.h   |    9 +++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/TelepathyQt4/Client/pending-contact-attributes.cpp b/TelepathyQt4/Client/pending-contact-attributes.cpp
index 97b9f39..64254a6 100644
--- a/TelepathyQt4/Client/pending-contact-attributes.cpp
+++ b/TelepathyQt4/Client/pending-contact-attributes.cpp
@@ -64,7 +64,7 @@ namespace Client
 
 struct PendingContactAttributes::Private
 {
-    Connection *connection;
+    ConnectionPtr connection;
     UIntList contactsRequested;
     QStringList interfacesRequested;
     bool shouldReference;
@@ -73,9 +73,10 @@ struct PendingContactAttributes::Private
     ContactAttributesMap attributes;
 };
 
-PendingContactAttributes::PendingContactAttributes(Connection* connection, const UIntList &handles,
-        const QStringList &interfaces, bool reference)
-    : PendingOperation(connection), mPriv(new Private)
+PendingContactAttributes::PendingContactAttributes(const ConnectionPtr &connection,
+        const UIntList &handles, const QStringList &interfaces, bool reference)
+    : PendingOperation(connection.data()),
+      mPriv(new Private)
 {
     debug() << "PendingContactAttributes()";
 
@@ -98,7 +99,7 @@ PendingContactAttributes::~PendingContactAttributes()
  *
  * \return Pointer to the Connection.
  */
-Connection* PendingContactAttributes::connection() const
+ConnectionPtr PendingContactAttributes::connection() const
 {
     return mPriv->connection;
 }
@@ -220,16 +221,18 @@ void PendingContactAttributes::onCallFinished(QDBusPendingCallWatcher* watcher)
         }
 
         if (shouldReference()) {
-            mPriv->validHandles = ReferencedHandles(connection(), HandleTypeContact, validHandles);
+            mPriv->validHandles = ReferencedHandles(mPriv->connection, HandleTypeContact,
+                    validHandles);
         }
 
         debug() << " Success:" << validHandles.size() << "valid and" << mPriv->invalidHandles.size()
             << "invalid handles";
-        
+
         setFinished();
     }
 
-    connection()->handleRequestLanded(HandleTypeContact);
+    mPriv->connection->handleRequestLanded(HandleTypeContact);
+
     watcher->deleteLater();
 }
 
diff --git a/TelepathyQt4/Client/pending-contact-attributes.h b/TelepathyQt4/Client/pending-contact-attributes.h
index 2869d05..0234842 100644
--- a/TelepathyQt4/Client/pending-contact-attributes.h
+++ b/TelepathyQt4/Client/pending-contact-attributes.h
@@ -30,15 +30,16 @@ class PendingContactAttributes;
 }
 }
 
+#include <TelepathyQt4/Client/PendingOperation>
+#include <TelepathyQt4/Client/Types>
 #include <TelepathyQt4/Constants>
 #include <TelepathyQt4/Types>
-#include <TelepathyQt4/Client/PendingOperation>
 
 namespace Telepathy
 {
 namespace Client
 {
-class Connection;
+
 class ReferencedHandles;
 
 class PendingContactAttributes : public PendingOperation
@@ -48,7 +49,7 @@ class PendingContactAttributes : public PendingOperation
 public:
     ~PendingContactAttributes();
 
-    Connection *connection() const;
+    ConnectionPtr connection() const;
 
     const UIntList &contactsRequested() const;
     const QStringList &interfacesRequested() const;
@@ -64,7 +65,7 @@ private Q_SLOTS:
 private:
     friend class Connection;
 
-    PendingContactAttributes(Connection *connection, const UIntList &handles,
+    PendingContactAttributes(const ConnectionPtr &connection, const UIntList &handles,
             const QStringList &interfaces, bool reference);
     void failImmediately(const QString &error, const QString &errorMessage);
 
-- 
1.5.6.5