diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-24 22:55:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 11:13:48 +0100 |
| commit | a78a48c5328ea746dfd161599894a4a5b11041bd (patch) | |
| tree | 1e38f4334a8e3efdb5761d862baaa465141bf543 /src/qml/jsruntime/qv4arraydata_p.h | |
| parent | d96478044ae0dfbcc35113e3941aa79604ba83a0 (diff) | |
Cleanups
Remove SafeValue, it was used to port over to an exact GC. Since
we now have that, we can now safely merge it with QV4::Value
again. Also rename SafeString to StringValue for better naming
consistency.
Change-Id: I8553d1bec5134c53996f6b0d758738a0ec8a2e4d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4arraydata_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4arraydata_p.h b/src/qml/jsruntime/qv4arraydata_p.h index 48b17a239f..f127c75fb0 100644 --- a/src/qml/jsruntime/qv4arraydata_p.h +++ b/src/qml/jsruntime/qv4arraydata_p.h @@ -67,11 +67,11 @@ struct ArrayVTable ArrayData *(*reallocate)(Object *o, uint n, bool enforceAttributes); ReturnedValue (*get)(const ArrayData *d, uint index); bool (*put)(Object *o, uint index, ValueRef value); - bool (*putArray)(Object *o, uint index, SafeValue *values, uint n); + bool (*putArray)(Object *o, uint index, Value *values, uint n); bool (*del)(Object *o, uint index); void (*setAttribute)(Object *o, uint index, PropertyAttributes attrs); PropertyAttributes (*attribute)(const ArrayData *d, uint index); - void (*push_front)(Object *o, SafeValue *values, uint n); + void (*push_front)(Object *o, Value *values, uint n); ReturnedValue (*pop_front)(Object *o); uint (*truncate)(Object *o, uint newLen); uint (*length)(const ArrayData *d); @@ -95,7 +95,7 @@ struct Q_QML_EXPORT ArrayData : public Managed uint alloc; Type type; PropertyAttributes *attrs; - SafeValue *data; + Value *data; const ArrayVTable *vtable() const { return reinterpret_cast<const ArrayVTable *>(internalClass->vtable); } bool isSparse() const { return this && type == Sparse; } @@ -154,11 +154,11 @@ struct Q_QML_EXPORT SimpleArrayData : public ArrayData static ReturnedValue get(const ArrayData *d, uint index); static bool put(Object *o, uint index, ValueRef value); - static bool putArray(Object *o, uint index, SafeValue *values, uint n); + static bool putArray(Object *o, uint index, Value *values, uint n); static bool del(Object *o, uint index); static void setAttribute(Object *o, uint index, PropertyAttributes attrs); static PropertyAttributes attribute(const ArrayData *d, uint index); - static void push_front(Object *o, SafeValue *values, uint n); + static void push_front(Object *o, Value *values, uint n); static ReturnedValue pop_front(Object *o); static uint truncate(Object *o, uint newLen); static uint length(const ArrayData *d); @@ -184,11 +184,11 @@ struct Q_QML_EXPORT SparseArrayData : public ArrayData static ArrayData *reallocate(Object *o, uint n, bool enforceAttributes); static ReturnedValue get(const ArrayData *d, uint index); static bool put(Object *o, uint index, ValueRef value); - static bool putArray(Object *o, uint index, SafeValue *values, uint n); + static bool putArray(Object *o, uint index, Value *values, uint n); static bool del(Object *o, uint index); static void setAttribute(Object *o, uint index, PropertyAttributes attrs); static PropertyAttributes attribute(const ArrayData *d, uint index); - static void push_front(Object *o, SafeValue *values, uint n); + static void push_front(Object *o, Value *values, uint n); static ReturnedValue pop_front(Object *o); static uint truncate(Object *o, uint newLen); static uint length(const ArrayData *d); |