diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-04-24 18:05:46 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-30 11:23:08 +0200 |
| commit | 8635e5b300298c01ada7dc51bfca76c3f02bfc14 (patch) | |
| tree | f7e797d9ab242c82659258ff4829a7e2a65ee1ed /src/qml/jsruntime/qv4arrayobject.cpp | |
| parent | 88e2b6316effd0a570b49e7e9f6f6378078c12a4 (diff) | |
Use QV4::Scope::hasException() where applicable
It is shorter and encapsulates the exception handling a bit.
Change-Id: I8e2dc0eb3b930e222b8cb4852b73d99ca18a0379
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 03e5c29973..3ecc56dbf5 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -258,7 +258,7 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V mapArguments[0] = *nextValue; mapArguments[1] = Value::fromDouble(k); mappedValue = mapfn->call(thisArg, mapArguments, 2); - if (scope.engine->hasException) + if (scope.hasException()) return Runtime::IteratorClose::call(scope.engine, iterator, Value::fromBoolean(false)); } else { mappedValue = *nextValue; @@ -271,7 +271,7 @@ ReturnedValue ArrayPrototype::method_from(const FunctionObject *builtin, const V scope.engine->throwTypeError(QString::fromLatin1("Cannot redefine property: %1").arg(k)); } - if (scope.engine->hasException) { + if (scope.hasException()) { ScopedValue falsey(scope, Encode(false)); return Runtime::IteratorClose::call(scope.engine, iterator, falsey); } @@ -423,7 +423,7 @@ ReturnedValue ArrayPrototype::method_concat(const FunctionObject *b, const Value } else if (eltAsObj && eltAsObj->isConcatSpreadable()) { const uint startIndex = result->getLength(); const uint len = eltAsObj->getLength(); - if (scope.engine->hasException) + if (scope.hasException()) return Encode::undefined(); for (uint i = 0; i < len; ++i) { |