diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-09-24 14:35:49 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-09-24 15:36:17 (GMT) |
| commit | aabd12223bda6260756ab19430082477d5669c0a (patch) | |
| tree | 6ca7a12e627915992cfd0038f6ddd8ee244711f4 /src/script/bridge/qscriptvariant.cpp | |
| parent | 270c374c178ec5a532d37168b018cd7ebc844558 (diff) | |
| download | Qt-aabd12223bda6260756ab19430082477d5669c0a.zip Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.gz Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.bz2 | |
Update src/3rdparty/javascriptcore and adapt src/script to the changes.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/script/bridge/qscriptvariant.cpp')
| -rw-r--r-- | src/script/bridge/qscriptvariant.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/script/bridge/qscriptvariant.cpp b/src/script/bridge/qscriptvariant.cpp index aa7ad94..725f4e0 100644 --- a/src/script/bridge/qscriptvariant.cpp +++ b/src/script/bridge/qscriptvariant.cpp @@ -89,7 +89,7 @@ static JSC::JSValue JSC_HOST_CALL variantProtoFuncValueOf(JSC::ExecState *exec, { QScriptEnginePrivate *engine = scriptEngineFromExec(exec); thisValue = engine->toUsableValue(thisValue); - if (!thisValue.isObject(&QScriptObject::info)) + if (!thisValue.inherits(&QScriptObject::info)) return throwError(exec, JSC::TypeError); QScriptObjectDelegate *delegate = static_cast<QScriptObject*>(JSC::asObject(thisValue))->delegate(); if (!delegate || (delegate->type() != QScriptObjectDelegate::Variant)) @@ -127,7 +127,7 @@ static JSC::JSValue JSC_HOST_CALL variantProtoFuncToString(JSC::ExecState *exec, { QScriptEnginePrivate *engine = scriptEngineFromExec(exec); thisValue = engine->toUsableValue(thisValue); - if (!thisValue.isObject(&QScriptObject::info)) + if (!thisValue.inherits(&QScriptObject::info)) return throwError(exec, JSC::TypeError, "This object is not a QVariant"); QScriptObjectDelegate *delegate = static_cast<QScriptObject*>(JSC::asObject(thisValue))->delegate(); if (!delegate || (delegate->type() != QScriptObjectDelegate::Variant)) @@ -154,7 +154,6 @@ bool QVariantDelegate::compareToObject(QScriptObject *, JSC::ExecState *exec, JS return variant1 == scriptEngineFromExec(exec)->scriptValueFromJSCValue(o2).toVariant(); } - QVariantPrototype::QVariantPrototype(JSC::ExecState* exec, WTF::PassRefPtr<JSC::Structure> structure, JSC::Structure* prototypeFunctionStructure) : QScriptObject(structure) |