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/qv4stringobject.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/qv4stringobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 14c1e3ed54..1d1a5b5814 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -266,14 +266,14 @@ ReturnedValue StringCtor::method_raw(const FunctionObject *f, const Value *, con while (1) { val = raw->get(nextIndex); result += val->toQString(); - if (scope.engine->hasException) + if (scope.hasException()) return Encode::undefined(); if (nextIndex + 1 == literalSegments) return scope.engine->newString(result)->asReturnedValue(); if (nextIndex < static_cast<uint>(argc)) result += argv[nextIndex].toQString(); - if (scope.engine->hasException) + if (scope.hasException()) return Encode::undefined(); ++nextIndex; } @@ -895,13 +895,13 @@ ReturnedValue StringPrototype::method_search(const FunctionObject *b, const Valu { Scope scope(b); QString string = getThisString(scope.engine, thisObject); - if (scope.engine->hasException) + if (scope.hasException()) return QV4::Encode::undefined(); Scoped<RegExpObject> regExp(scope, argc ? argv[0] : Value::undefinedValue()); if (!regExp) { regExp = scope.engine->regExpCtor()->callAsConstructor(argv, 1); - if (scope.engine->hasException) + if (scope.hasException()) return QV4::Encode::undefined(); Q_ASSERT(regExp); |