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/qml/v8/qqmlbuiltinfunctions.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/qml/v8/qqmlbuiltinfunctions.cpp')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 9240834cf4..121b0fbb78 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -957,12 +957,13 @@ ReturnedValue QtObject::method_createQmlObject(SimpleCallContext *ctx) qmlerror = v4->newObject(); qmlerror->put((s = v4->newString("lineNumber")), (v = QV4::Primitive::fromInt32(error.line()))); qmlerror->put((s = v4->newString("columnNumber")), (v = QV4::Primitive::fromInt32(error.column()))); - qmlerror->put((s = v4->newString("fileName")), (v = Value::fromString(v4->newString(error.url().toString())))); - qmlerror->put((s = v4->newString("message")), (v = Value::fromString(v4->newString(error.description())))); + qmlerror->put((s = v4->newString("fileName")), (v = v4->newString(error.url().toString()))); + qmlerror->put((s = v4->newString("message")), (v = v4->newString(error.description()))); qmlerrors->putIndexed(ii, qmlerror); } - Scoped<Object> errorObject(scope, v4->newErrorObject(Value::fromString(v4->newString(errorstr)))); + v = v4->newString(errorstr); + Scoped<Object> errorObject(scope, v4->newErrorObject(v)); errorObject->put((s = v4->newString("qmlErrors")), qmlerrors); return errorObject.asReturnedValue(); } @@ -1254,7 +1255,7 @@ ReturnedValue QtObject::method_binding(SimpleCallContext *ctx) if (!f) V4THROW_TYPE("binding(): argument (binding expression) must be a function"); - return QV4::Value::fromObject(new (ctx->engine->memoryManager) BindingFunction(f)).asReturnedValue(); + return (new (ctx->engine->memoryManager) BindingFunction(f))->asReturnedValue(); } |