diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-16 22:02:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
| commit | e441692b0b8f8fffdfdfa8a21c570adcd5cbae7a (patch) | |
| tree | 9b764401d87682012328c46dc947721f47b428b2 /src/qml/qml/v8/qv8engine.cpp | |
| parent | a0f8be4021caa9bb5055923f0eea3bee0e345235 (diff) | |
Further work towards an exact GC
Add some more convenience in the helper classes
in qscopedvalue_p.h
Make accesses to CallData safer, and change
ExecutionEngine::newObject() to return a safe
pointer.
Change-Id: I980909754ce9681cf6faa1355bab3a1e5d6dd186
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8/qv8engine.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8engine.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 08bbd4c960..b62d8c173d 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -212,10 +212,11 @@ static QV4::ReturnedValue arrayFromVariantList(QV8Engine *engine, const QVariant static QV4::ReturnedValue objectFromVariantMap(QV8Engine *engine, const QVariantMap &map) { QV4::ExecutionEngine *e = QV8Engine::getV4(engine); - QV4::Object *o = e->newObject(); + QV4::Scope scope(e); + QV4::Scoped<QV4::Object> o(scope, e->newObject()); for (QVariantMap::ConstIterator iter = map.begin(); iter != map.end(); ++iter) o->put(e->newString(iter.key()), QV4::Value::fromReturnedValue(engine->fromVariant(iter.value()))); - return QV4::Value::fromObject(o).asReturnedValue(); + return o.asReturnedValue(); } Q_CORE_EXPORT QString qt_regexp_toCanonical(const QString &, QRegExp::PatternSyntax); @@ -566,13 +567,14 @@ QVariantList QV8Engine::variantListFromJS(QV4::ArrayObject *a, // the QVariantMap converted to JS, recursively. QV4::ReturnedValue QV8Engine::variantMapToJS(const QVariantMap &vmap) { - QV4::Object *o = m_v4Engine->newObject(); + QV4::Scope scope(m_v4Engine); + QV4::Scoped<QV4::Object> o(scope, m_v4Engine->newObject()); QVariantMap::const_iterator it; for (it = vmap.constBegin(); it != vmap.constEnd(); ++it) { QV4::Property *p = o->insertMember(m_v4Engine->newIdentifier(it.key()), QV4::Attr_Data); p->value = QV4::Value::fromReturnedValue(variantToJS(it.value())); } - return QV4::Value::fromObject(o).asReturnedValue(); + return o.asReturnedValue(); } // Converts a JS Object to a QVariantMap. |