[Telepathy-commits] [telepathy-qt4/master] PendingAccount: Return AccountPtr on account() method.

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/pending-account.cpp |   11 +++++------
 TelepathyQt4/Client/pending-account.h   |    3 +--
 tests/dbus/account-basics.cpp           |    2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/TelepathyQt4/Client/pending-account.cpp b/TelepathyQt4/Client/pending-account.cpp
index 3221f36..f4fc49d 100644
--- a/TelepathyQt4/Client/pending-account.cpp
+++ b/TelepathyQt4/Client/pending-account.cpp
@@ -26,7 +26,6 @@
 #include "TelepathyQt4/debug-internal.h"
 
 #include <TelepathyQt4/Client/AccountManager>
-#include <TelepathyQt4/Client/Account>
 
 #include <QDBusObjectPath>
 #include <QDBusPendingCallWatcher>
@@ -56,7 +55,7 @@ struct PendingAccount::Private
     }
 
     AccountManager *manager;
-    QSharedPointer<Account> account;
+    AccountPtr account;
     QDBusObjectPath objectPath;
 };
 
@@ -116,18 +115,18 @@ AccountManager *PendingAccount::manager() const
  *
  * \return Account object.
  */
-QSharedPointer<Account> PendingAccount::account() const
+AccountPtr PendingAccount::account() const
 {
     if (!isFinished()) {
         warning() << "PendingAccount::account called before finished, returning 0";
-        return QSharedPointer<Account>();
+        return AccountPtr();
     } else if (!isValid()) {
         warning() << "PendingAccount::account called when not valid, returning 0";
-        return QSharedPointer<Account>();
+        return AccountPtr();
     }
 
     if (!mPriv->account) {
-        mPriv->account = QSharedPointer<Account>(
+        mPriv->account = AccountPtr(
                 new Account(mPriv->manager, mPriv->objectPath.path()));
     }
 
diff --git a/TelepathyQt4/Client/pending-account.h b/TelepathyQt4/Client/pending-account.h
index 1c54c5c..af29210 100644
--- a/TelepathyQt4/Client/pending-account.h
+++ b/TelepathyQt4/Client/pending-account.h
@@ -29,7 +29,6 @@
 #include <TelepathyQt4/Client/Account>
 #include <TelepathyQt4/Client/PendingOperation>
 
-#include <QSharedPointer>
 #include <QString>
 #include <QVariantMap>
 
@@ -51,7 +50,7 @@ public:
 
     AccountManager *manager() const;
 
-    QSharedPointer<Account> account() const;
+    AccountPtr account() const;
 
     QString objectPath() const;
 
diff --git a/tests/dbus/account-basics.cpp b/tests/dbus/account-basics.cpp
index 353e8c5..613537e 100644
--- a/tests/dbus/account-basics.cpp
+++ b/tests/dbus/account-basics.cpp
@@ -76,7 +76,7 @@ void TestAccountBasics::testBasics()
                     SIGNAL(finished(Telepathy::Client::PendingOperation *)),
                     SLOT(expectSuccessfulCall(Telepathy::Client::PendingOperation *))));
     QCOMPARE(mLoop->exec(), 0);
-    QVERIFY(!pacc->account().isNull());
+    QVERIFY(pacc->account());
 
     QCOMPARE(mAM->interfaces(), QStringList());
 
-- 
1.5.6.5