Using QXmlStreamWriter for directly writing to the socket. This will avoid string concatenations and problems with XML escaping rules.

and

Fix for Issue 19: XMPP Version < 1.0 send NonSASL Auth query

1 files changed, 11 insertions, 15 deletions

diff --git a/source/QXmppInformationRequestResult.cpp b/source/QXmppInformationRequestResult.cpp
index 86236ff6..058612f1 100644
--- a/source/QXmppInformationRequestResult.cpp
+++ b/source/QXmppInformationRequestResult.cpp
@@ -1,24 +1,20 @@
 #include "QXmppInformationRequestResult.h"

 #include "QXmppConstants.h"

+#include <QXmlStreamWriter>

 

 QXmppInformationRequestResult::QXmppInformationRequestResult() : QXmppIq(QXmppIq::Result)

 {

 }

 

-QByteArray QXmppInformationRequestResult::toXmlElementFromChild() const

+void QXmppInformationRequestResult::toXmlElementFromChild(QXmlStreamWriter *writer) const

 {

-    QByteArray resultXml;

-

-    resultXml += "<query xmlns='";

-    resultXml += ns_disco_info;

-    resultXml += "'>";

-    resultXml += "<feature var='";

-    resultXml += ns_disco_info;

-    resultXml += "'/>";

-    resultXml += "<feature var='";

-    resultXml += ns_ibb;

-    resultXml += "'/>";

-    resultXml += "</query>";

-

-    return resultXml;

+    writer->writeStartElement("query");

+    writer->writeAttribute("xmlns", ns_disco_info );

+    writer->writeStartElement("feature");

+    writer->writeAttribute("var", ns_disco_info );

+    writer->writeEndElement();

+    writer->writeStartElement("feature");

+    writer->writeAttribute("var", ns_ibb );

+    writer->writeEndElement();

+    writer->writeEndElement();

 }