Make QXmppStanza inherit from QXmppNonza

QXmppNonzas are basic elements which can be sent over XMPP streams.
QXmppStanza is a specialization of that (IQ, message or presence).

2 files changed, 3 insertions, 16 deletions

diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp
index f087adcb..3adcd67f 100644
--- a/src/base/QXmppStanza.cpp
+++ b/src/base/QXmppStanza.cpp
@@ -670,17 +670,6 @@ void QXmppStanza::setExtendedAddresses(const QList<QXmppExtendedAddress> &addres
     d->extendedAddresses = addresses;
 }
 
-///
-/// Indicates if the QXmppStanza is a stanza in the XMPP sense (i. e. a message,
-/// iq or presence)
-///
-/// \since QXmpp 1.0
-///
-bool QXmppStanza::isXmppStanza() const
-{
-    return false;
-}
-
 /// \cond
 void QXmppStanza::generateAndSetNextId()
 {
diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h
index cbfcdac5..900a905c 100644
--- a/src/base/QXmppStanza.h
+++ b/src/base/QXmppStanza.h
@@ -35,6 +35,7 @@
 // See http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
 // for an explanation.
 #include "QXmppElement.h"
+#include "QXmppNonza.h"
 
 #include <QXmlStreamWriter>
 
@@ -96,7 +97,7 @@ class QXmppStanzaErrorPrivate;
 ///
 /// \ingroup Stanzas
 ///
-class QXMPP_EXPORT QXmppStanza
+class QXMPP_EXPORT QXmppStanza : public QXmppNonza
 {
 public:
     ///
@@ -220,11 +221,8 @@ public:
     QList<QXmppExtendedAddress> extendedAddresses() const;
     void setExtendedAddresses(const QList<QXmppExtendedAddress> &extendedAddresses);
 
-    virtual bool isXmppStanza() const;
-
     /// \cond
-    virtual void parse(const QDomElement &element);
-    virtual void toXml(QXmlStreamWriter *writer) const = 0;
+    void parse(const QDomElement &element) override;
 
 protected:
     void extensionsToXml(QXmlStreamWriter *writer) const;