diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-06 17:17:34 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-09 08:39:33 +0100 |
| commit | 3c1041cbfd70a03322ca0278e0db8ac0651c0792 (patch) | |
| tree | dadc0d76ccd0c0617856b7fbdc2c2c82753cb36a /src/qml/jsruntime/qv4stringobject.cpp | |
| parent | 34fa0f8fec639444bd6ba2091b6f6623128471ce (diff) | |
Move more Data objects into the Heap namespace
Change-Id: I87866f8dcbaac1087da7bbd2902aa5b062afca53
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4stringobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 0c2261dca0..95fb6e394d 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -69,10 +69,10 @@ using namespace QV4; DEFINE_OBJECT_VTABLE(StringObject); -StringObject::Data::Data(InternalClass *ic) +Heap::StringObject::StringObject(InternalClass *ic) : Heap::Object(ic) { - Q_ASSERT(internalClass->vtable == staticVTable()); + Q_ASSERT(internalClass->vtable == QV4::StringObject::staticVTable()); value = ic->engine->newString(QStringLiteral(""))->asReturnedValue(); tmpProperty.value = Primitive::undefinedValue(); @@ -81,13 +81,13 @@ StringObject::Data::Data(InternalClass *ic) s->defineReadonlyProperty(ic->engine->id_length, Primitive::fromInt32(0)); } -StringObject::Data::Data(ExecutionEngine *engine, const ValueRef val) +Heap::StringObject::StringObject(ExecutionEngine *engine, const ValueRef val) : Heap::Object(engine->stringObjectClass) { value = val; Q_ASSERT(value.isString()); tmpProperty.value = Primitive::undefinedValue(); - setVTable(staticVTable()); + setVTable(QV4::StringObject::staticVTable()); Scope scope(engine); ScopedObject s(scope, this); @@ -159,10 +159,10 @@ void StringObject::markObjects(Heap::Base *that, ExecutionEngine *e) DEFINE_OBJECT_VTABLE(StringCtor); -StringCtor::Data::Data(ExecutionContext *scope) +Heap::StringCtor::StringCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("String")) { - setVTable(staticVTable()); + setVTable(QV4::StringCtor::staticVTable()); } ReturnedValue StringCtor::construct(Managed *m, CallData *callData) |