further cleanup of XMP RPC code

4 files changed, 18 insertions, 17 deletions

diff --git a/source/QXmppClient.cpp b/source/QXmppClient.cpp
index 00c6dc2a..f054f130 100644
--- a/source/QXmppClient.cpp
+++ b/source/QXmppClient.cpp
@@ -491,7 +491,7 @@ void QXmppClient::invokeInterfaceMethod( const QXmppRpcInvokeIq &iq )
                 resultIq.setId(iq.id());
                 resultIq.setTo(iq.from());
                 resultIq.setFrom(m_stream->configuration().jid());
-                resultIq.setPayload(result);
+                resultIq.setPayload(QVariantList() << result);
                 m_stream->sendPacket( resultIq );
                 return;
             }
diff --git a/source/QXmppRpcIq.cpp b/source/QXmppRpcIq.cpp
index 41c34856..6f15918e 100644
--- a/source/QXmppRpcIq.cpp
+++ b/source/QXmppRpcIq.cpp
@@ -43,12 +43,12 @@ QXmppRpcResponseIq::QXmppRpcResponseIq() : QXmppIq( QXmppIq::Result )
 {
 }
 
-QVariant QXmppRpcResponseIq::payload() const
+QVariantList QXmppRpcResponseIq::payload() const
 {
     return m_payload;
 }
 
-void QXmppRpcResponseIq::setPayload( const QVariant &payload )
+void QXmppRpcResponseIq::setPayload( const QVariantList &payload )
 {
     m_payload = payload;
 }
@@ -68,12 +68,12 @@ void QXmppRpcResponseIq::parseElementFromChild(const QDomElement &element)
 
     XMLRPC::ResponseMessage message;
     if (message.parse(methodElement))
-        m_payload = message.values().first();
+        m_payload = message.values();
 }
 
 void QXmppRpcResponseIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
-    XMLRPC::ResponseMessage message(QList<QVariant>() << m_payload );
+    XMLRPC::ResponseMessage message(m_payload);
     writer->writeStartElement(ns_rpc, "query");
     message.writeXml(writer);
     writer->writeEndElement();
@@ -137,7 +137,7 @@ void QXmppRpcInvokeIq::parseElementFromChild(const QDomElement &element)
 void QXmppRpcInvokeIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 {
     QString methodName = m_interface + "." + m_method;
-    XMLRPC::RequestMessage message( methodName.toLatin1() ,m_payload );
+    XMLRPC::RequestMessage message( methodName.toLatin1(), m_payload );
     writer->writeStartElement(ns_rpc, "query");
     message.writeXml(writer);
     writer->writeEndElement();
diff --git a/source/QXmppRpcIq.h b/source/QXmppRpcIq.h
index 7eae434a..fd2b7a36 100644
--- a/source/QXmppRpcIq.h
+++ b/source/QXmppRpcIq.h
@@ -12,8 +12,8 @@ class QXmppRpcResponseIq : public QXmppIq
 public:
     QXmppRpcResponseIq();
 
-    QVariant payload() const;
-    void setPayload( const QVariant &payload );
+    QVariantList payload() const;
+    void setPayload( const QVariantList &payload );
 
     static bool isRpcResponseIq(const QDomElement &element);
 
@@ -22,7 +22,7 @@ protected:
     void toXmlElementFromChild(QXmlStreamWriter *writer) const;
 
 private:
-    QVariant m_payload;
+    QVariantList m_payload;
 };
 
 class QXmppRpcInvokeIq : public QXmppIq
diff --git a/source/xmlrpc.h b/source/xmlrpc.h
index 67f1a028..d27ec491 100644
--- a/source/xmlrpc.h
+++ b/source/xmlrpc.h
@@ -1,9 +1,10 @@
 #ifndef PACKET_H
 #define PACKET_H
-#include <QXmlStreamWriter>
-#include <QVariant>
+
 #include <QDomElement>
-#include <QList>
+#include <QVariant>
+#include <QXmlStreamWriter>
+
 /**
 * Packets are serialized QVariants that map to XMLRPC types.
 * @li int -> int
@@ -51,7 +52,7 @@ public:
     /**
     * Creates a method packet that will call method with a list of args.
     */
-    RequestMessage(const QByteArray &method = QByteArray(), const QList<QVariant> &args = QList<QVariant>());
+    RequestMessage(const QByteArray &method = QByteArray(), const QVariantList &args = QVariantList());
 
     /**
     * Parse an xml packet.
@@ -64,11 +65,11 @@ public:
     void writeXml( QXmlStreamWriter *writer ) const;
 
     QByteArray method() const;
-    QList< QVariant > args() const;
+    QVariantList args() const;
 
 private:
     QByteArray m_method;
-    QList<QVariant> m_args;
+    QVariantList m_args;
 };
 
 /**
@@ -81,7 +82,7 @@ public:
     /**
      * Create a new response message with data.
      */
-    ResponseMessage(const QList<QVariant> &theValue = QList<QVariant>());
+    ResponseMessage(const QVariantList &values = QVariantList());
 
     /**
     * Parse an xml packet.
@@ -93,7 +94,7 @@ public:
     */
     void writeXml( QXmlStreamWriter *writer ) const;
 
-    QList< QVariant > values() const;
+    QVariantList values() const;
 
 private:
     QList<QVariant> m_values;