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

[Andre Moreira Magalhaes (andrunko)]

---
 TelepathyQt4/Client/streamed-media-channel.cpp |   18 +++++++++---------
 TelepathyQt4/Client/streamed-media-channel.h   |   10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/TelepathyQt4/Client/streamed-media-channel.cpp b/TelepathyQt4/Client/streamed-media-channel.cpp
index 8d01c95..11ff827 100644
--- a/TelepathyQt4/Client/streamed-media-channel.cpp
+++ b/TelepathyQt4/Client/streamed-media-channel.cpp
@@ -71,7 +71,7 @@ void PendingMediaStreams::Private::getContacts()
 }
 
 PendingMediaStreams::PendingMediaStreams(StreamedMediaChannel *channel,
-        QSharedPointer<Telepathy::Client::Contact> contact,
+        ContactPtr contact,
         QList<Telepathy::MediaStreamType> types,
         QObject *parent)
     : PendingOperation(parent),
@@ -160,13 +160,13 @@ void PendingMediaStreams::gotContacts(PendingOperation *op)
             << pc->errorName() << ": " << pc->errorMessage();
     }
 
-    QHash<uint, QSharedPointer<Contact> > contactsForHandles;
-    foreach (const QSharedPointer<Contact> &contact, pc->contacts()) {
+    QHash<uint, ContactPtr> contactsForHandles;
+    foreach (const ContactPtr &contact, pc->contacts()) {
         contactsForHandles.insert(contact->handle()[0], contact);
     }
 
     foreach (uint handle, pc->invalidHandles()) {
-        contactsForHandles.insert(handle, QSharedPointer<Contact>());
+        contactsForHandles.insert(handle, ContactPtr());
     }
 
     foreach (const QSharedPointer<MediaStream> &stream, mPriv->streams) {
@@ -193,7 +193,7 @@ struct MediaStream::Private
     StreamedMediaChannel *channel;
     uint id;
     uint contactHandle;
-    QSharedPointer<Contact> contact;
+    ContactPtr contact;
     MediaStreamType type;
     MediaStreamState state;
     MediaStreamDirection direction;
@@ -235,7 +235,7 @@ uint MediaStream::id() const
  *
  * \return The contact who the stream is with.
  */
-QSharedPointer<Contact> MediaStream::contact() const
+ContactPtr MediaStream::contact() const
 {
     return mPriv->contact;
 }
@@ -374,7 +374,7 @@ uint MediaStream::contactHandle() const
     return mPriv->contactHandle;
 }
 
-void MediaStream::setContact(const QSharedPointer<Contact> &contact)
+void MediaStream::setContact(const ContactPtr &contact)
 {
     Q_ASSERT(!mPriv->contact || mPriv->contact == contact);
     mPriv->contact = contact;
@@ -573,7 +573,7 @@ PendingOperation *StreamedMediaChannel::removeStreams(const Telepathy::UIntList
 }
 
 PendingMediaStreams *StreamedMediaChannel::requestStream(
-        QSharedPointer<Telepathy::Client::Contact> contact,
+        const ContactPtr &contact,
         Telepathy::MediaStreamType type)
 {
     return new PendingMediaStreams(this, contact,
@@ -581,7 +581,7 @@ PendingMediaStreams *StreamedMediaChannel::requestStream(
 }
 
 PendingMediaStreams *StreamedMediaChannel::requestStreams(
-        QSharedPointer<Telepathy::Client::Contact> contact,
+        const ContactPtr &contact,
         QList<Telepathy::MediaStreamType> types)
 {
     return new PendingMediaStreams(this, contact, types, this);
diff --git a/TelepathyQt4/Client/streamed-media-channel.h b/TelepathyQt4/Client/streamed-media-channel.h
index feb4970..25b0bd5 100644
--- a/TelepathyQt4/Client/streamed-media-channel.h
+++ b/TelepathyQt4/Client/streamed-media-channel.h
@@ -56,7 +56,7 @@ private:
     friend class StreamedMediaChannel;
 
     PendingMediaStreams(StreamedMediaChannel *channel,
-            QSharedPointer<Telepathy::Client::Contact> contact,
+            ContactPtr contact,
             QList<Telepathy::MediaStreamType> types,
             QObject *parent = 0);
     PendingMediaStreams(StreamedMediaChannel *channel,
@@ -79,7 +79,7 @@ public:
     StreamedMediaChannel *channel() const;
     uint id() const;
 
-    QSharedPointer<Contact> contact() const;
+    ContactPtr contact() const;
     Telepathy::MediaStreamState state() const;
     Telepathy::MediaStreamType type() const;
 
@@ -118,7 +118,7 @@ private:
             MediaStreamPendingSend pendingSend);
 
     uint contactHandle() const;
-    void setContact(const QSharedPointer<Contact> &contact);
+    void setContact(const ContactPtr &contact);
     void setDirection(Telepathy::MediaStreamDirection direction,
             Telepathy::MediaStreamPendingSend pendingSend);
     void setState(Telepathy::MediaStreamState state);
@@ -151,10 +151,10 @@ public:
     PendingOperation *removeStreams(const Telepathy::UIntList &ids);
 
     PendingMediaStreams *requestStream(
-            QSharedPointer<Telepathy::Client::Contact> contact,
+            const ContactPtr &contact,
             Telepathy::MediaStreamType type);
     PendingMediaStreams *requestStreams(
-            QSharedPointer<Telepathy::Client::Contact> contact,
+            const ContactPtr &contact,
             QList<Telepathy::MediaStreamType> types);
 
 Q_SIGNALS:
-- 
1.5.6.5