From 59fa2fe885e59760b9d4fb3f4868ef76c3efa609 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 9 Aug 2010 10:22:26 +0000
Subject: inline sendAuthPlain and sendAuthMd5, they don't really help
 readability

---
 source/QXmppStream.cpp | 29 ++++++++++-------------------
 source/QXmppStream.h   |  2 --
 2 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'source')

diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp
index 05e62c6a..8b34e066 100644
--- a/source/QXmppStream.cpp
+++ b/source/QXmppStream.cpp
@@ -377,14 +377,21 @@ void QXmppStream::parser(const QByteArray& data)
                         mechanism = mechanisms.first();
                     }
 
-                    // send SASL Authentication request 
+                    // send SASL Authentication request
                     switch(mechanism)
                     {
                     case QXmppConfiguration::SASLPlain:
-                        sendAuthPlain();
+                        {
+                            QString userPass('\0' + configuration().user() +
+                                             '\0' + configuration().passwd());
+                            QByteArray data = "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>";
+                            data += userPass.toUtf8().toBase64();
+                            data += "</auth>";
+                            sendToServer(data);
+                        }
                         break;
                     case QXmppConfiguration::SASLDigestMD5:
-                        sendAuthDigestMD5();
+                        sendToServer("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5'/>");
                         break;
                     case QXmppConfiguration::SASLAnonymous:
                         sendToServer("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='ANONYMOUS'/>");
@@ -802,22 +809,6 @@ void QXmppStream::sendNonSASLAuth(bool plainText)
     sendPacket(authQuery);
 }
 
-void QXmppStream::sendAuthPlain()
-{
-    QByteArray data = "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>";
-    QString userPass('\0' + configuration().user() +
-                     '\0' + configuration().passwd());
-    data += userPass.toUtf8().toBase64();
-    data += "</auth>";
-    sendToServer(data);
-}
-
-void QXmppStream::sendAuthDigestMD5()
-{
-    QByteArray packet = "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5'/>";
-    sendToServer(packet);
-}
-
 // challenge is BASE64 encoded string
 void QXmppStream::sendAuthDigestMD5ResponseStep1(const QString& challenge)
 {
diff --git a/source/QXmppStream.h b/source/QXmppStream.h
index 419bcb1c..586554b9 100644
--- a/source/QXmppStream.h
+++ b/source/QXmppStream.h
@@ -173,8 +173,6 @@ private:
     void sendStartTls();
     void sendNonSASLAuth(bool);
     void sendNonSASLAuthQuery( const QString &to );
-    void sendAuthPlain();
-    void sendAuthDigestMD5();
     void sendAuthDigestMD5ResponseStep1(const QString& challenge);
     void sendAuthDigestMD5ResponseStep2();
     void sendBindIQ();
-- 
cgit v1.2.3