[Telepathy-commits] [telepathy-qt4/master] tests: Use ContactPtr typedef.

[Andre Moreira Magalhaes (andrunko)]

---
 tests/dbus/chan-basics.cpp |    4 ++--
 tests/dbus/chan-group.cpp  |   14 +++++++-------
 tests/dbus/conn-roster.cpp |   12 ++++++------
 tests/dbus/contacts.cpp    |   11 +++++------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp
index ebede15..1020a8e 100644
--- a/tests/dbus/chan-basics.cpp
+++ b/tests/dbus/chan-basics.cpp
@@ -276,7 +276,7 @@ void TestChanBasics::testCreateChannel()
         QCOMPARE(mChan->groupSelfContact(), mConn->selfContact());
 
         QStringList ids;
-        foreach (const QSharedPointer<Contact> &contact, mChan->groupContacts()) {
+        foreach (const ContactPtr &contact, mChan->groupContacts()) {
             ids << contact->id();
         }
         ids.sort();
@@ -316,7 +316,7 @@ void TestChanBasics::testEnsureChannel()
         QCOMPARE(mChan->groupSelfContact(), mConn->selfContact());
 
         QStringList ids;
-        foreach (const QSharedPointer<Contact> &contact, mChan->groupContacts()) {
+        foreach (const ContactPtr &contact, mChan->groupContacts()) {
             ids << contact->id();
         }
         ids.sort();
diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp
index 705e525..9083d9f 100644
--- a/tests/dbus/chan-group.cpp
+++ b/tests/dbus/chan-group.cpp
@@ -75,7 +75,7 @@ private:
     uint mRoomCount;
     ReferencedHandles mRoomHandles;
     ReferencedHandles mContactHandles;
-    QList<QSharedPointer<Contact> > mContacts;
+    QList<ContactPtr> mContacts;
     Contacts mChangedCurrent;
     Contacts mChangedLP;
     Contacts mChangedRP;
@@ -248,7 +248,7 @@ void TestChanGroup::checkExpectedIds(const Contacts &contacts,
         const QStringList &expectedIds)
 {
     QStringList ids;
-    foreach (const QSharedPointer<Contact> &contact, contacts) {
+    foreach (const ContactPtr &contact, contacts) {
         ids << contact->id();
     }
 
@@ -259,17 +259,17 @@ void TestChanGroup::checkExpectedIds(const Contacts &contacts,
 void TestChanGroup::debugContacts()
 {
     qDebug() << "contacts on group:";
-    foreach (const QSharedPointer<Contact> &contact, mChan->groupContacts()) {
+    foreach (const ContactPtr &contact, mChan->groupContacts()) {
         qDebug() << " " << contact->id();
     }
 
     qDebug() << "local pending contacts on group:";
-    foreach (const QSharedPointer<Contact> &contact, mChan->groupLocalPendingContacts()) {
+    foreach (const ContactPtr &contact, mChan->groupLocalPendingContacts()) {
         qDebug() << " " << contact->id();
     }
 
     qDebug() << "remote pending contacts on group:";
-    foreach (const QSharedPointer<Contact> &contact, mChan->groupRemotePendingContacts()) {
+    foreach (const ContactPtr &contact, mChan->groupRemotePendingContacts()) {
         qDebug() << " " << contact->id();
     }
 }
@@ -507,7 +507,7 @@ void TestChanGroup::doTestCreateChannel()
     expectedIds.sort();
     checkExpectedIds(mChan->groupRemotePendingContacts(), expectedIds);
 
-    QList<QSharedPointer<Contact> > toRemove;
+    QList<ContactPtr> toRemove;
     toRemove.append(mContacts[1]);
     toRemove.append(mContacts[2]);
     mChan->groupRemoveContacts(toRemove, "I want to remove some of them");
@@ -547,7 +547,7 @@ void TestChanGroup::doTestCreateChannel()
 
     toRemove.clear();
     ids.clear();
-    foreach (const QSharedPointer<Contact> &contact, mChan->groupContacts()) {
+    foreach (const ContactPtr &contact, mChan->groupContacts()) {
         ids << contact->id();
         if (contact != mChan->groupSelfContact() && toRemove.isEmpty()) {
             toRemove.append(contact);
diff --git a/tests/dbus/conn-roster.cpp b/tests/dbus/conn-roster.cpp
index 1e2e73a..122ac2d 100644
--- a/tests/dbus/conn-roster.cpp
+++ b/tests/dbus/conn-roster.cpp
@@ -47,7 +47,7 @@ private:
     QString mConnName, mConnPath;
     ExampleContactListConnection *mConnService;
     Connection *mConn;
-    QList<QSharedPointer<Contact> > mContacts;
+    QList<ContactPtr> mContacts;
 };
 
 void TestConnRoster::expectConnInvalidated()
@@ -155,9 +155,9 @@ void TestConnRoster::testRoster()
         "guillaume at example.com" <<
         "christian at example.com";
     QStringList ids;
-    QList<QSharedPointer<Contact> > pendingSubscription;
-    QList<QSharedPointer<Contact> > pendingPublish;
-    foreach (const QSharedPointer<Contact> &contact,
+    QList<ContactPtr> pendingSubscription;
+    QList<ContactPtr> pendingPublish;
+    foreach (const ContactPtr &contact,
             mConn->contactManager()->allKnownContacts()) {
         qDebug() << " contact:" << contact->id() <<
             "- subscription:" << contact->subscriptionState() <<
@@ -183,7 +183,7 @@ void TestConnRoster::testRoster()
     QCOMPARE(mLoop->exec(), 0);
 
     int i = 0;
-    foreach (const QSharedPointer<Contact> &contact, mContacts) {
+    foreach (const ContactPtr &contact, mContacts) {
         QVERIFY(connect(contact.data(),
                         SIGNAL(subscriptionStateChanged(Telepathy::Client::Contact::PresenceState)),
                         SLOT(expectPresenceStateChanged(Telepathy::Client::Contact::PresenceState))));
@@ -232,7 +232,7 @@ void TestConnRoster::testRoster()
 
     i = 0;
     Contact::PresenceState expectedPresenceState;
-    foreach (const QSharedPointer<Contact> &contact, pendingPublish) {
+    foreach (const ContactPtr &contact, pendingPublish) {
         QVERIFY(connect(contact.data(),
                         SIGNAL(publishStateChanged(Telepathy::Client::Contact::PresenceState)),
                         SLOT(expectPresenceStateChanged(Telepathy::Client::Contact::PresenceState))));
diff --git a/tests/dbus/contacts.cpp b/tests/dbus/contacts.cpp
index 58d7301..aa1e57c 100644
--- a/tests/dbus/contacts.cpp
+++ b/tests/dbus/contacts.cpp
@@ -1,6 +1,5 @@
 #include <QDebug>
 #include <QList>
-#include <QSharedPointer>
 #include <QTimer>
 
 #include <QtDBus>
@@ -57,7 +56,7 @@ private:
     QString mConnName, mConnPath;
     ContactsConnection *mConnService;
     Connection *mConn;
-    QList<QSharedPointer<Contact> > mContacts;
+    QList<ContactPtr> mContacts;
     Telepathy::UIntList mInvalidHandles;
 };
 
@@ -206,7 +205,7 @@ void TestContacts::testSupport()
 
 void TestContacts::testSelfContact()
 {
-    QSharedPointer<Contact> selfContact = mConn->selfContact();
+    ContactPtr selfContact = mConn->selfContact();
     QVERIFY(selfContact != 0);
 
     QCOMPARE(selfContact->handle()[0], mConn->selfHandle());
@@ -287,7 +286,7 @@ void TestContacts::testForHandles()
 
     // Save the contacts, and make a new request, replacing one of the invalid handles with a valid
     // one
-    QList<QSharedPointer<Contact> > saveContacts = mContacts;
+    QList<ContactPtr> saveContacts = mContacts;
     handles[2] = tp_handle_ensure(serviceRepo, "dora", NULL, NULL);
     QVERIFY(handles[2] != 0);
 
@@ -579,7 +578,7 @@ void TestContacts::testFeaturesNotRequested()
     // intentional - however, I'm not quite sure if they should be just debug (like in tp-glib))
     QCOMPARE(mContacts.size(), 3);
     for (int i = 0; i < 3; i++) {
-        QSharedPointer<Contact> contact = mContacts[i];
+        ContactPtr contact = mContacts[i];
 
         QVERIFY(contact->requestedFeatures().isEmpty());
         QVERIFY(contact->actualFeatures().isEmpty());
@@ -654,7 +653,7 @@ void TestContacts::testUpgrade()
 
     // There should be 3 resulting contacts - save them for future reference
     QCOMPARE(mContacts.size(), 3);
-    QList<QSharedPointer<Contact> > saveContacts = mContacts;
+    QList<ContactPtr> saveContacts = mContacts;
 
     // Upgrade them
     QSet<Contact::Feature> features = QSet<Contact::Feature>()
-- 
1.5.6.5