Properly convert JSON data to target type of function parameter.

This used to work but broke in one of the last few commits apparently.
Now we add a proper unit test to ensure it stays working.

The issue was that JSON only knows e.g. numeric types stored as double.
When we then try to call a method taking an int with the VariantArgument
that tries to convert the double to int, we failed and produced an
invalid QVariant which then converts to 0.

Now we use the appropriate API to convert the JSON data to the correct
target type before calling the method. Furthermore, it became clear
that we can greatly cleanup the VariantArgument thanks to that. It now
is reduced to just a QVariant wrapper class with an implicit cast
operator to QGenericArgument.

Change-Id: Ieaf60f548ea9584e7d760f9cd935da455787f376
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 4 insertions, 43 deletions

diff --git a/src/webchannel/variantargument_p.h b/src/webchannel/variantargument_p.h
index ee625fc..5f17953 100644
--- a/src/webchannel/variantargument_p.h
+++ b/src/webchannel/variantargument_p.h
@@ -44,60 +44,21 @@
 #define VARIANTARGUMENT_H
 
 #include <QVariant>
-#include <QMetaType>
 
 /**
  * RAII QVariant to Q[Generic]Argument conversion
  */
-class VariantArgument
+struct VariantArgument
 {
-public:
-    explicit VariantArgument()
-    : m_data(0)
-    , m_paramType(0)
-    {
-    }
-
-    /// TODO: test with C++ methods that don't take a QVariant as arg
-    ///       also test conversions
-    void setValue(const QVariant &value, int paramType)
-    {
-        if (m_data) {
-            QMetaType::destroy(m_paramType, m_data);
-            m_name.clear();
-            m_data = 0;
-        }
-
-        m_paramType = paramType;
-
-        if (value.isValid()) {
-            m_name = value.typeName();
-            m_data = QMetaType::create(m_paramType, value.constData());
-        }
-    }
-
-    ~VariantArgument()
-    {
-        if (m_data) {
-            QMetaType::destroy(m_paramType, m_data);
-            m_data = 0;
-        }
-    }
-
     operator QGenericArgument() const
     {
-        if (!m_data) {
+        if (!value.isValid()) {
             return QGenericArgument();
         }
-        return QGenericArgument(m_name.constData(), m_data);
+        return QGenericArgument(value.typeName(), value.constData());
     }
 
-private:
-    Q_DISABLE_COPY(VariantArgument)
-
-    QByteArray m_name;
-    void* m_data;
-    int m_paramType;
+    QVariant value;
 };
 
 #endif // VARIANTARGUMENT_H