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, 5 insertions, 10 deletions

diff --git a/source/QXmppSession.cpp b/source/QXmppSession.cpp
index 4ba0380e..abd1dadc 100644
--- a/source/QXmppSession.cpp
+++ b/source/QXmppSession.cpp
@@ -25,7 +25,7 @@
 #include "QXmppSession.h"

 #include "QXmppConstants.h"

 #include "QXmppUtils.h"

-#include <QTextStream>

+#include <QXmlStreamWriter>

 

 QXmppSession::QXmppSession(QXmppIq::Type type)

     : QXmppIq(type)

@@ -41,15 +41,10 @@ QXmppSession::~QXmppSession()
 {

 }

 

-QByteArray QXmppSession::toXmlElementFromChild() const

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

 {

-    QString data;

-    QTextStream stream(&data);

-

-    stream << "<session";

-    helperToXmlAddAttribute(stream, "xmlns", ns_session);

-    stream << "/>";

-

-    return data.toAscii();

+    writer->writeStartElement("session");;

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

+    writer->writeEndElement();

 }