rework

1 files changed, 28 insertions, 14 deletions

diff --git a/src/base/QXmppSaslAuth_p.h b/src/base/QXmppSaslAuth_p.h
index 8d52a09b..87b6dc36 100644
--- a/src/base/QXmppSaslAuth_p.h
+++ b/src/base/QXmppSaslAuth_p.h
@@ -38,13 +38,13 @@
 // We mean it.
 //
 
-class QXmppSaslAuth : public QXmppStanza
+class QXmppSaslStanza : public QXmppStanza
 {
 public:
-    QXmppSaslAuth(const QString &mechanism = QString(), const QByteArray &value = QByteArray());
+    QXmppSaslStanza(const QString &type, const QByteArray &value = QByteArray());
 
-    QString mechanism() const;
-    void setMechanism(const QString &mechanism);
+    QString type() const;
+    void setType(const QString &type);
 
     QByteArray value() const;
     void setValue(const QByteArray &value);
@@ -55,20 +55,17 @@ public:
     /// \endcond
 
 private:
-    QString m_mechanism;
+    QString m_type;
     QByteArray m_value;
 };
 
-class QXmppSaslStanza : public QXmppStanza
+class QXmppSaslAuth : public QXmppSaslStanza
 {
 public:
-    QXmppSaslStanza(const QString &type = QString(), const QByteArray &value = QByteArray());
-
-    QString type() const;
-    void setType(const QString &type);
+    QXmppSaslAuth(const QString &mechanism = QString(), const QByteArray &value = QByteArray());
 
-    QByteArray value() const;
-    void setValue(const QByteArray &value);
+    QString mechanism() const;
+    void setMechanism(const QString &mechanism);
 
     /// \cond
     void parse(const QDomElement &element);
@@ -76,8 +73,25 @@ public:
     /// \endcond
 
 private:
-    QString m_type;
-    QByteArray m_value;
+    QString m_mechanism;
+};
+
+class QXmppSaslChallenge : public QXmppSaslStanza
+{
+public:
+    QXmppSaslChallenge(const QByteArray &value = QByteArray());
+};
+
+class QXmppSaslFailure : public QXmppSaslStanza
+{
+public:
+    QXmppSaslFailure();
+};
+
+class QXmppSaslSuccess : public QXmppSaslStanza
+{
+public:
+    QXmppSaslSuccess();
 };
 
 class QXmppSaslClientAnonymous : public QXmppSaslClient