From bb95ebd0e305071ccea30e356844042402bcd76b Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 4 Mar 2010 08:43:53 +0000 Subject: regroup common stanza parsing inside QXmppStanza::parse() --- source/QXmppMessage.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'source/QXmppMessage.cpp') diff --git a/source/QXmppMessage.cpp b/source/QXmppMessage.cpp index cafadc87..c2296f79 100644 --- a/source/QXmppMessage.cpp +++ b/source/QXmppMessage.cpp @@ -129,10 +129,10 @@ void QXmppMessage::setState(QXmppMessage::State state) m_state = state; } -void QXmppMessage::parse(QDomElement &element) +void QXmppMessage::parse(const QDomElement &element) { - setFrom(element.attribute("from")); - setTo(element.attribute("to")); + QXmppStanza::parse(element); + setTypeFromStr(element.attribute("type")); setBody(unescapeString( element.firstChildElement("body").text())); @@ -140,14 +140,6 @@ void QXmppMessage::parse(QDomElement &element) element.firstChildElement("subject").text())); setThread(element.firstChildElement("thread").text()); - QDomElement errorElement = element. - firstChildElement("error"); - if(!errorElement.isNull()) - { - QXmppStanza::Error error = parseError(errorElement); - setError(error); - } - for (int i = Active; i <= Paused; i++) { QDomElement stateElement = element.firstChildElement(chat_states[i]); -- cgit v1.2.3