From 23826cb457c0d267e56e1bef704d8d433c7bf630 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Mon, 21 Mar 2011 16:17:21 +0000 Subject: QXmppStanza: remove deprecated getters --- CHANGELOG | 6 ++++++ src/QXmppStanza.cpp | 47 ----------------------------------------------- src/QXmppStanza.h | 15 --------------- 3 files changed, 6 insertions(+), 62 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8620d41b..7390acfc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +QXmpp 0.x.y (UNRELEASED) +------------------------ + + - Removed deprecated "get*" getter accessors from: + QXmppStanza + QXmpp 0.3.0 (Mar 05, 2011) ------------------------ - New XEPs diff --git a/src/QXmppStanza.cpp b/src/QXmppStanza.cpp index effe03c9..be6a6ee7 100644 --- a/src/QXmppStanza.cpp +++ b/src/QXmppStanza.cpp @@ -434,50 +434,3 @@ void QXmppStanza::parse(const QDomElement &element) m_error.parse(errorElement); } -// deprecated - -QString QXmppStanza::Error::getText() const -{ - return m_text; -} - -int QXmppStanza::Error::getCode() const -{ - return m_code; -} - -QXmppStanza::Error::Condition QXmppStanza::Error::getCondition() const -{ - return m_condition; -} - -QXmppStanza::Error::Type QXmppStanza::Error::getType() const -{ - return m_type; -} - -QString QXmppStanza::getTo() const -{ - return m_to; -} - -QString QXmppStanza::getFrom() const -{ - return m_from; -} - -QString QXmppStanza::getId() const -{ - return m_id; -} - -QString QXmppStanza::getLang() const -{ - return m_lang; -} - -QXmppStanza::Error QXmppStanza::getError() const -{ - return m_error; -} - diff --git a/src/QXmppStanza.h b/src/QXmppStanza.h index 35961d3b..aa2285f4 100644 --- a/src/QXmppStanza.h +++ b/src/QXmppStanza.h @@ -104,13 +104,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 getCode() const; - QString Q_DECL_DEPRECATED getText() const; - Condition Q_DECL_DEPRECATED getCondition() const; - Type Q_DECL_DEPRECATED getType() const; /// \endcond private: @@ -151,14 +144,6 @@ public: // FIXME : why is this needed? bool isErrorStanza(); - // deprecated in release 0.2.0 - // deprecated accessors, use the form without "get" instead - QString Q_DECL_DEPRECATED getTo() const; - QString Q_DECL_DEPRECATED getFrom() const; - QString Q_DECL_DEPRECATED getId() const; - QString Q_DECL_DEPRECATED getLang() const; - QXmppStanza::Error Q_DECL_DEPRECATED getError() const; - protected: void generateAndSetNextId(); void parse(const QDomElement &element); -- cgit v1.2.3