This method is only used one place, so inline it there

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

diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 4cfae02..11b7dad 100644 (file)
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -516,7 +516,22 @@ QVariant QJSValue::toVariant() const
     if (d->value.isEmpty())
         return d->unboundData;
 
-    return QV4::VariantObject::toVariant(d->value);
+    if (d->value.asObject())
+        return QV8Engine::toVariant(d->value.engine(), d->value, /*typeHint*/ -1, /*createJSValueForObjects*/ false);
+
+    if (d->value.isString())
+        return QVariant(d->value.stringValue()->toQString());
+    if (d->value.isBoolean())
+        return QVariant(d->value.booleanValue());
+    if (d->value.isNumber()) {
+        if (d->value.isInt32())
+            return QVariant(d->value.integerValue());
+        return QVariant(d->value.asDouble());
+    }
+    if (d->value.isNull())
+        return QVariant(QMetaType::VoidStar, 0);
+    Q_ASSERT(d->value.isUndefined());
+    return QVariant();
 }
 
 /*!

diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp
index 4ed9162..5397b96 100644 (file)
--- a/src/qml/jsruntime/qv4variantobject.cpp
+++ b/src/qml/jsruntime/qv4variantobject.cpp
@@ -51,28 +51,6 @@ Heap::VariantObject::VariantObject(QV4::ExecutionEngine *engine, const QVariant
         engine->scarceResources.insert(this);
 }
 
-QVariant VariantObject::toVariant(const QV4::ValueRef v)
-{
-    if (v->asObject())
-        return QV8Engine::toVariant(v->engine(), v, /*typeHint*/ -1, /*createJSValueForObjects*/ false);
-
-    if (v->isString())
-        return QVariant(v->stringValue()->toQString());
-    if (v->isBoolean())
-        return QVariant(v->booleanValue());
-    if (v->isNumber()) {
-        QV4::Value val;
-        val = v;
-        if (val.isInt32())
-            return QVariant(val.integerValue());
-        return QVariant(v->asDouble());
-    }
-    if (v->isNull())
-        return QVariant(QMetaType::VoidStar, 0);
-    Q_ASSERT(v->isUndefined());
-    return QVariant();
-}
-
 bool VariantObject::Data::isScarce() const
 {
     QVariant::Type t = data.type();

diff --git a/src/qml/jsruntime/qv4variantobject_p.h b/src/qml/jsruntime/qv4variantobject_p.h
index 14ef167..a7a4209 100644 (file)
--- a/src/qml/jsruntime/qv4variantobject_p.h
+++ b/src/qml/jsruntime/qv4variantobject_p.h
@@ -79,8 +79,6 @@ struct VariantObject : Object
     V4_OBJECT2(VariantObject, Object)
     V4_NEEDS_DESTROY
 
-    static QVariant toVariant(const ValueRef v);
-
     void addVmePropertyReference();
     void removeVmePropertyReference();