aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-01-20 08:00:27 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-20 23:35:18 +0100
commit95cee5d6e514891aab160c8e1fc4814c147ab3a6 (patch)
treebac0e5c4bd8c23623e92f3f5de20d4acd47c7b3a /tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
parentdfad4902b7227540baa2a15f894fe8937c3c6e15 (diff)
Add QJSValue::call() overload
This overload takes only an argument list, not a this-object, since that is a very common way of calling stand-alone ("non-member") functions. Now there is no longer a need to pass a dummy value for the this-object. Task-number: QTBUG-23604 Change-Id: Iae952d91fce5bcaa62a05b9978c15f32802da90a Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp')
-rw-r--r--tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
index 7fd2eaac45..48a65dc4fe 100644
--- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
+++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp
@@ -2985,7 +2985,7 @@ void tst_QJSValue::call_invalidArguments()
{
QJSValueList args;
args << QJSValue();
- QJSValue ret = fun.call(QJSValue(), args);
+ QJSValue ret = fun.call(args);
QVERIFY(!eng.hasUncaughtException());
QCOMPARE(ret.isValid(), true);
QCOMPARE(ret.isUndefined(), true);
@@ -2996,7 +2996,7 @@ void tst_QJSValue::call_invalidArguments()
{
QJSValueList args;
args << QJSValue();
- QJSValue ret = fun.call(QJSValue(), args);
+ QJSValue ret = fun.call(args);
QCOMPARE(ret.isValid(), true);
QCOMPARE(ret.isUndefined(), true);
}
@@ -3006,7 +3006,7 @@ void tst_QJSValue::call_invalidArguments()
{
QJSValueList args;
args << QJSValue() << QJSValue();
- QJSValue ret = fun.call(QJSValue(), args);
+ QJSValue ret = fun.call(args);
QCOMPARE(ret.isValid(), true);
QCOMPARE(ret.isNumber(), true);
QCOMPARE(qIsNaN(ret.toNumber()), true);
@@ -3044,7 +3044,7 @@ void tst_QJSValue::call_twoEngines()
QTest::ignoreMessage(QtWarningMsg, "QJSValue::call() failed: "
"cannot call function with argument created in "
"a different engine");
- QCOMPARE(fun.call(QJSValue(), QJSValueList() << QJSValue(&eng, 123)).isValid(), false);
+ QCOMPARE(fun.call(QJSValueList() << QJSValue(&eng, 123)).isValid(), false);
{
QJSValue fun = eng.evaluate("Object");
QVERIFY(fun.isCallable());
@@ -3053,7 +3053,7 @@ void tst_QJSValue::call_twoEngines()
QJSValueList args;
args << objectInDifferentEngine;
QTest::ignoreMessage(QtWarningMsg, "QJSValue::call() failed: cannot call function with argument created in a different engine");
- fun.call(QJSValue(), args);
+ fun.call(args);
}
}
@@ -3540,15 +3540,15 @@ void tst_QJSValue::equals()
QJSValue compareFun = eng.evaluate("(function(a, b) { return a == b; })");
QVERIFY(compareFun.isCallable());
{
- QJSValue ret = compareFun.call(QJSValue(), QJSValueList() << qobj1 << qobj2);
+ QJSValue ret = compareFun.call(QJSValueList() << qobj1 << qobj2);
QVERIFY(ret.isBool());
- ret = compareFun.call(QJSValue(), QJSValueList() << qobj1 << qobj3);
+ ret = compareFun.call(QJSValueList() << qobj1 << qobj3);
QVERIFY(ret.isBool());
QVERIFY(!ret.toBool());
- ret = compareFun.call(QJSValue(), QJSValueList() << qobj1 << qobj4);
+ ret = compareFun.call(QJSValueList() << qobj1 << qobj4);
QVERIFY(ret.isBool());
QVERIFY(!ret.toBool());
- ret = compareFun.call(QJSValue(), QJSValueList() << qobj1 << obj1);
+ ret = compareFun.call(QJSValueList() << qobj1 << obj1);
QVERIFY(ret.isBool());
QVERIFY(!ret.toBool());
}