From 75c649276a9bbcb2e593d6c6f78d77417dd05891 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 8 Aug 2012 10:23:04 +0200
Subject: Remove the use of the QWidgetStar metatypeid.

It is to be removed, and is obsoleted by QMetaType::PointerToQObject.
By using QMetaType::PointerToQObject, we also gain the feature
that all pointers to types derived from QObject return true for
QScriptValue::isQObject().

Change-Id: I18392b5b6cde3a45d060c37612d987a5cf8e8f18
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/script/api/qscriptengine.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/script/api/qscriptengine.cpp')

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 9965b3a..d96d11c 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -3130,7 +3130,6 @@ JSC::JSValue QScriptEnginePrivate::create(JSC::ExecState *exec, int type, const
 #endif
 #ifndef QT_NO_QOBJECT
         case QMetaType::QObjectStar:
-        case QMetaType::QWidgetStar:
             result = eng->newQObject(*reinterpret_cast<QObject* const *>(ptr));
             break;
 #endif
@@ -3138,6 +3137,11 @@ JSC::JSValue QScriptEnginePrivate::create(JSC::ExecState *exec, int type, const
             result = eng->newVariant(*reinterpret_cast<const QVariant*>(ptr));
             break;
         default:
+            if (QMetaType::typeFlags(type) & QMetaType::PointerToQObject) {
+                result = eng->newQObject(*reinterpret_cast<QObject* const *>(ptr));
+                break;
+            }
+
             if (type == qMetaTypeId<QScriptValue>()) {
                 result = eng->scriptValueToJSCValue(*reinterpret_cast<const QScriptValue*>(ptr));
                 if (!result)
@@ -3262,14 +3266,6 @@ bool QScriptEnginePrivate::convertValue(JSC::ExecState *exec, JSC::JSValue value
             *reinterpret_cast<QObject* *>(ptr) = toQObject(exec, value);
             return true;
         } break;
-    case QMetaType::QWidgetStar:
-        if (isQObject(value) || value.isNull()) {
-            QObject *qo = toQObject(exec, value);
-            if (!qo || qo->isWidgetType()) {
-                *reinterpret_cast<QWidget* *>(ptr) = reinterpret_cast<QWidget*>(qo);
-                return true;
-            }
-        } break;
 #endif
     case QMetaType::QStringList:
         if (isArray(value)) {
-- 
cgit v1.2.1