diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-05-16 09:27:14 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-05-23 13:53:22 +0200 |
| commit | ba64b7a70eedf6a2023ef86eda542cad6f4b21be (patch) | |
| tree | 2a7663132b2717a2c361c3b0c03b09fe85fcc884 /src/qml/jsruntime/qv4function.cpp | |
| parent | 1559e6707e276b521b52876c539fcfe5a1e85a4e (diff) | |
Undeprecate AOTCompiledFunction
We're going to call the JavaScript-typed functions a different name.
Change-Id: If92c3fb1b16b1b0bd7d009e7dd712ae6405e1232
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4function.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4function.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index c2f23279ba..5edccafa3c 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -61,14 +61,14 @@ ReturnedValue Function::call( switch (kind) { case AotCompiled: return QV4::convertAndCall( - context->engine(), typedFunction, thisObject, argv, argc, + context->engine(), aotCompiledFunction, thisObject, argv, argc, [this, context]( QObject *thisObject, void **a, const QMetaType *types, int argc) { call(thisObject, a, types, argc, context); }); case JsTyped: return QV4::coerceAndCall( - context->engine(), typedFunction, thisObject, argv, argc, + context->engine(), aotCompiledFunction, thisObject, argv, argc, [this, context](const Value *thisObject, const Value *argv, int argc) { return doCall(this, thisObject, argv, argc, context); }); @@ -81,7 +81,7 @@ ReturnedValue Function::call( Function *Function::create(ExecutionEngine *engine, ExecutableCompilationUnit *unit, const CompiledData::Function *function, - const QQmlPrivate::TypedFunction *aotFunction) + const QQmlPrivate::AOTCompiledFunction *aotFunction) { return new Function(engine, unit, function, aotFunction); } @@ -93,13 +93,13 @@ void Function::destroy() Function::Function(ExecutionEngine *engine, ExecutableCompilationUnit *unit, const CompiledData::Function *function, - const QQmlPrivate::TypedFunction *aotFunction) + const QQmlPrivate::AOTCompiledFunction *aotFunction) : FunctionData(unit) , compiledFunction(function) , codeData(function->code()) , jittedCode(nullptr) , codeRef(nullptr) - , typedFunction(aotFunction) + , aotCompiledFunction(aotFunction) , kind(aotFunction ? AotCompiled : JsUntyped) { Scope scope(engine); @@ -135,7 +135,7 @@ Function::Function(ExecutionEngine *engine, ExecutableCompilationUnit *unit, return; } - QQmlPrivate::TypedFunction *synthesized = new QQmlPrivate::TypedFunction; + QQmlPrivate::AOTCompiledFunction *synthesized = new QQmlPrivate::AOTCompiledFunction; QQmlEnginePrivate *enginePrivate = QQmlEnginePrivate::get(engine->qmlEngine()); auto findMetaType = [&](const CompiledData::ParameterType ¶m) { @@ -177,7 +177,7 @@ Function::Function(ExecutionEngine *engine, ExecutableCompilationUnit *unit, synthesized->argumentTypes.append(findMetaType(formalsIndices[i].type)); synthesized->returnType = findMetaType(compiledFunction->returnType); - typedFunction = synthesized; + aotCompiledFunction = synthesized; kind = JsTyped; } @@ -188,7 +188,7 @@ Function::~Function() delete codeRef; } if (kind == JsTyped) - delete typedFunction; + delete aotCompiledFunction; } void Function::updateInternalClass(ExecutionEngine *engine, const QList<QByteArray> ¶meters) |