diff options
Diffstat (limited to 'src/qml/compat/removed_api.cpp')
| -rw-r--r-- | src/qml/compat/removed_api.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/compat/removed_api.cpp b/src/qml/compat/removed_api.cpp index c896f7bc33..4b74d15d75 100644 --- a/src/qml/compat/removed_api.cpp +++ b/src/qml/compat/removed_api.cpp @@ -32,8 +32,8 @@ bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr) bool QQmlPrivate::AOTCompiledContext::getEnumLookup(uint index, int *target) const { using namespace QQmlPrivate; - QV4::Lookup *l = compilationUnit->runtimeLookups + index; - auto mt = QMetaType(l->qmlEnumValueLookup.metaType); + QV4::Lookup *lookup = compilationUnit->runtimeLookups + index; + auto mt = QMetaType(lookup->qmlEnumValueLookup.metaType); QVariant buffer(mt); getEnumLookup(index, buffer.data()); *target = buffer.toInt(); @@ -50,14 +50,14 @@ bool QQmlPrivate::AOTCompiledContext::getEnumLookup(uint index, int *target) con bool QQmlPrivate::AOTCompiledContext::callObjectPropertyLookup( uint index, QObject *object, void **args, const QMetaType *types, int argc) const { - QV4::Lookup *l = compilationUnit->runtimeLookups + index; + QV4::Lookup *lookup = compilationUnit->runtimeLookups + index; QV4::Scope scope(engine->handle()); QV4::ScopedValue thisObject(scope, QV4::QObjectWrapper::wrap(scope.engine, object)); - QV4::ScopedFunctionObject function(scope, l->getter(l, engine->handle(), thisObject)); + QV4::ScopedFunctionObject function(scope, lookup->getter(lookup, engine->handle(), thisObject)); if (!function) { scope.engine->throwTypeError( QStringLiteral("Property '%1' of object [object Object] is not a function") - .arg(compilationUnit->runtimeStrings[l->nameIndex]->toQString())); + .arg(compilationUnit->runtimeStrings[lookup->nameIndex]->toQString())); return false; } @@ -75,15 +75,15 @@ void QQmlPrivate::AOTCompiledContext::initCallObjectPropertyLookup(uint index) c bool QQmlPrivate::AOTCompiledContext::callQmlContextPropertyLookup( uint index, void **args, const QMetaType *types, int argc) const { - QV4::Lookup *l = compilationUnit->runtimeLookups + index; + QV4::Lookup *lookup = compilationUnit->runtimeLookups + index; QV4::Scope scope(engine->handle()); QV4::ScopedValue thisObject(scope); QV4::ScopedFunctionObject function( - scope, l->qmlContextPropertyGetter(l, scope.engine, thisObject)); + scope, lookup->qmlContextPropertyGetter(lookup, scope.engine, thisObject)); if (!function) { scope.engine->throwTypeError( QStringLiteral("Property '%1' of object [null] is not a function").arg( - compilationUnit->runtimeStrings[l->nameIndex]->toQString())); + compilationUnit->runtimeStrings[lookup->nameIndex]->toQString())); return false; } |