use JSObject::inherits() instead of JSObject::isObject()

The functions are identical, but in recent WebKit trunk isObject()
doesn't exist anymore. So this renaming is done to prepare for the
import of a more recent JavaScriptCore.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp
index b85fa5e..a5dc670 100644
--- a/src/script/bridge/qscriptclassobject.cpp
+++ b/src/script/bridge/qscriptclassobject.cpp
@@ -212,7 +212,7 @@ JSC::CallType ClassObjectDelegate::getCallData(QScriptObject*, JSC::CallData &ca
 JSC::JSValue JSC_HOST_CALL ClassObjectDelegate::call(JSC::ExecState *exec, JSC::JSObject *callee,
                                              JSC::JSValue thisValue, const JSC::ArgList &args)
 {
-    if (!callee->isObject(&QScriptObject::info))
+    if (!callee->inherits(&QScriptObject::info))
         return JSC::throwError(exec, JSC::TypeError, "callee is not a ClassObject object");
     QScriptObject *obj = static_cast<QScriptObject*>(callee);
     QScriptObjectDelegate *delegate = obj->delegate();
@@ -243,7 +243,7 @@ JSC::ConstructType ClassObjectDelegate::getConstructData(QScriptObject*, JSC::Co
 JSC::JSObject* ClassObjectDelegate::construct(JSC::ExecState *exec, JSC::JSObject *callee,
                                               const JSC::ArgList &args)
 {
-    Q_ASSERT(callee->isObject(&QScriptObject::info));
+    Q_ASSERT(callee->inherits(&QScriptObject::info));
     QScriptObject *obj = static_cast<QScriptObject*>(callee);
     QScriptObjectDelegate *delegate = obj->delegate();
     QScriptClass *scriptClass = static_cast<ClassObjectDelegate*>(delegate)->scriptClass();
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index d603e9f..b7df781 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -1021,7 +1021,7 @@ const JSC::ClassInfo QtFunction::info = { "QtFunction", &InternalFunction::info,
 JSC::JSValue JSC_HOST_CALL QtFunction::call(JSC::ExecState *exec, JSC::JSObject *callee,
                                             JSC::JSValue thisValue, const JSC::ArgList &args)
 {
-    if (!callee->isObject(&QtFunction::info))
+    if (!callee->inherits(&QtFunction::info))
         return throwError(exec, JSC::TypeError, "callee is not a QtFunction object");
     QtFunction *qfun =  static_cast<QtFunction*>(callee);
     QScriptEnginePrivate *eng_p = scriptEngineFromExec(exec);
@@ -1060,7 +1060,7 @@ JSC::JSValue JSC_HOST_CALL QtPropertyFunction::call(
     JSC::ExecState *exec, JSC::JSObject *callee,
     JSC::JSValue thisValue, const JSC::ArgList &args)
 {
-    if (!callee->isObject(&QtPropertyFunction::info))
+    if (!callee->inherits(&QtPropertyFunction::info))
         return throwError(exec, JSC::TypeError, "callee is not a QtPropertyFunction object");
     QtPropertyFunction *qfun =  static_cast<QtPropertyFunction*>(callee);
     QScriptEnginePrivate *eng_p = scriptEngineFromExec(exec);
@@ -1836,7 +1836,7 @@ JSC::JSValue JSC_HOST_CALL QMetaObjectWrapperObject::call(
 {
     QScriptEnginePrivate *eng_p = scriptEngineFromExec(exec);
     thisValue = eng_p->toUsableValue(thisValue);
-    if (!callee->isObject(&QMetaObjectWrapperObject::info))
+    if (!callee->inherits(&QMetaObjectWrapperObject::info))
         return throwError(exec, JSC::TypeError, "callee is not a QMetaObject");
     QMetaObjectWrapperObject *self =  static_cast<QMetaObjectWrapperObject*>(callee);
     JSC::ExecState *previousFrame = eng_p->currentFrame;