Fix for

Issue 23: QXmppBind compilation error on macosx starting from r23
Issue 26: examples fail to link on macosx and linux
Issue 24: all text files should have the svn property eol-style set

Contributed by: Marco Molteni

1 files changed, 70 insertions, 70 deletions

diff --git a/source/QXmppNonSASLAuth.cpp b/source/QXmppNonSASLAuth.cpp
index 7f9c9791..7a039147 100644
--- a/source/QXmppNonSASLAuth.cpp
+++ b/source/QXmppNonSASLAuth.cpp
@@ -1,70 +1,70 @@
-#include "QXmppNonSASLAuth.h"

-#include "QXmppUtils.h"

-#include <QCryptographicHash>

-#include <QXmlStreamWriter>

-

-QXmppNonSASLAuthTypesRequestIq::QXmppNonSASLAuthTypesRequestIq() : QXmppIq(QXmppIq::Get)

-{

-

-}

-

-void QXmppNonSASLAuthTypesRequestIq::setUsername( const QString &username )

-{

-    m_username = username;

-}

-

-void QXmppNonSASLAuthTypesRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("query");

-    writer->writeAttribute( "xmlns","jabber:iq:auth");

-    writer->writeTextElement("username", m_username );

-    writer->writeEndElement();

-}

-

-QXmppNonSASLAuthIq::QXmppNonSASLAuthIq() : QXmppIq(QXmppIq::Set), m_useplaintext(false)

-{

-

-}

-

-void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const

-{

-    writer->writeStartElement("query");

-    writer->writeAttribute( "xmlns","jabber:iq:auth");

-    writer->writeTextElement("username", m_username );

-    if ( m_useplaintext )

-        writer->writeTextElement("password", m_password );

-    else

-    {//SHA1(concat(sid, password)).

-        QByteArray textSid = m_sid.toUtf8();

-        QByteArray encodedPassword = m_password.toUtf8();

-        QByteArray digest = QCryptographicHash::hash(textSid + encodedPassword, QCryptographicHash::Sha1 ).toHex();

-        writer->writeTextElement("digest", digest );

-    }

-    writer->writeTextElement("resource", m_resource );

-    writer->writeEndElement();

-}

-

-void QXmppNonSASLAuthIq::setUsername( const QString &username )

-{

-    m_username = username;

-}

-

-void QXmppNonSASLAuthIq::setPassword( const QString &password )

-{

-    m_password = password;

-}

-

-void QXmppNonSASLAuthIq::setResource( const QString &resource )

-{

-    m_resource = resource;

-}

-

-void QXmppNonSASLAuthIq::setStreamId( const QString &sid )

-{

-    m_sid = sid;

-}

-

-void QXmppNonSASLAuthIq::setUsePlainText( bool use )

-{

-    m_useplaintext = use;

-}

+#include "QXmppNonSASLAuth.h"
+#include "QXmppUtils.h"
+#include <QCryptographicHash>
+#include <QXmlStreamWriter>
+
+QXmppNonSASLAuthTypesRequestIq::QXmppNonSASLAuthTypesRequestIq() : QXmppIq(QXmppIq::Get)
+{
+
+}
+
+void QXmppNonSASLAuthTypesRequestIq::setUsername( const QString &username )
+{
+    m_username = username;
+}
+
+void QXmppNonSASLAuthTypesRequestIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("query");
+    writer->writeAttribute( "xmlns","jabber:iq:auth");
+    writer->writeTextElement("username", m_username );
+    writer->writeEndElement();
+}
+
+QXmppNonSASLAuthIq::QXmppNonSASLAuthIq() : QXmppIq(QXmppIq::Set), m_useplaintext(false)
+{
+
+}
+
+void QXmppNonSASLAuthIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("query");
+    writer->writeAttribute( "xmlns","jabber:iq:auth");
+    writer->writeTextElement("username", m_username );
+    if ( m_useplaintext )
+        writer->writeTextElement("password", m_password );
+    else
+    {//SHA1(concat(sid, password)).
+        QByteArray textSid = m_sid.toUtf8();
+        QByteArray encodedPassword = m_password.toUtf8();
+        QByteArray digest = QCryptographicHash::hash(textSid + encodedPassword, QCryptographicHash::Sha1 ).toHex();
+        writer->writeTextElement("digest", digest );
+    }
+    writer->writeTextElement("resource", m_resource );
+    writer->writeEndElement();
+}
+
+void QXmppNonSASLAuthIq::setUsername( const QString &username )
+{
+    m_username = username;
+}
+
+void QXmppNonSASLAuthIq::setPassword( const QString &password )
+{
+    m_password = password;
+}
+
+void QXmppNonSASLAuthIq::setResource( const QString &resource )
+{
+    m_resource = resource;
+}
+
+void QXmppNonSASLAuthIq::setStreamId( const QString &sid )
+{
+    m_sid = sid;
+}
+
+void QXmppNonSASLAuthIq::setUsePlainText( bool use )
+{
+    m_useplaintext = use;
+}