From 1edcf64d282b9368d4609b91453cbc6e3f6a84c5 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Mon, 16 Jan 2012 13:29:38 +0100
Subject: Remove QJSEngine::toObject() and QJSValue::toObject()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Rationale: There is no compelling usecase for these functions.
They are a remnant from QtScript.

Task-number: QTBUG-23604
Change-Id: I6d8b4299956dd8f6284934739c4f1a65e4deb64c
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---
 tests/auto/declarative/qjsengine/tst_qjsengine.cpp | 83 +---------------------
 1 file changed, 1 insertion(+), 82 deletions(-)

(limited to 'tests/auto/declarative/qjsengine/tst_qjsengine.cpp')

diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
index 092b997b8d..c13f86ffdf 100644
--- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
@@ -235,7 +235,6 @@ private slots:
 #endif
     void jsContinueInSwitch();
     void jsShadowReadOnlyPrototypeProperty();
-    void toObject();
     void jsReservedWords_data();
     void jsReservedWords();
     void jsFutureReservedWords_data();
@@ -4366,7 +4365,7 @@ void tst_QJSEngine::stringObjects()
     QString str("ciao");
     // in C++
     {
-        QJSValue obj = QJSValue(&eng, str).toObject();
+        QJSValue obj = eng.evaluate(QString::fromLatin1("new String('%0')").arg(str));
         QCOMPARE(obj.property("length").toInt(), str.length());
         QCOMPARE(obj.propertyFlags("length"), QJSValue::PropertyFlags(QJSValue::Undeletable | QJSValue::SkipInEnumeration | QJSValue::ReadOnly));
         for (int i = 0; i < str.length(); ++i) {
@@ -4390,7 +4389,6 @@ void tst_QJSEngine::stringObjects()
         QVERIFY(obj.property("100").strictlyEquals(val));
     }
 
-    // in script
     {
         QJSValue ret = eng.evaluate("s = new String('ciao'); r = []; for (var p in s) r.push(p); r");
         QVERIFY(ret.isArray());
@@ -4677,85 +4675,6 @@ void tst_QJSEngine::jsShadowReadOnlyPrototypeProperty()
     QVERIFY(eng.evaluate("o.hasOwnProperty('length')").toBool());
 }
 
-void tst_QJSEngine::toObject()
-{
-    QJSEngine eng;
-
-    QVERIFY(!eng.toObject(eng.undefinedValue()).isValid());
-
-    QVERIFY(!eng.toObject(eng.nullValue()).isValid());
-
-    QJSValue falskt(false);
-    {
-        QJSValue tmp = eng.toObject(falskt);
-        QVERIFY(tmp.isObject());
-        QCOMPARE(tmp.toNumber(), falskt.toNumber());
-    }
-    QVERIFY(falskt.isBool());
-
-    QJSValue sant(true);
-    {
-        QJSValue tmp = eng.toObject(sant);
-        QVERIFY(tmp.isObject());
-        QCOMPARE(tmp.toNumber(), sant.toNumber());
-    }
-    QVERIFY(sant.isBool());
-
-    QJSValue number(123.0);
-    {
-        QJSValue tmp = eng.toObject(number);
-        QVERIFY(tmp.isObject());
-        QCOMPARE(tmp.toNumber(), number.toNumber());
-    }
-    QVERIFY(number.isNumber());
-
-    QJSValue str = QJSValue(&eng, QString("ciao"));
-    {
-        QJSValue tmp = eng.toObject(str);
-        QVERIFY(tmp.isObject());
-        QCOMPARE(tmp.toString(), str.toString());
-    }
-    QVERIFY(str.isString());
-
-    QJSValue object = eng.newObject();
-    {
-        QJSValue tmp = eng.toObject(object);
-        QVERIFY(tmp.isObject());
-        QVERIFY(tmp.strictlyEquals(object));
-    }
-
-    QJSValue qobject = eng.newQObject(this);
-    QVERIFY(eng.toObject(qobject).strictlyEquals(qobject));
-
-    QVERIFY(!eng.toObject(QJSValue()).isValid());
-
-    // v1 constructors
-
-    QJSValue boolValue(&eng, true);
-    {
-        QJSValue ret = eng.toObject(boolValue);
-        QVERIFY(ret.isObject());
-        QCOMPARE(ret.toBool(), boolValue.toBool());
-    }
-    QVERIFY(boolValue.isBool());
-
-    QJSValue numberValue(&eng, 123.0);
-    {
-        QJSValue ret = eng.toObject(numberValue);
-        QVERIFY(ret.isObject());
-        QCOMPARE(ret.toNumber(), numberValue.toNumber());
-    }
-    QVERIFY(numberValue.isNumber());
-
-    QJSValue stringValue(&eng, QString::fromLatin1("foo"));
-    {
-        QJSValue ret = eng.toObject(stringValue);
-        QVERIFY(ret.isObject());
-        QCOMPARE(ret.toString(), stringValue.toString());
-    }
-    QVERIFY(stringValue.isString());
-}
-
 void tst_QJSEngine::jsReservedWords_data()
 {
     QTest::addColumn<QString>("word");
-- 
cgit v1.2.3