diff options
| author | Lars Knoll <[email protected]> | 2014-01-24 22:55:39 +0100 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2014-01-31 11:13:48 +0100 |
| commit | a78a48c5328ea746dfd161599894a4a5b11041bd (patch) | |
| tree | 1e38f4334a8e3efdb5761d862baaa465141bf543 /src/qml/jsruntime/qv4arrayobject.cpp | |
| 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 <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4arrayobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4arrayobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 9a2407fe2c..652c0f00ac 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -629,8 +629,8 @@ ReturnedValue ArrayPrototype::method_indexOf(CallContext *ctx) Q_ASSERT(instance->arrayType() == ArrayData::Simple || instance->arrayType() == ArrayData::Complex); if (len > instance->arrayData->length()) len = instance->arrayData->length(); - SafeValue *val = instance->arrayData->data; - SafeValue *end = val + len; + Value *val = instance->arrayData->data; + Value *end = val + len; val += fromIndex; while (val < end) { if (!val->isEmpty()) { |