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

[Andre Moreira Magalhaes (andrunko)]

---
 examples/roster/roster-item.cpp   |    2 +-
 examples/roster/roster-item.h     |    7 +++----
 examples/roster/roster-window.cpp |   12 ++++++------
 examples/roster/roster-window.h   |    2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/examples/roster/roster-item.cpp b/examples/roster/roster-item.cpp
index 8814e9d..f1e855b 100644
--- a/examples/roster/roster-item.cpp
+++ b/examples/roster/roster-item.cpp
@@ -23,7 +23,7 @@
 
 using namespace Telepathy::Client;
 
-RosterItem::RosterItem(const QSharedPointer<Contact> &contact,
+RosterItem::RosterItem(const ContactPtr &contact,
         QListWidget *parent)
     : QObject(parent),
       QListWidgetItem(parent),
diff --git a/examples/roster/roster-item.h b/examples/roster/roster-item.h
index b6b14af..8abf05e 100644
--- a/examples/roster/roster-item.h
+++ b/examples/roster/roster-item.h
@@ -25,7 +25,6 @@
 #include <TelepathyQt4/Client/Contact>
 
 #include <QListWidgetItem>
-#include <QSharedPointer>
 #include <QString>
 
 class RosterItem : public QObject, public QListWidgetItem
@@ -33,11 +32,11 @@ class RosterItem : public QObject, public QListWidgetItem
     Q_OBJECT
 
 public:
-    RosterItem(const QSharedPointer<Telepathy::Client::Contact> &contact,
+    RosterItem(const Telepathy::Client::ContactPtr &contact,
             QListWidget *parent = 0);
     ~RosterItem();
 
-    QSharedPointer<Telepathy::Client::Contact> contact() const { return mContact; }
+    Telepathy::Client::ContactPtr contact() const { return mContact; }
 
 Q_SIGNALS:
     void changed();
@@ -46,7 +45,7 @@ private Q_SLOTS:
     void onContactChanged();
 
 private:
-    QSharedPointer<Telepathy::Client::Contact> mContact;
+    Telepathy::Client::ContactPtr mContact;
 };
 
 #endif
diff --git a/examples/roster/roster-window.cpp b/examples/roster/roster-window.cpp
index 7bc605c..24fd258 100644
--- a/examples/roster/roster-window.cpp
+++ b/examples/roster/roster-window.cpp
@@ -150,7 +150,7 @@ void RosterWindow::setupGui()
     mAddDlg->setLayout(addDlgVBox);
 }
 
-void RosterWindow::createItemForContact(const QSharedPointer<Contact> &contact,
+void RosterWindow::createItemForContact(const ContactPtr &contact,
         bool checkExists)
 {
     bool found = false;
@@ -215,7 +215,7 @@ void RosterWindow::onConnectionReady(Telepathy::Client::PendingOperation *op)
             SLOT(onPresencePublicationRequested(const Telepathy::Client::Contacts &)));
 
     qDebug() << "Connection ready";
-    foreach (const QSharedPointer<Contact> &contact, mConn->contactManager()->allKnownContacts()) {
+    foreach (const ContactPtr &contact, mConn->contactManager()->allKnownContacts()) {
         createItemForContact(contact);
     }
 
@@ -225,7 +225,7 @@ void RosterWindow::onConnectionReady(Telepathy::Client::PendingOperation *op)
 void RosterWindow::onPresencePublicationRequested(const Contacts &contacts)
 {
     qDebug() << "Presence publication requested";
-    foreach (const QSharedPointer<Contact> &contact, contacts) {
+    foreach (const ContactPtr &contact, contacts) {
         createItemForContact(contact, true);
     }
 }
@@ -317,7 +317,7 @@ void RosterWindow::onBlockActionTriggered(bool checked)
 void RosterWindow::onContactRetrieved(Telepathy::Client::PendingOperation *op)
 {
     PendingContacts *pcontacts = qobject_cast<PendingContacts *>(op);
-    QList<QSharedPointer<Contact> > contacts = pcontacts->contacts();
+    QList<ContactPtr> contacts = pcontacts->contacts();
     Q_ASSERT(pcontacts->identifiers().size() == 1);
     QString username = pcontacts->identifiers().first();
     if (contacts.size() != 1 || !contacts.first()) {
@@ -327,7 +327,7 @@ void RosterWindow::onContactRetrieved(Telepathy::Client::PendingOperation *op)
         return;
     }
 
-    QSharedPointer<Contact> contact = contacts.first();
+    ContactPtr contact = contacts.first();
     qDebug() << "Request presence subscription for contact" << username;
     // TODO should we have a signal on ContactManager to signal that a contact was
     //      added to subscribe list?
@@ -348,7 +348,7 @@ void RosterWindow::updateActions()
     Q_ASSERT(selectedItems.size() == 1);
 
     RosterItem *item = dynamic_cast<RosterItem*>(selectedItems.first());
-    QSharedPointer<Contact> contact = item->contact();
+    ContactPtr contact = item->contact();
 
     ContactManager *manager = contact->manager();
     qDebug() << "Contact" << contact->id() << "selected";
diff --git a/examples/roster/roster-window.h b/examples/roster/roster-window.h
index 431f2af..485f292 100644
--- a/examples/roster/roster-window.h
+++ b/examples/roster/roster-window.h
@@ -66,7 +66,7 @@ private Q_SLOTS:
 private:
     void createActions();
     void setupGui();
-    void createItemForContact(const QSharedPointer<Telepathy::Client::Contact> &contact,
+    void createItemForContact(const Telepathy::Client::ContactPtr &contact,
             bool checkExists = false);
 
     Telepathy::Client::ConnectionManager *mCM;
-- 
1.5.6.5