From 2e35d1c47b3a4ddadfda16e3337d4d8ef91b4ce3 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Wed, 4 Apr 2012 12:56:07 +1000 Subject: [PATCH] Use wasDeleted function to check for deletion Ensure that the check for deletion logic is consolidated in a single location. Task-number: QTBUG-25159 Change-Id: I27e856159afc745d68ec23cf3c872d740db8bcf3 Reviewed-by: Chris Adams --- src/qml/qml/v8/qv8qobjectwrapper.cpp | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/src/qml/qml/v8/qv8qobjectwrapper.cpp b/src/qml/qml/v8/qv8qobjectwrapper.cpp index b2a1d25..708f5f4 100644 --- a/src/qml/qml/v8/qv8qobjectwrapper.cpp +++ b/src/qml/qml/v8/qv8qobjectwrapper.cpp @@ -1048,20 +1048,13 @@ released the handle. */ v8::Handle QV8QObjectWrapper::newQObject(QObject *object) { - if (!object) + if (QQmlData::wasDeleted(object)) return v8::Null(); - if (QObjectPrivate::get(object)->wasDeleted) - return v8::Null(); - QQmlData *ddata = QQmlData::get(object, true); - if (!ddata) return v8::Undefined(); - if (ddata->isQueuedForDeletion) - return v8::Null(); - if (ddata->v8objectid == m_id && !ddata->v8object.IsEmpty()) { // We own the v8object return v8::Local::New(ddata->v8object); -- 1.7.2.5