start refactoring and testing non-SASL auth

1 files changed, 20 insertions, 15 deletions

diff --git a/src/QXmppNonSASLAuth.h b/src/QXmppNonSASLAuth.h
index 956814fa..10dab42c 100644
--- a/src/QXmppNonSASLAuth.h
+++ b/src/QXmppNonSASLAuth.h
@@ -26,29 +26,34 @@
 
 #include "QXmppIq.h"
 
-class QXmppNonSASLAuthTypesRequestIq : public QXmppIq
-{
-public:
-    QXmppNonSASLAuthTypesRequestIq();
-    void setUsername( const QString &username );
-    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;
-private:
-    QString m_username;
-};
-
 class QXmppNonSASLAuthIq : public QXmppIq
 {
 public:
     QXmppNonSASLAuthIq();
-    virtual void toXmlElementFromChild(QXmlStreamWriter *writer) const;
-    void setUsername( const QString &username );
-    void setPassword( const QString &password );
-    void setResource( const QString &resource );
-    void setStreamId( const QString &sid );
+
+    QString username() const;
+    void setUsername(const QString &username);
+
+    QString digest() const;
+
+    QString password() const;
+    void setPassword(const QString &password);
+
+    QString resource() const;
+    void setResource(const QString &resource);
+
+    void setStreamId(const QString &sid);
     void setUsePlainText( bool useplaintext );
 
+protected:
+    /// \cond
+    void parseElementFromChild(const QDomElement &element);
+    void toXmlElementFromChild(QXmlStreamWriter *writer) const;
+    /// \endcond
+
 private:
     QString m_username;
+    QString m_digest;
     QString m_password;
     QString m_resource;
     QString m_sid;