get rid of QXmppSaslStanza base class

2 files changed, 63 insertions, 47 deletions

diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
index 9373c3d8..b3df3a1f 100644
--- a/src/base/QXmppSasl.cpp
+++ b/src/base/QXmppSasl.cpp
@@ -104,10 +104,34 @@ void QXmppSaslAuth::toXml(QXmlStreamWriter *writer) const
 }
 
 QXmppSaslChallenge::QXmppSaslChallenge(const QByteArray &value)
-    : QXmppSaslStanza("challenge", value)
+    : m_value(value)
 {
 }
 
+QByteArray QXmppSaslChallenge::value() const
+{
+    return m_value;
+}
+
+void QXmppSaslChallenge::setValue(const QByteArray &value)
+{
+    m_value = value;
+}
+
+void QXmppSaslChallenge::parse(const QDomElement &element)
+{
+    m_value = QByteArray::fromBase64(element.text().toAscii());
+}
+
+void QXmppSaslChallenge::toXml(QXmlStreamWriter *writer) const
+{
+    writer->writeStartElement("challenge");
+    writer->writeAttribute("xmlns", ns_xmpp_sasl);
+    if (!m_value.isEmpty())
+        writer->writeCharacters(m_value.toBase64());
+    writer->writeEndElement();
+}
+
 QXmppSaslFailure::QXmppSaslFailure(const QString &condition)
     : m_condition(condition)
 {
@@ -138,56 +162,47 @@ void QXmppSaslFailure::toXml(QXmlStreamWriter *writer) const
 }
 
 QXmppSaslResponse::QXmppSaslResponse(const QByteArray &value)
-    : QXmppSaslStanza("response", value)
-{
-}
-
-QXmppSaslSuccess::QXmppSaslSuccess()
+    : m_value(value)
 {
 }
 
-void QXmppSaslSuccess::parse(const QDomElement &element)
+QByteArray QXmppSaslResponse::value() const
 {
+    return m_value;
 }
 
-void QXmppSaslSuccess::toXml(QXmlStreamWriter *writer) const
+void QXmppSaslResponse::setValue(const QByteArray &value)
 {
-    writer->writeStartElement("success");
-    writer->writeAttribute("xmlns", ns_xmpp_sasl);
-    writer->writeEndElement();
+    m_value = value;
 }
 
-QXmppSaslStanza::QXmppSaslStanza(const QString &type, const QByteArray &value)
-    : m_type(type)
-    , m_value(value)
+void QXmppSaslResponse::parse(const QDomElement &element)
 {
+    m_value = QByteArray::fromBase64(element.text().toAscii());
 }
 
-QByteArray QXmppSaslStanza::value() const
+void QXmppSaslResponse::toXml(QXmlStreamWriter *writer) const
 {
-    return m_value;
+    writer->writeStartElement("response");
+    writer->writeAttribute("xmlns", ns_xmpp_sasl);
+    if (!m_value.isEmpty())
+        writer->writeCharacters(m_value.toBase64());
+    writer->writeEndElement();
 }
 
-void QXmppSaslStanza::setValue(const QByteArray &value)
+QXmppSaslSuccess::QXmppSaslSuccess()
 {
-    m_value = value;
 }
 
-void QXmppSaslStanza::parse(const QDomElement &element)
+void QXmppSaslSuccess::parse(const QDomElement &element)
 {
-    m_type = element.nodeName();
-    m_value = QByteArray::fromBase64(element.text().toAscii());
 }
 
-void QXmppSaslStanza::toXml(QXmlStreamWriter *writer) const
+void QXmppSaslSuccess::toXml(QXmlStreamWriter *writer) const
 {
-    if (!m_type.isEmpty()) {
-        writer->writeStartElement(m_type);
-        writer->writeAttribute("xmlns", ns_xmpp_sasl);
-        if (!m_value.isEmpty())
-            writer->writeCharacters(m_value.toBase64());
-        writer->writeEndElement();
-    }
+    writer->writeStartElement("success");
+    writer->writeAttribute("xmlns", ns_xmpp_sasl);
+    writer->writeEndElement();
 }
 
 class QXmppSaslClientPrivate
diff --git a/src/base/QXmppSasl_p.h b/src/base/QXmppSasl_p.h
index f6eeaf71..1684bf4e 100644
--- a/src/base/QXmppSasl_p.h
+++ b/src/base/QXmppSasl_p.h
@@ -120,13 +120,13 @@ public:
     static QByteArray serializeMessage(const QMap<QByteArray, QByteArray> &map);
 };
 
-class QXmppSaslStanza : public QXmppStanza
+class QXmppSaslAuth : public QXmppStanza
 {
 public:
-    QXmppSaslStanza(const QString &type, const QByteArray &value = QByteArray());
+    QXmppSaslAuth(const QString &mechanism = QString(), const QByteArray &value = QByteArray());
 
-    QString type() const;
-    void setType(const QString &type);
+    QString mechanism() const;
+    void setMechanism(const QString &mechanism);
 
     QByteArray value() const;
     void setValue(const QByteArray &value);
@@ -137,17 +137,14 @@ public:
     /// \endcond
 
 private:
-    QString m_type;
+    QString m_mechanism;
     QByteArray m_value;
 };
 
-class QXmppSaslAuth : public QXmppStanza
+class QXmppSaslChallenge : public QXmppStanza
 {
 public:
-    QXmppSaslAuth(const QString &mechanism = QString(), const QByteArray &value = QByteArray());
-
-    QString mechanism() const;
-    void setMechanism(const QString &mechanism);
+    QXmppSaslChallenge(const QByteArray &value = QByteArray());
 
     QByteArray value() const;
     void setValue(const QByteArray &value);
@@ -158,16 +155,9 @@ public:
     /// \endcond
 
 private:
-    QString m_mechanism;
     QByteArray m_value;
 };
 
-class QXmppSaslChallenge : public QXmppSaslStanza
-{
-public:
-    QXmppSaslChallenge(const QByteArray &value = QByteArray());
-};
-
 class QXmppSaslFailure : public QXmppStanza
 {
 public:
@@ -185,10 +175,21 @@ private:
     QString m_condition;
 };
 
-class QXmppSaslResponse : public QXmppSaslStanza
+class QXmppSaslResponse : public QXmppStanza
 {
 public:
     QXmppSaslResponse(const QByteArray &value = QByteArray());
+
+    QByteArray value() const;
+    void setValue(const QByteArray &value);
+
+    /// \cond
+    void parse(const QDomElement &element);
+    void toXml(QXmlStreamWriter *writer) const;
+    /// \endcond
+
+private:
+    QByteArray m_value;
 };
 
 class QXmppSaslSuccess : public QXmppStanza