diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-18 14:30:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
commit | 1aa618970a9bed46123d0648500e957688d725ec (patch) | |
tree | 1235d0de9aacc2e01b41f06b3bb50ddab7c3d39b /src/qml/jsruntime/qv4string.cpp | |
parent | 3c325823a778e1a6542eb746e047d5d7bfb43566 (diff) |
Use StringRef for most methods in Object
Change-Id: I8e2dad0e9e34c5a549952bc0765cd57f6aa8aadf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4string.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4string.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp index bd1f14b680..806c37b283 100644 --- a/src/qml/jsruntime/qv4string.cpp +++ b/src/qml/jsruntime/qv4string.cpp @@ -131,6 +131,9 @@ void String::destroy(Managed *that) ReturnedValue String::get(Managed *m, String *name, bool *hasProperty) { + Scope scope(m->engine()); + ScopedString n(scope, name); + String *that = static_cast<String *>(m); ExecutionEngine *v4 = m->engine(); if (name == v4->id_length) { @@ -139,7 +142,7 @@ ReturnedValue String::get(Managed *m, String *name, bool *hasProperty) return Value::fromInt32(that->_text.length()).asReturnedValue(); } PropertyAttributes attrs; - Property *pd = v4->stringClass->prototype->__getPropertyDescriptor__(name, &attrs); + Property *pd = v4->stringClass->prototype->__getPropertyDescriptor__(n, &attrs); if (!pd || attrs.isGeneric()) { if (hasProperty) *hasProperty = false; @@ -256,7 +259,7 @@ uint String::toUInt(bool *ok) const return UINT_MAX; } -void String::makeIdentifierImpl() +void String::makeIdentifierImpl() const { engine()->identifierTable->identifier(this); } |