aboutsummaryrefslogtreecommitdiff
path: root/source/QXmppMessage.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2010-03-04 08:43:53 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2010-03-04 08:43:53 +0000
commitbb95ebd0e305071ccea30e356844042402bcd76b (patch)
tree8290d542d1c53c81828a3f8a5d45cf387a4c72d7 /source/QXmppMessage.cpp
parentf3c8579fd664461f529d2fe4713093596ba9ff97 (diff)
downloadqxmpp-bb95ebd0e305071ccea30e356844042402bcd76b.tar.gz
regroup common stanza parsing inside QXmppStanza::parse()
Diffstat (limited to 'source/QXmppMessage.cpp')
-rw-r--r--source/QXmppMessage.cpp14
1 files changed, 3 insertions, 11 deletions
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]);