diff options
Diffstat (limited to 'src/qml/jsruntime/qv4sparsearray.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4sparsearray.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/qml/jsruntime/qv4sparsearray.cpp b/src/qml/jsruntime/qv4sparsearray.cpp index 97dd695067..7169f5c20e 100644 --- a/src/qml/jsruntime/qv4sparsearray.cpp +++ b/src/qml/jsruntime/qv4sparsearray.cpp @@ -53,13 +53,13 @@ using namespace QV4; -bool ArrayElementLessThan::operator()(const Property &p1, const Property &p2) const +bool ArrayElementLessThan::operator()(const SafeValue &v1, const SafeValue &v2) const { Scope scope(m_context); - if (p1.value.isUndefined() || p1.value.isEmpty()) + if (v1.isUndefined() || v1.isEmpty()) return false; - if (p2.value.isUndefined() || p2.value.isEmpty()) + if (v2.isUndefined() || v2.isEmpty()) return true; ScopedObject o(scope, m_comparefn); if (o) { @@ -67,14 +67,14 @@ bool ArrayElementLessThan::operator()(const Property &p1, const Property &p2) co ScopedValue result(scope); ScopedCallData callData(scope, 2); callData->thisObject = Primitive::undefinedValue(); - callData->args[0] = p1.value; - callData->args[1] = p2.value; + callData->args[0] = v1; + callData->args[1] = v2; result = __qmljs_call_value(m_context, m_comparefn, callData); return result->toNumber() < 0; } - ScopedString p1s(scope, p1.value.toString(m_context)); - ScopedString p2s(scope, p2.value.toString(m_context)); + ScopedString p1s(scope, v1.toString(m_context)); + ScopedString p2s(scope, v2.toString(m_context)); return p1s->toQString() < p2s->toQString(); } |