diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-04-08 10:54:57 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-04-14 22:22:07 +0200 |
| commit | bd4607856cd074e792d1f33286c25696b34750fc (patch) | |
| tree | 3b711f232c128e54e67267d6eb2e88494677001c /src/qmlcompiler/qqmljscompiler.cpp | |
| parent | 07326cbb19bc28b5ea83ff75f482375ed98fbd82 (diff) | |
Rename the AOT context to aotContext
We want the "context" name for other things.
Change-Id: I9dcc88a9a7c7f5e8c495ee29f57e2c9d15c4990f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler/qqmljscompiler.cpp')
| -rw-r--r-- | src/qmlcompiler/qqmljscompiler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp index d553d223bf..c888ddcf87 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -440,26 +440,26 @@ bool qCompileJSFile(const QString &inputFileName, const QString &inputFileUrl, Q static const char *wrapCallCode = R"( template <typename Binding> -void wrapCall(const QQmlPrivate::AOTCompiledContext *context, void *dataPtr, void **argumentsPtr, Binding &&binding) +void wrapCall(const QQmlPrivate::AOTCompiledContext *aotContext, void *dataPtr, void **argumentsPtr, Binding &&binding) { using return_type = std::invoke_result_t<Binding, const QQmlPrivate::AOTCompiledContext *, void **>; if constexpr (std::is_same_v<return_type, void>) { Q_UNUSED(dataPtr); - binding(context, argumentsPtr); + binding(aotContext, argumentsPtr); } else { if (dataPtr) { - new (dataPtr) return_type(binding(context, argumentsPtr)); + new (dataPtr) return_type(binding(aotContext, argumentsPtr)); } else { - binding(context, argumentsPtr); + binding(aotContext, argumentsPtr); } } } )"; static const char *funcHeaderCode = R"( - [](const QQmlPrivate::AOTCompiledContext *context, void *dataPtr, void **argumentsPtr) { - wrapCall(context, dataPtr, argumentsPtr, [](const QQmlPrivate::AOTCompiledContext *context, void **argumentsPtr) { -Q_UNUSED(context); + [](const QQmlPrivate::AOTCompiledContext *aotContext, void *dataPtr, void **argumentsPtr) { + wrapCall(aotContext, dataPtr, argumentsPtr, [](const QQmlPrivate::AOTCompiledContext *aotContext, void **argumentsPtr) { +Q_UNUSED(aotContext); Q_UNUSED(argumentsPtr); )"; |