diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-03-04 08:49:51 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-03-04 08:49:51 +0000 |
| commit | c2a7a03e30d1d99e57172c94c106fdc842dfbf25 (patch) | |
| tree | 0cfc9cdf4ca731fb5f38ef4b9d68c3227aa04ec3 | |
| parent | bb95ebd0e305071ccea30e356844042402bcd76b (diff) | |
| download | qxmpp-c2a7a03e30d1d99e57172c94c106fdc842dfbf25.tar.gz | |
error parsing is handled at IQ level
| -rw-r--r-- | source/QXmppStanza.h | 4 | ||||
| -rw-r--r-- | source/QXmppStream.cpp | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/source/QXmppStanza.h b/source/QXmppStanza.h index 60630a1c..38b5d1c6 100644 --- a/source/QXmppStanza.h +++ b/source/QXmppStanza.h @@ -125,9 +125,6 @@ public: // FIXME : why is this needed? bool isErrorStanza(); - // FIXME : make this method protected - static QXmppStanza::Error parseError(const QDomElement&); - // deprecated accessors, use the form without "get" instead QString Q_DECL_DEPRECATED getTo() const; QString Q_DECL_DEPRECATED getFrom() const; @@ -138,6 +135,7 @@ public: protected: void generateAndSetNextId(); void parse(const QDomElement &element); + static QXmppStanza::Error parseError(const QDomElement&); private: static uint s_uniqeIdNo; diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp index a426d60f..6e70566d 100644 --- a/source/QXmppStream.cpp +++ b/source/QXmppStream.cpp @@ -462,9 +462,6 @@ void QXmppStream::parser(const QByteArray& data) qWarning("QXmppStream: iq type can't be empty"); QXmppIq iqPacket; // to emit - QDomElement elemen = nodeRecv.firstChildElement("error"); - QXmppStanza::Error error = QXmppStanza::parseError(elemen); - if( QXmppRpcInvokeIq::isRpcInvokeIq( nodeRecv ) ) { QXmppRpcInvokeIq rpcIqPacket; @@ -699,7 +696,6 @@ void QXmppStream::parser(const QByteArray& data) iqPacket.parse(nodeRecv); } - iqPacket.setError(error); processIq(iqPacket); } else if(nodeRecv.tagName() == "presence") |