From 35a8cd72876f66e494d9a45ff115adb2d8d8ddb5 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Mon, 21 Mar 2011 16:23:34 +0000 Subject: QXmppMessage: remove deprecated getters --- CHANGELOG | 7 ++++--- src/QXmppMessage.cpp | 26 -------------------------- src/QXmppMessage.h | 8 -------- 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 973953b5..1515de67 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,10 @@ QXmpp 0.x.y (UNRELEASED) ------------------------ - - Removed deprecated "get*" getter accessors from: - QXmppIq - QXmppStanza + - Removed deprecated "get*" getter accessors from: + QXmppMessage + QXmppIq + QXmppStanza QXmpp 0.3.0 (Mar 05, 2011) ------------------------ diff --git a/src/QXmppMessage.cpp b/src/QXmppMessage.cpp index 89be7570..07846ec7 100644 --- a/src/QXmppMessage.cpp +++ b/src/QXmppMessage.cpp @@ -323,29 +323,3 @@ void QXmppMessage::setThread(const QString& thread) m_thread = thread; } -// deprecated - -QXmppMessage::Type QXmppMessage::getType() const -{ - return m_type; -} - -QXmppMessage::State QXmppMessage::getState() const -{ - return m_state; -} - -QString QXmppMessage::getBody() const -{ - return m_body; -} - -QString QXmppMessage::getSubject() const -{ - return m_subject; -} - -QString QXmppMessage::getThread() const -{ - return m_thread; -} diff --git a/src/QXmppMessage.h b/src/QXmppMessage.h index 6822a1e7..201debcc 100644 --- a/src/QXmppMessage.h +++ b/src/QXmppMessage.h @@ -83,14 +83,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 - QXmppMessage::Type Q_DECL_DEPRECATED getType() const; - QXmppMessage::State Q_DECL_DEPRECATED getState() const; - QString Q_DECL_DEPRECATED getBody() const; - QString Q_DECL_DEPRECATED getSubject() const; - QString Q_DECL_DEPRECATED getThread() const; /// \endcond private: -- cgit v1.2.3