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

Andre Moreira Magalhaes (andrunko) andre.magalhaes at collabora.co.uk
Wed Mar 18 10:34:05 PDT 2009


---
 TelepathyQt4/Client/message.cpp |   10 +++++-----
 TelepathyQt4/Client/message.h   |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TelepathyQt4/Client/message.cpp b/TelepathyQt4/Client/message.cpp
index 9f4f5cc..423cd8c 100644
--- a/TelepathyQt4/Client/message.cpp
+++ b/TelepathyQt4/Client/message.cpp
@@ -48,7 +48,7 @@ public:
 
     // for received messages only
     QPointer<TextChannel> textChannel;
-    QSharedPointer<Contact> sender;
+    ContactPtr sender;
 
     inline QVariant value(uint index, const char *key) const;
     inline uint getUIntOrZero(uint index, const char *key) const;
@@ -501,11 +501,11 @@ QDateTime ReceivedMessage::received() const
 
 /**
  * Return the Contact who sent the message, or
- * QSharedPointer<Contact>(0) if unknown.
+ * ContactPtr(0) if unknown.
  *
- * \return The sender or QSharedPointer<Contact>(0)
+ * \return The sender or ContactPtr(0)
  */
-QSharedPointer<Contact> ReceivedMessage::sender() const
+ContactPtr ReceivedMessage::sender() const
 {
     return mPriv->sender;
 }
@@ -564,7 +564,7 @@ void ReceivedMessage::clearSenderHandle()
     mPriv->clearSenderHandle();
 }
 
-void ReceivedMessage::setSender(const QSharedPointer<Contact> &sender)
+void ReceivedMessage::setSender(const ContactPtr &sender)
 {
     mPriv->sender = sender;
 }
diff --git a/TelepathyQt4/Client/message.h b/TelepathyQt4/Client/message.h
index 5354f35..b17da34 100644
--- a/TelepathyQt4/Client/message.h
+++ b/TelepathyQt4/Client/message.h
@@ -26,8 +26,8 @@
 #endif
 
 #include <QSharedDataPointer>
-#include <QSharedPointer>
 
+#include <TelepathyQt4/Client/Contact>
 #include <TelepathyQt4/Constants>
 #include <TelepathyQt4/Types>
 
@@ -100,7 +100,7 @@ public:
     ~ReceivedMessage();
 
     QDateTime received() const;
-    QSharedPointer<Contact> sender() const;
+    ContactPtr sender() const;
     bool isScrollback() const;
     bool isRescued() const;
 
@@ -115,7 +115,7 @@ private:
 
     void setForceNonText();
     void clearSenderHandle();
-    void setSender(const QSharedPointer<Contact> &sender);
+    void setSender(const ContactPtr &sender);
 };
 
 } // Telepathy::Client
-- 
1.5.6.5




More information about the telepathy-commits mailing list