use QXmppElementList and introduce QXmppIq::parse()

2 files changed, 21 insertions, 5 deletions

diff --git a/source/QXmppIq.cpp b/source/QXmppIq.cpp
index a28e6f8d..981ffeb7 100644
--- a/source/QXmppIq.cpp
+++ b/source/QXmppIq.cpp
@@ -25,6 +25,7 @@
 #include "QXmppUtils.h"
 #include "QXmppIq.h"
 
+#include <QDomElement>
 #include <QXmlStreamWriter>
 
 QXmppIq::QXmppIq(QXmppIq::Type type)
@@ -55,6 +56,20 @@ void QXmppIq::setType(QXmppIq::Type type)
     m_type = type;
 }
 
+void QXmppIq::parse( QDomElement &element )
+{
+    setFrom(element.attribute("from"));
+    setTo(element.attribute("to"));
+    setTypeFromStr(element.attribute("type"));
+
+    QDomElement itemElement = element.firstChildElement();
+    while (!itemElement.isNull())
+    {
+        m_items.append(QXmppElement(itemElement));
+        itemElement = itemElement.nextSiblingElement();
+    }
+}
+
 void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const
 {
     xmlWriter->writeStartElement("iq");
@@ -126,12 +141,12 @@ void QXmppIq::setTypeFromStr(const QString& str)
     }
 }
 
-QList<QXmppElement> QXmppIq::getItems() const
+QXmppElementList QXmppIq::getItems() const
 {
     return m_items;
 }
 
-void QXmppIq::setItems(const QList<QXmppElement> &items)
+void QXmppIq::setItems(const QXmppElementList &items)
 {
     m_items = items;
 }
diff --git a/source/QXmppIq.h b/source/QXmppIq.h
index 4b7f6b6b..0205daea 100644
--- a/source/QXmppIq.h
+++ b/source/QXmppIq.h
@@ -53,15 +53,16 @@ public:
     void setType(QXmppIq::Type);
     void setTypeFromStr(const QString& str);
 
-    QList<QXmppElement> getItems() const;
-    void setItems(const QList<QXmppElement> &items);
+    QXmppElementList getItems() const;
+    void setItems(const QXmppElementList &items);
 
+    void parse( QDomElement &element );
     void toXml( QXmlStreamWriter *writer ) const;
     virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const;
 
 private:
     Type m_type;
-    QList<QXmppElement> m_items;
+    QXmppElementList m_items;
 };
 
 #endif // QXMPPIQ_H