diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-01-16 15:01:29 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 08:37:49 +0100 |
commit | 24bf48e3dd305dbc4fdcae5f8751792835ffd46a (patch) | |
tree | 64ab2bacd8a563befe1e3ebfab8c18998bd40715 /tests/auto/declarative | |
parent | 1edcf64d282b9368d4609b91453cbc6e3f6a84c5 (diff) |
Remove QJSValue::toInteger() function
Rationale: This is a remnant from QtScript. A function called
toInteger() that returns a double looks strange.
Use toInt32() to convert a QJSValue to an integer.
Task-number: QTBUG-23604
Change-Id: I2829704c64b077fca264b660c46248c3f35cb5c0
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r-- | tests/auto/declarative/qjsengine/tst_qjsengine.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp | 87 | ||||
-rw-r--r-- | tests/auto/declarative/qjsvalue/tst_qjsvalue.h | 1 |
3 files changed, 1 insertions, 89 deletions
diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp index c13f86ffdf..1a0e8a1b34 100644 --- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp @@ -6421,7 +6421,7 @@ public: QJSEngine firstEngine; QJSEngine secondEngine; QJSValue value = firstEngine.evaluate("1"); - result = secondEngine.evaluate("1 + " + QString::number(value.toInteger())).toInteger(); + result = secondEngine.evaluate("1 + " + QString::number(value.toInt())).toInt(); } }; diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp index c02e446193..eeae7a3054 100644 --- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp @@ -731,93 +731,6 @@ void tst_QJSValue::toBool() } } -void tst_QJSValue::toInteger() -{ - QJSEngine eng; - - { - QJSValue number = QJSValue(&eng, 123.0); - QCOMPARE(number.toInteger(), 123.0); - - QJSValue number2 = QJSValue(&eng, qSNaN()); - QCOMPARE(number2.toInteger(), 0.0); - - QJSValue number3 = QJSValue(&eng, qInf()); - QCOMPARE(qIsInf(number3.toInteger()), true); - - QJSValue number4 = QJSValue(&eng, 0.5); - QCOMPARE(number4.toInteger(), 0.0); - - QJSValue number5 = QJSValue(&eng, 123.5); - QCOMPARE(number5.toInteger(), 123.0); - - QJSValue number6 = QJSValue(&eng, -456.5); - QCOMPARE(number6.toInteger(), -456.0); - - QJSValue str = QJSValue(&eng, QLatin1String("123.0")); - QCOMPARE(str.toInteger(), 123.0); - - QJSValue str2 = QJSValue(&eng, QLatin1String("NaN")); - QCOMPARE(str2.toInteger(), 0.0); - - QJSValue str3 = QJSValue(&eng, QLatin1String("Infinity")); - QCOMPARE(qIsInf(str3.toInteger()), true); - - QJSValue str4 = QJSValue(&eng, QLatin1String("0.5")); - QCOMPARE(str4.toInteger(), 0.0); - - QJSValue str5 = QJSValue(&eng, QLatin1String("123.5")); - QCOMPARE(str5.toInteger(), 123.0); - - QJSValue str6 = QJSValue(&eng, QLatin1String("-456.5")); - QCOMPARE(str6.toInteger(), -456.0); - } - // V2 constructors - { - QJSValue number = QJSValue(123.0); - QCOMPARE(number.toInteger(), 123.0); - - QJSValue number2 = QJSValue(qSNaN()); - QCOMPARE(number2.toInteger(), 0.0); - - QJSValue number3 = QJSValue(qInf()); - QCOMPARE(qIsInf(number3.toInteger()), true); - - QJSValue number4 = QJSValue(0.5); - QCOMPARE(number4.toInteger(), 0.0); - - QJSValue number5 = QJSValue(123.5); - QCOMPARE(number5.toInteger(), 123.0); - - QJSValue number6 = QJSValue(-456.5); - QCOMPARE(number6.toInteger(), -456.0); - - QJSValue number7 = QJSValue(0x43211234); - QCOMPARE(number7.toInteger(), qreal(0x43211234)); - - QJSValue str = QJSValue("123.0"); - QCOMPARE(str.toInteger(), 123.0); - - QJSValue str2 = QJSValue("NaN"); - QCOMPARE(str2.toInteger(), 0.0); - - QJSValue str3 = QJSValue("Infinity"); - QCOMPARE(qIsInf(str3.toInteger()), true); - - QJSValue str4 = QJSValue("0.5"); - QCOMPARE(str4.toInteger(), 0.0); - - QJSValue str5 = QJSValue("123.5"); - QCOMPARE(str5.toInteger(), 123.0); - - QJSValue str6 = QJSValue("-456.5"); - QCOMPARE(str6.toInteger(), -456.0); - } - - QJSValue inv; - QCOMPARE(inv.toInteger(), 0.0); -} - void tst_QJSValue::toInt() { QJSEngine eng; diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.h b/tests/auto/declarative/qjsvalue/tst_qjsvalue.h index 978cd92cc1..0750766f06 100644 --- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.h +++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.h @@ -83,7 +83,6 @@ private slots: void toNumber(); void toBoolean(); void toBool(); - void toInteger(); void toInt(); void toUInt(); void toUInt16(); |