diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-06 17:40:48 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-10 17:15:00 +0100 |
| commit | 4b850f3d1e79bb66a53f097ae7b7cc26db8cc2f8 (patch) | |
| tree | a46d33ec16596e179aac7ece8bb929f68b03faab /src/qml/jsruntime/qv4typedarray.cpp | |
| parent | 3c1041cbfd70a03322ca0278e0db8ac0651c0792 (diff) | |
Move Data for typedarrays into Heap namespace
Change-Id: I1737423c22e0c68c9eaa14f6d4f5b1e48aea4a77
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4typedarray.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4typedarray.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp index d4b51c7214..f1d296a9de 100644 --- a/src/qml/jsruntime/qv4typedarray.cpp +++ b/src/qml/jsruntime/qv4typedarray.cpp @@ -39,7 +39,7 @@ DEFINE_OBJECT_VTABLE(TypedArrayCtor); DEFINE_OBJECT_VTABLE(TypedArrayPrototype); DEFINE_OBJECT_VTABLE(TypedArray); -Q_STATIC_ASSERT((int)ExecutionEngine::NTypedArrayTypes == (int)TypedArray::NTypes); +Q_STATIC_ASSERT((int)ExecutionEngine::NTypedArrayTypes == (int)Heap::TypedArray::NTypes); ReturnedValue Int8ArrayRead(const char *data, int index) { @@ -180,7 +180,7 @@ void Float64ArrayWrite(ExecutionEngine *e, char *data, int index, ValueRef value *(double *)(data + index) = v; } -const TypedArrayOperations operations[TypedArray::NTypes] = { +const TypedArrayOperations operations[Heap::TypedArray::NTypes] = { { 1, "Int8Array", Int8ArrayRead, Int8ArrayWrite }, { 1, "Uint8Array", UInt8ArrayRead, UInt8ArrayWrite }, { 1, "Uint8ClampedArray", UInt8ArrayRead, UInt8ClampedArrayWrite }, @@ -193,11 +193,11 @@ const TypedArrayOperations operations[TypedArray::NTypes] = { }; -TypedArrayCtor::Data::Data(ExecutionContext *scope, TypedArray::Type t) +Heap::TypedArrayCtor::TypedArrayCtor(QV4::ExecutionContext *scope, TypedArray::Type t) : Heap::FunctionObject(scope, QLatin1String(operations[t].name)) , type(t) { - setVTable(staticVTable()); + setVTable(QV4::TypedArrayCtor::staticVTable()); } ReturnedValue TypedArrayCtor::construct(Managed *m, CallData *callData) @@ -333,7 +333,7 @@ ReturnedValue TypedArrayCtor::call(Managed *that, CallData *callData) return construct(that, callData); } -TypedArray::Data::Data(ExecutionEngine *e, Type t) +Heap::TypedArray::TypedArray(ExecutionEngine *e, Type t) : Heap::Object(e->typedArrayClasses[t]), type(operations + t) { |