From 8ff3480e76d07d58f49870b28309627161ecf5c5 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Mon, 21 Mar 2011 16:27:14 +0000 Subject: QXmppPresence: remove deprecated getters --- src/QXmppPresence.cpp | 33 --------------------------------- src/QXmppPresence.h | 14 -------------- 2 files changed, 47 deletions(-) (limited to 'src') diff --git a/src/QXmppPresence.cpp b/src/QXmppPresence.cpp index 6fd06f6d..7cfd492c 100644 --- a/src/QXmppPresence.cpp +++ b/src/QXmppPresence.cpp @@ -530,36 +530,3 @@ QStringList QXmppPresence::capabilityExt() const return m_capabilityExt; } -/// \cond - -QXmppPresence::Type QXmppPresence::getType() const -{ - return m_type; -} - -const QXmppPresence::Status& QXmppPresence::getStatus() const -{ - return m_status; -} - -QXmppPresence::Status& QXmppPresence::getStatus() -{ - return m_status; -} - -QXmppPresence::Status::Type QXmppPresence::Status::getType() const -{ - return m_type; -} - -QString QXmppPresence::Status::getStatusText() const -{ - return m_statusText; -} - -int QXmppPresence::Status::getPriority() const -{ - return m_priority; -} - -/// \endcond diff --git a/src/QXmppPresence.h b/src/QXmppPresence.h index be006c4b..6eb0edad 100644 --- a/src/QXmppPresence.h +++ b/src/QXmppPresence.h @@ -93,12 +93,6 @@ public: /// \cond void parse(const QDomElement &element); void toXml(QXmlStreamWriter *writer) const; - - // deprecated in release 0.2.0 - // deprecated accessors, use the form without "get" instead - int Q_DECL_DEPRECATED getPriority() const; - QString Q_DECL_DEPRECATED getStatusText() const; - QXmppPresence::Status::Type Q_DECL_DEPRECATED getType() const; /// \endcond private: @@ -143,14 +137,6 @@ public: QStringList capabilityExt() const; - // deprecated in release 0.2.0 - // deprecated accessors, use the form without "get" instead - /// \cond - QXmppPresence::Type Q_DECL_DEPRECATED getType() const; - QXmppPresence::Status Q_DECL_DEPRECATED & getStatus(); - const QXmppPresence::Status Q_DECL_DEPRECATED & getStatus() const; - /// \endcond - private: QString getTypeStr() const; void setTypeFromStr(const QString&); -- cgit v1.2.3