diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-06-26 11:16:59 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-06-26 11:16:59 (GMT) |
| commit | 6d5c17b4e0ec8288c720bc2b93a97db4db7f215e (patch) | |
| tree | 986f1e5f505cdf1567b39f643adcefe4fb1946f3 /src/script/api | |
| parent | 0f71f6dd993194dafd0385d4697ced38839e2b37 (diff) | |
| download | Qt-6d5c17b4e0ec8288c720bc2b93a97db4db7f215e.zip Qt-6d5c17b4e0ec8288c720bc2b93a97db4db7f215e.tar.gz Qt-6d5c17b4e0ec8288c720bc2b93a97db4db7f215e.tar.bz2 | |
implement QScriptValue::isQMetaObject() and QScriptValue::toQMetaObject()
Diffstat (limited to 'src/script/api')
| -rw-r--r-- | src/script/api/qscriptvalue.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp index 12461d5..caa8730 100644 --- a/src/script/api/qscriptvalue.cpp +++ b/src/script/api/qscriptvalue.cpp @@ -713,7 +713,7 @@ bool QScriptValue::isError() const Q_D(const QScriptValue); if (!d || !d->isJSC() || !d->jscValue.isObject()) return false; - return JSC::asObject(d->jscValue)->isObject(&JSC::ErrorInstance::info); + return d->jscValue.isObject(&JSC::ErrorInstance::info); } /*! @@ -727,7 +727,7 @@ bool QScriptValue::isArray() const Q_D(const QScriptValue); if (!d || !d->isJSC() || !d->jscValue.isObject()) return false; - return JSC::asObject(d->jscValue)->isObject(&JSC::JSArray::info); + return d->jscValue.isObject(&JSC::JSArray::info); } /*! @@ -741,7 +741,7 @@ bool QScriptValue::isDate() const Q_D(const QScriptValue); if (!d || !d->isJSC() || !d->jscValue.isObject()) return false; - return JSC::asObject(d->jscValue)->isObject(&JSC::DateInstance::info); + return d->jscValue.isObject(&JSC::DateInstance::info); } /*! @@ -755,7 +755,7 @@ bool QScriptValue::isRegExp() const Q_D(const QScriptValue); if (!d || !d->isJSC() || !d->jscValue.isObject()) return false; - return JSC::asObject(d->jscValue)->isObject(&JSC::RegExpObject::info); + return d->jscValue.isObject(&JSC::RegExpObject::info); } /*! @@ -1550,10 +1550,9 @@ QObject *QScriptValue::toQObject() const */ const QMetaObject *QScriptValue::toQMetaObject() const { - Q_ASSERT_X(false, Q_FUNC_INFO, "not implemented"); -// Q_D(const QScriptValue); -// if (isQMetaObject()) -// return static_cast<QScript::QMetaObjectWrapperObject*>(JSC::asObject(d->jscValue))->value(); + Q_D(const QScriptValue); + if (isQMetaObject()) + return static_cast<QScript::QMetaObjectWrapperObject*>(JSC::asObject(d->jscValue))->value(); return 0; } @@ -2258,8 +2257,7 @@ bool QScriptValue::isQMetaObject() const Q_D(const QScriptValue); if (!d || !d->isJSC() || !d->jscValue.isObject()) return false; - Q_ASSERT_X(false, Q_FUNC_INFO, "not implemented"); -// return JSC::asObject(d->jscValue)->isObject(&QScript::QMetaObjectWrapperObject::info); + return JSC::asObject(d->jscValue)->isObject(&QScript::QMetaObjectWrapperObject::info); return false; } |