rework service discovery to use a generic QXmppElement

1 files changed, 4 insertions, 22 deletions

diff --git a/source/QXmppDiscoveryIq.h b/source/QXmppDiscoveryIq.h
index 31c97630..09dc6d7d 100644
--- a/source/QXmppDiscoveryIq.h
+++ b/source/QXmppDiscoveryIq.h
@@ -24,29 +24,11 @@
 #ifndef QXMPPDISCOVERY_H
 #define QXMPPDISCOVERY_H
 
+#include "QXmppElement.h"
 #include "QXmppIq.h"
 
-#include <QMap>
-#include <QStringList>
-
 class QDomElement;
 
-class QXmppDiscoveryItem
-{
-public:
-    QStringList attributes() const;
-
-    QString attribute(const QString &name) const;
-    void setAttribute(const QString &name, const QString &value);
-
-    QString type() const;
-    void setType(const QString &type);
-
-private:
-    QMap<QString, QString> m_attributes;
-    QString m_type;
-};
-
 class QXmppDiscoveryIq : public QXmppIq
 {
 public:
@@ -59,14 +41,14 @@ public:
     void parse( QDomElement &element );
     static bool isDiscoveryIq( QDomElement &element );
 
-    QList<QXmppDiscoveryItem> getItems() const;
-    void setItems(const QList<QXmppDiscoveryItem> &items);
+    QList<QXmppElement> getItems() const;
+    void setItems(const QList<QXmppElement> &items);
 
     enum QueryType getQueryType() const;
     void setQueryType(enum QueryType type);
 
 private:
-    QList<QXmppDiscoveryItem> m_items;
+    QList<QXmppElement> m_items;
     enum QueryType m_queryType;
 };