2 files changed, 8 insertions, 27 deletions
diff --git a/source/QXmppIq.cpp b/source/QXmppIq.cpp
index 6c2fe257..a28e6f8d 100644
--- a/source/QXmppIq.cpp
+++ b/source/QXmppIq.cpp
@@ -73,13 +73,8 @@ void QXmppIq::toXml( QXmlStreamWriter *xmlWriter ) const
 
 void QXmppIq::toXmlElementFromChild( QXmlStreamWriter *writer ) const
 {
-    if (m_queryNamespace.isEmpty() && m_queryItems.isEmpty())
-        return;
-    writer->writeStartElement("query");
-    helperToXmlAddAttribute(writer, "xmlns", m_queryNamespace);
-    foreach (const QXmppElement &item, m_queryItems)
+    foreach (const QXmppElement &item, m_items)
         item.toXml(writer);
-    writer->writeEndElement();
 }
 
 QString QXmppIq::getTypeStr() const
@@ -131,23 +126,13 @@ void QXmppIq::setTypeFromStr(const QString& str)
     }
 }
 
-QList<QXmppElement> QXmppIq::getQueryItems() const
-{
-    return m_queryItems;
-}
-
-void QXmppIq::setQueryItems(const QList<QXmppElement> &items)
-{
-    m_queryItems = items;
-}
-
-QString QXmppIq::getQueryNamespace() const
+QList<QXmppElement> QXmppIq::getItems() const
 {
-    return m_queryNamespace;
+    return m_items;
 }
 
-void QXmppIq::setQueryNamespace(const QString &ns)
+void QXmppIq::setItems(const QList<QXmppElement> &items)
 {
-    m_queryNamespace = ns;
+    m_items = items;
 }
 
diff --git a/source/QXmppIq.h b/source/QXmppIq.h
index 8a1ba099..4b7f6b6b 100644
--- a/source/QXmppIq.h
+++ b/source/QXmppIq.h
@@ -53,19 +53,15 @@ public:
     void setType(QXmppIq::Type);
     void setTypeFromStr(const QString& str);
 
-    QList<QXmppElement> getQueryItems() const;
-    void setQueryItems(const QList<QXmppElement> &items);
-
-    QString getQueryNamespace() const;
-    void setQueryNamespace(const QString &ns);
+    QList<QXmppElement> getItems() const;
+    void setItems(const QList<QXmppElement> &items);
 
     void toXml( QXmlStreamWriter *writer ) const;
     virtual void toXmlElementFromChild( QXmlStreamWriter *writer ) const;
 
 private:
     Type m_type;
-    QList<QXmppElement> m_queryItems;
-    QString m_queryNamespace;
+    QList<QXmppElement> m_items;
 };
 
 #endif // QXMPPIQ_H