From 45dbc9f1bb72f9661b43d632d82d634ef52f662e Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 7 Oct 2013 12:23:38 +0200 Subject: Remove more direct usages of Managed pointers Change-Id: I32f61b7919797eef51a8705695787175b76244c4 Reviewed-by: Simon Hausmann --- src/qml/qml/v8/qv8engine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qml/qml/v8') diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 7cf769a219..149896b545 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -150,7 +150,7 @@ QVariant QV8Engine::toVariant(const QV4::ValueRef value, int typeHint) } else if (QV4::QmlListWrapper *l = object->as()) { return l->toVariant(); } else if (object->isListType()) - return QV4::SequencePrototype::toVariant(object.getPointer()); + return QV4::SequencePrototype::toVariant(object); } if (value->asArrayObject()) { @@ -858,9 +858,9 @@ bool QV8Engine::metaTypeFromJS(const QV4::ValueRef value, int type, void *data) // We have T t, T* is requested, so return &t. *reinterpret_cast(data) = var.data(); return true; - } else if (QV4::Object *o = value->asObject()) { + } else if (value->isObject()) { // Look in the prototype chain. - QV4::Object *proto = o->prototype(); + QV4::ScopedObject proto(scope, value->objectValue()->prototype()); while (proto) { bool canCast = false; if (QV4::VariantObject *vo = proto->as()) { -- cgit v1.2.3