diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-09-11 11:07:32 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-09-17 07:47:09 +0000 |
| commit | 1dac47c1418b44cf4a56b42bfca2b277795fd213 (patch) | |
| tree | 26727943c30628340662a66d7cbe9f52d75c5b58 /src/qml/jsruntime/qv4function.cpp | |
| parent | d89d5cffe79bd060a1b04a2c47a3d728bffbe195 (diff) | |
| download | qtdeclarative-1dac47c1418b44cf4a56b42bfca2b277795fd213.tar.gz | |
Cleanups in Value/Primitive
Get rid of Primitive and move the corresponding methods
directly into Value. Mark many methods in Value as
constexpr and turn Value into a POD type again.
Keep Primitive as a pure alias to Value for source
compatibility of other modules that might be using it.
Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4function.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4function.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index 5e3860a660..941c37de5b 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -58,9 +58,9 @@ ReturnedValue Function::call(const Value *thisObject, const Value *argv, int arg ExecutionEngine *engine = context->engine(); CppStackFrame frame; frame.init(engine, this, argv, argc); - frame.setupJSFrame(engine->jsStackTop, Primitive::undefinedValue(), context->d(), - thisObject ? *thisObject : Primitive::undefinedValue(), - Primitive::undefinedValue()); + frame.setupJSFrame(engine->jsStackTop, Value::undefinedValue(), context->d(), + thisObject ? *thisObject : Value::undefinedValue(), + Value::undefinedValue()); frame.push(); engine->jsStackTop += frame.requiredJSStackFrameSize(); |