diff options
| author | Lars Knoll <[email protected]> | 2013-09-25 15:24:50 +0200 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2013-09-28 13:33:39 +0200 |
| commit | 150731fc68bcf823bec40729285813d902990cb7 (patch) | |
| tree | 7af619f4bc8fac030bc162ce6ead2e2a7be86783 /src/qml/jsruntime/qv4variantobject.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 <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4variantobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4variantobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4variantobject.cpp b/src/qml/jsruntime/qv4variantobject.cpp index 720e4fa3a6..2fe9c717bd 100644 --- a/src/qml/jsruntime/qv4variantobject.cpp +++ b/src/qml/jsruntime/qv4variantobject.cpp @@ -183,7 +183,7 @@ QV4::ReturnedValue VariantPrototype::method_toString(SimpleCallContext *ctx) QString result = o->data.toString(); if (result.isEmpty() && !o->data.canConvert(QVariant::String)) result = QString::fromLatin1("QVariant(%0)").arg(QString::fromLatin1(o->data.typeName())); - return Value::fromString(ctx->engine->newString(result)).asReturnedValue(); + return Encode(ctx->engine->newString(result)); } QV4::ReturnedValue VariantPrototype::method_valueOf(SimpleCallContext *ctx) @@ -196,7 +196,7 @@ QV4::ReturnedValue VariantPrototype::method_valueOf(SimpleCallContext *ctx) case QVariant::Invalid: return Encode::undefined(); case QVariant::String: - return Value::fromString(ctx->engine->newString(v.toString())).asReturnedValue(); + return Encode(ctx->engine->newString(v.toString())); case QVariant::Int: return Encode(v.toInt()); case QVariant::Double: |