aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4context.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-09-25 12:24:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-28 13:33:24 +0200
commitcf2a253f2f60c9f0c61682527d80143e72b355d4 (patch)
treed60e8be50437e6f15513e25155817b902a2062c7 /src/qml/jsruntime/qv4context.cpp
parent7872b380063d0497ba62fecfdc92148f1ea947af (diff)
Move Value::fromBool, ... to a new Primitive class
This will simplify finding the remaining direct usages of QV4::Value that need fixing. Change-Id: I223099727436d5748027c84c53d9dfc4028e38ed Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
-rw-r--r--src/qml/jsruntime/qv4context.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp
index d47a68423c..e7ac8967a4 100644
--- a/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@ -83,13 +83,13 @@ CallContext *ExecutionContext::newCallContext(void *stackSpace, Value *locals, F
c->locals = locals;
if (function->varCount)
- std::fill(c->locals, c->locals + function->varCount, Value::undefinedValue());
+ std::fill(c->locals, c->locals + function->varCount, Primitive::undefinedValue());
if (callData->argc < function->formalParameterCount) {
#ifndef QT_NO_DEBUG
Q_ASSERT(function->formalParameterCount <= QV4::Global::ReservedArgumentCount);
#endif
- std::fill(c->callData->args + callData->argc, c->callData->args + function->formalParameterCount, Value::undefinedValue());
+ std::fill(c->callData->args + callData->argc, c->callData->args + function->formalParameterCount, Primitive::undefinedValue());
c->callData->argc = function->formalParameterCount;
}
@@ -124,12 +124,12 @@ CallContext *ExecutionContext::newCallContext(FunctionObject *function, CallData
c->locals = (Value *)(c + 1);
if (function->varCount)
- std::fill(c->locals, c->locals + function->varCount, Value::undefinedValue());
+ std::fill(c->locals, c->locals + function->varCount, Primitive::undefinedValue());
c->callData = reinterpret_cast<CallData *>(c->locals + function->varCount);
::memcpy(c->callData, callData, sizeof(CallData) + (callData->argc - 1) * sizeof(Value));
if (callData->argc < function->formalParameterCount)
- std::fill(c->callData->args + c->callData->argc, c->callData->args + function->formalParameterCount, Value::undefinedValue());
+ std::fill(c->callData->args + c->callData->argc, c->callData->args + function->formalParameterCount, Primitive::undefinedValue());
c->callData->argc = qMax((uint)callData->argc, function->formalParameterCount);
return c;
@@ -183,7 +183,7 @@ void ExecutionContext::createMutableBinding(const StringRef name, bool deletable
if (activation->__hasProperty__(name))
return;
- Property desc = Property::fromValue(Value::undefinedValue());
+ Property desc = Property::fromValue(Primitive::undefinedValue());
PropertyAttributes attrs(Attr_Data);
attrs.setConfigurable(deletable);
activation->__defineOwnProperty__(this, name, desc, attrs);
@@ -252,7 +252,7 @@ void CallContext::initQmlContext(ExecutionContext *parentContext, Object *qml, F
this->callData = reinterpret_cast<CallData *>(this + 1);
this->callData->tag = QV4::Value::Integer_Type;
this->callData->argc = 0;
- this->callData->thisObject = Value::undefinedValue();
+ this->callData->thisObject = Primitive::undefinedValue();
strictMode = true;
marked = false;
@@ -270,7 +270,7 @@ void CallContext::initQmlContext(ExecutionContext *parentContext, Object *qml, F
locals = (Value *)(this + 1);
if (function->varCount)
- std::fill(locals, locals + function->varCount, Value::undefinedValue());
+ std::fill(locals, locals + function->varCount, Primitive::undefinedValue());
}
@@ -522,7 +522,7 @@ ReturnedValue ExecutionContext::getPropertyNoThrow(const StringRef name)
return v.asReturnedValue();
}
}
- return Value::undefinedValue().asReturnedValue();
+ return Primitive::undefinedValue().asReturnedValue();
}
ReturnedValue ExecutionContext::getPropertyAndBase(const StringRef name, Object **base)