From 2d5f940cdceb11aadd979ff3f1f6f0584bcf533b Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Sat, 21 Jul 2012 20:55:16 +0200 Subject: make QXmppPresence use implicit memory sharing --- src/base/QXmppPresence.h | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'src/base/QXmppPresence.h') diff --git a/src/base/QXmppPresence.h b/src/base/QXmppPresence.h index 886e5a8e..b0aa7c55 100644 --- a/src/base/QXmppPresence.h +++ b/src/base/QXmppPresence.h @@ -28,6 +28,8 @@ #include "QXmppStanza.h" #include "QXmppMucIq.h" +class QXmppPresencePrivate; + /// \brief The QXmppPresence class represents an XMPP presence stanza. /// /// \ingroup Stanzas @@ -108,15 +110,17 @@ public: int m_priority; }; - Q_DECL_DEPRECATED QXmppPresence(QXmppPresence::Type type, const QXmppPresence::Status& status); QXmppPresence::Status Q_DECL_DEPRECATED &status(); const QXmppPresence::Status Q_DECL_DEPRECATED &status() const; void Q_DECL_DEPRECATED setStatus(const QXmppPresence::Status&); /// \endcond QXmppPresence(QXmppPresence::Type type = QXmppPresence::Available); + QXmppPresence(const QXmppPresence &other); ~QXmppPresence(); + QXmppPresence& operator=(const QXmppPresence &other); + AvailableStatusType availableStatusType() const; void setAvailableStatusType(AvailableStatusType type); @@ -161,27 +165,7 @@ public: QStringList capabilityExt() const; private: - AvailableStatusType m_availableStatusType; - Type m_type; - QXmppPresence::Status m_status; - - /// XEP-0153: vCard-Based Avatars - - /// m_photoHash: the SHA1 hash of the avatar image data itself (not the base64-encoded version) - /// in accordance with RFC 3174 - QByteArray m_photoHash; - VCardUpdateType m_vCardUpdateType; - - // XEP-0115: Entity Capabilities - QString m_capabilityHash; - QString m_capabilityNode; - QByteArray m_capabilityVer; - // Legacy XEP-0115: Entity Capabilities - QStringList m_capabilityExt; - - // XEP-0045: Multi-User Chat - QXmppMucItem m_mucItem; - QList m_mucStatusCodes; + QSharedDataPointer d; }; #endif // QXMPPPRESENCE_H -- cgit v1.2.3