reduce QXmppSaslStanza subclasses

2 files changed, 19 insertions, 8 deletions

diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
index a39194ec..98e9caf7 100644
--- a/src/base/QXmppSasl.cpp
+++ b/src/base/QXmppSasl.cpp
@@ -99,8 +99,7 @@ QXmppSaslChallenge::QXmppSaslChallenge(const QByteArray &value)
 }
 
 QXmppSaslFailure::QXmppSaslFailure(const QString &condition)
-    : QXmppSaslStanza("failure")
-    , m_condition(condition)
+    : m_condition(condition)
 {
 }
 
@@ -134,10 +133,20 @@ QXmppSaslResponse::QXmppSaslResponse(const QByteArray &value)
 }
 
 QXmppSaslSuccess::QXmppSaslSuccess()
-    : QXmppSaslStanza("success")
 {
 }
 
+void QXmppSaslSuccess::parse(const QDomElement &element)
+{
+}
+
+void QXmppSaslSuccess::toXml(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("success");
+    writer->writeAttribute("xmlns", ns_xmpp_sasl);
+    writer->writeEndElement();
+}
+
 QXmppSaslStanza::QXmppSaslStanza(const QString &type, const QByteArray &value)
     : m_type(type)
     , m_value(value)
diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h
index 9713ae1f..be72152f 100644
--- a/src/base/QXmppSasl_p.h
+++ b/src/base/QXmppSasl_p.h
@@ -76,9 +76,6 @@ private:
     QXmppSaslClientPrivate *d;
 };
 
-/// The QXmppServerClient class is the base class for all SASL server
-/// authentication methods.
-
 class QXMPP_AUTOTEST_EXPORT QXmppSaslServer : public QXmppLoggable
 {
 public:
@@ -167,7 +164,7 @@ public:
     QXmppSaslChallenge(const QByteArray &value = QByteArray());
 };
 
-class QXmppSaslFailure : public QXmppSaslStanza
+class QXmppSaslFailure : public QXmppStanza
 {
 public:
     QXmppSaslFailure(const QString &condition = QString());
@@ -190,10 +187,15 @@ public:
     QXmppSaslResponse(const QByteArray &value = QByteArray());
 };
 
-class QXmppSaslSuccess : public QXmppSaslStanza
+class QXmppSaslSuccess : public QXmppStanza
 {
 public:
     QXmppSaslSuccess();
+
+    /// \cond
+    void parse(const QDomElement &element);
+    void toXml(QXmlStreamWriter *writer) const;
+    /// \endcond
 };
 
 class QXmppSaslClientAnonymous : public QXmppSaslClient