diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-25 15:24:50 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-28 13:33:39 +0200 |
| commit | 150731fc68bcf823bec40729285813d902990cb7 (patch) | |
| tree | 7af619f4bc8fac030bc162ce6ead2e2a7be86783 /src/qml/jsruntime/qv4objectiterator.cpp | |
| parent | c79cc3f30d395c94d4f14b978903d7db4ad871dc (diff) | |
Remove more direct QV4::Value usage
Remove Value::fromString(String *), and make
Encode safe against encoding raw Managed * pointers.
Change-Id: Ibca4668e1cbeaf85c78169d14386281659d33ef6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectiterator.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectiterator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4objectiterator.cpp b/src/qml/jsruntime/qv4objectiterator.cpp index 1c12704545..fc85a3f04c 100644 --- a/src/qml/jsruntime/qv4objectiterator.cpp +++ b/src/qml/jsruntime/qv4objectiterator.cpp @@ -107,7 +107,7 @@ ReturnedValue ObjectIterator::nextPropertyName(Value *value) *value = Value::fromReturnedValue(object->getValue(p, attrs)); if (name) - return Value::fromString(name).asReturnedValue(); + return name->asReturnedValue(); assert(index < UINT_MAX); return Encode(index); } @@ -125,7 +125,7 @@ ReturnedValue ObjectIterator::nextPropertyNameAsString(Value *value) *value = Value::fromReturnedValue(object->getValue(p, attrs)); if (name) - return Value::fromString(name).asReturnedValue(); + return name->asReturnedValue(); assert(index < UINT_MAX); - return Value::fromString(object->engine()->newString(QString::number(index))).asReturnedValue(); + return Encode(object->engine()->newString(QString::number(index))); } |