Get rid of asFunctionObject()

Change-Id: Ib4858376dc0ec57fa473c80696abc66a570c90ec
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

23 files changed, 52 insertions, 62 deletions

diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index 5a0ee1059c..f6031d4268 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -361,7 +361,7 @@ bool QJSValue::isCallable() const
     QV4::Value *val = QJSValuePrivate::getValue(this);
     if (!val)
         return false;
-    return val->asFunctionObject();
+    return val->as<FunctionObject>();
 }
 
 /*!
@@ -626,7 +626,7 @@ QJSValue QJSValue::call(const QJSValueList &args)
     if (!val)
         return QJSValue();
 
-    FunctionObject *f = val->asFunctionObject();
+    FunctionObject *f = val->as<FunctionObject>();
     if (!f)
         return QJSValue();
 
@@ -677,7 +677,7 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList
     if (!val)
         return QJSValue();
 
-    FunctionObject *f = val->asFunctionObject();
+    FunctionObject *f = val->as<FunctionObject>();
     if (!f)
         return QJSValue();
 
@@ -731,7 +731,7 @@ QJSValue QJSValue::callAsConstructor(const QJSValueList &args)
     if (!val)
         return QJSValue();
 
-    FunctionObject *f = val->asFunctionObject();
+    FunctionObject *f = val->as<FunctionObject>();
     if (!f)
         return QJSValue();
 
diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index 7804007dc6..cb48f0871e 100644
--- a/src/qml/jsruntime/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
@@ -1297,7 +1297,7 @@ ReturnedValue DatePrototype::method_toJSON(CallContext *ctx)
 
     ScopedString s(scope, ctx->d()->engine->newString(QStringLiteral("toISOString")));
     ScopedValue v(scope, O->objectValue()->get(s));
-    FunctionObject *toIso = v->asFunctionObject();
+    FunctionObject *toIso = v->as<FunctionObject>();
 
     if (!toIso)
         return ctx->engine()->throwTypeError();
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 7e80bf093e..9b9a2349a9 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -410,7 +410,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory)
     globalObject()->defineDefaultProperty(QStringLiteral("DataView"), dataViewCtor);
     ScopedString str(scope);
     for (int i = 0; i < Heap::TypedArray::NTypes; ++i)
-        globalObject()->defineDefaultProperty((str = typedArrayCtors[i].asFunctionObject()->name())->toQString(), typedArrayCtors[i]);
+        globalObject()->defineDefaultProperty((str = typedArrayCtors[i].as<FunctionObject>()->name())->toQString(), typedArrayCtors[i]);
     ScopedObject o(scope);
     globalObject()->defineDefaultProperty(QStringLiteral("Math"), (o = memoryManager->alloc<MathObject>(this)));
     globalObject()->defineDefaultProperty(QStringLiteral("JSON"), (o = memoryManager->alloc<JsonObject>(this)));
@@ -1199,7 +1199,7 @@ static QVariant toVariant(QV4::ExecutionEngine *e, const QV4::Value &value, int
     if (value.as<Object>()) {
         QV4::ScopedObject object(scope, value);
         if (typeHint == QMetaType::QJsonObject
-                   && !value.as<ArrayObject>() && !value.asFunctionObject()) {
+                   && !value.as<ArrayObject>() && !value.as<FunctionObject>()) {
             return QVariant::fromValue(QV4::JsonObject::toJsonObject(object));
         } else if (QV4::QObjectWrapper *wrapper = object->as<QV4::QObjectWrapper>()) {
             return qVariantFromValue<QObject *>(wrapper->object());
@@ -1303,7 +1303,7 @@ static QVariant objectToVariant(QV4::ExecutionEngine *e, QV4::Object *o, V4Objec
         }
 
         result = list;
-    } else if (!o->asFunctionObject()) {
+    } else if (!o->as<FunctionObject>()) {
         QVariantMap map;
         QV4::Scope scope(e);
         QV4::ObjectIterator it(scope, o, QV4::ObjectIterator::EnumerableOnly);
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index 3cb8a6c54c..f5db520348 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -157,7 +157,7 @@ void FunctionObject::init(String *n, bool createProto)
     defineReadonlyProperty(s.engine->id_name, v);
 }
 
-ReturnedValue FunctionObject::name()
+ReturnedValue FunctionObject::name() const
 {
     return get(scope()->engine->id_name);
 }
@@ -298,7 +298,7 @@ void FunctionPrototype::init(ExecutionEngine *engine, Object *ctor)
 
 ReturnedValue FunctionPrototype::method_toString(CallContext *ctx)
 {
-    FunctionObject *fun = ctx->thisObject().asFunctionObject();
+    FunctionObject *fun = ctx->thisObject().as<FunctionObject>();
     if (!fun)
         return ctx->engine()->throwTypeError();
 
@@ -308,7 +308,7 @@ ReturnedValue FunctionPrototype::method_toString(CallContext *ctx)
 ReturnedValue FunctionPrototype::method_apply(CallContext *ctx)
 {
     Scope scope(ctx);
-    ScopedFunctionObject o(scope, ctx->thisObject().asFunctionObject());
+    ScopedFunctionObject o(scope, ctx->thisObject().as<FunctionObject>());
     if (!o)
         return ctx->engine()->throwTypeError();
 
@@ -350,7 +350,7 @@ ReturnedValue FunctionPrototype::method_call(CallContext *ctx)
 {
     Scope scope(ctx);
 
-    ScopedFunctionObject o(scope, ctx->thisObject().asFunctionObject());
+    ScopedFunctionObject o(scope, ctx->thisObject().as<FunctionObject>());
     if (!o)
         return ctx->engine()->throwTypeError();
 
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 094d180225..108790a205 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -114,7 +114,7 @@ struct Q_QML_EXPORT FunctionObject: Object {
     Heap::ExecutionContext *scope() const { return d()->scope; }
     Function *function() const { return d()->function; }
 
-    ReturnedValue name();
+    ReturnedValue name() const;
     unsigned int formalParameterCount() { return d()->formalParameterCount(); }
     unsigned int varCount() { return d()->varCount(); }
 
@@ -127,10 +127,6 @@ struct Q_QML_EXPORT FunctionObject: Object {
     static ReturnedValue construct(const Managed *that, CallData *);
     static ReturnedValue call(const Managed *that, CallData *d);
 
-    static FunctionObject *cast(const Value &v) {
-        return v.asFunctionObject();
-    }
-
     static Heap::FunctionObject *createScriptFunction(ExecutionContext *scope, Function *function, bool createProto = true);
 
     ReturnedValue protoProperty() { return memberData()->data[Heap::FunctionObject::Index_Prototype].asReturnedValue(); }
@@ -145,9 +141,16 @@ struct Q_QML_EXPORT FunctionObject: Object {
 
 template<>
 inline const FunctionObject *Value::as() const {
-    return asFunctionObject();
+    return isManaged() && m && m->vtable->isFunctionObject ? reinterpret_cast<const FunctionObject *>(this) : 0;
 }
 
+template<>
+inline FunctionObject *managed_cast(Managed *m)
+{
+    return m ? m->as<FunctionObject>() : 0;
+}
+
+
 struct FunctionCtor: FunctionObject
 {
     V4_OBJECT2(FunctionCtor, FunctionObject)
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index 2b4427564c..ed7ace9ed1 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -54,7 +54,7 @@ QV4Include::QV4Include(const QUrl &url, QV4::ExecutionEngine *engine, QQmlContex
     : v4(engine), m_network(0), m_reply(0), m_url(url), m_redirectCount(0), m_context(context)
 {
     m_qmlglobal.set(engine, qmlglobal);
-    if (callback.asFunctionObject())
+    if (callback.as<QV4::FunctionObject>())
         m_callbackFunction.set(engine, callback);
 
     m_resultObject.set(v4, resultValue(v4));
@@ -184,7 +184,7 @@ QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx)
     QUrl url(scope.engine->resolvedUrl(ctx->args()[0].toQStringNoThrow()));
 
     QV4::ScopedValue callbackFunction(scope, QV4::Primitive::undefinedValue());
-    if (ctx->argc() >= 2 && ctx->args()[1].asFunctionObject())
+    if (ctx->argc() >= 2 && ctx->args()[1].as<QV4::FunctionObject>())
         callbackFunction = ctx->args()[1];
 
     QString localFile = QQmlFile::urlToLocalFileOrQrc(url);
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index 8af9c19281..74a25324c1 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -722,7 +722,7 @@ QString Stringify::Str(const QString &key, const Value &v)
 
     o = value->asReturnedValue();
     if (o) {
-        if (!o->asFunctionObject()) {
+        if (!o->as<FunctionObject>()) {
             if (o->as<ArrayObject>()) {
                 return JA(static_cast<ArrayObject *>(o.getPointer()));
             } else {
@@ -887,7 +887,7 @@ ReturnedValue JsonObject::method_stringify(CallContext *ctx)
 
     ScopedObject o(scope, ctx->argument(1));
     if (o) {
-        stringify.replacerFunction = o->asFunctionObject();
+        stringify.replacerFunction = o->as<FunctionObject>();
         if (o->isArrayObject()) {
             uint arrayLen = o->getLength();
             ScopedValue v(scope);
@@ -984,7 +984,7 @@ QV4::ReturnedValue JsonObject::fromJsonObject(ExecutionEngine *engine, const QJs
 QJsonObject JsonObject::toJsonObject(Object *o, V4ObjectSet &visitedObjects)
 {
     QJsonObject result;
-    if (!o || o->asFunctionObject())
+    if (!o || o->as<FunctionObject>())
         return result;
 
     Scope scope(o->engine());
@@ -1007,7 +1007,7 @@ QJsonObject JsonObject::toJsonObject(Object *o, V4ObjectSet &visitedObjects)
             break;
 
         QString key = name->toQStringNoThrow();
-        if (!val->asFunctionObject())
+        if (!val->as<FunctionObject>())
             result.insert(key, toJsonValue(val, visitedObjects));
     }
 
@@ -1050,7 +1050,7 @@ QJsonArray JsonObject::toJsonArray(ArrayObject *a, V4ObjectSet &visitedObjects)
     quint32 length = a->getLength();
     for (quint32 i = 0; i < length; ++i) {
         v = a->getIndexed(i);
-        if (v->asFunctionObject())
+        if (v->as<FunctionObject>())
             v = Encode::null();
         result.append(toJsonValue(v, visitedObjects));
     }
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h
index 6716662dc8..ebbd2d6ab9 100644
--- a/src/qml/jsruntime/qv4managed_p.h
+++ b/src/qml/jsruntime/qv4managed_p.h
@@ -150,7 +150,6 @@ public:
     };
     Q_MANAGED_TYPE(Invalid)
 
-    FunctionObject *asFunctionObject() { return d()->vtable->isFunctionObject ? reinterpret_cast<FunctionObject *>(this) : 0; }
     BooleanObject *asBooleanObject() { return d()->vtable->type == Type_BooleanObject ? reinterpret_cast<BooleanObject *>(this) : 0; }
     ArgumentsObject *asArgumentsObject() { return d()->vtable->type == Type_ArgumentsObject ? reinterpret_cast<ArgumentsObject *>(this) : 0; }
 
@@ -205,11 +204,6 @@ inline Object *managed_cast(Managed *m)
 {
     return m ? m->as<Object>() : 0;
 }
-template<>
-inline FunctionObject *managed_cast(Managed *m)
-{
-    return m ? m->asFunctionObject() : 0;
-}
 
 }
 
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index cc59ee0c91..8324a1aee2 100644
--- a/src/qml/jsruntime/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
@@ -580,7 +580,7 @@ void ObjectPrototype::toPropertyDescriptor(ExecutionEngine *engine, const Value
 
     if (o->hasProperty(engine->id_get)) {
         ScopedValue get(scope, o->get(engine->id_get));
-        FunctionObject *f = get->asFunctionObject();
+        FunctionObject *f = get->as<FunctionObject>();
         if (f || get->isUndefined()) {
             desc->value = get;
         } else {
@@ -592,7 +592,7 @@ void ObjectPrototype::toPropertyDescriptor(ExecutionEngine *engine, const Value
 
     if (o->hasProperty(engine->id_set)) {
         ScopedValue set(scope, o->get(engine->id_set));
-        FunctionObject *f = set->asFunctionObject();
+        FunctionObject *f = set->as<FunctionObject>();
         if (f || set->isUndefined()) {
             desc->set = set;
         } else {
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 5b8d35f62a..34414cd220 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -520,7 +520,7 @@ void QObjectWrapper::setProperty(QObject *object, ExecutionContext *ctx, QQmlPro
             error += QLatin1String(QMetaType::typeName(property->propType));
         ctx->engine()->throwError(error);
         return;
-    } else if (value.asFunctionObject()) {
+    } else if (value.as<FunctionObject>()) {
         // this is handled by the binding creation above
     } else if (property->propType == QMetaType::Int && value.isNumber()) {
         PROPERTY_STORE(int, value.asDouble());
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index f6e558c810..1948d047fb 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -425,7 +425,7 @@ ReturnedValue RegExpPrototype::method_compile(CallContext *ctx)
     ScopedCallData callData(scope, ctx->argc());
     memcpy(callData->args, ctx->args(), ctx->argc()*sizeof(Value));
 
-    Scoped<RegExpObject> re(scope, ctx->d()->engine->regExpCtor.asFunctionObject()->construct(callData));
+    Scoped<RegExpObject> re(scope, ctx->d()->engine->regExpCtor.as<FunctionObject>()->construct(callData));
 
     r->d()->value = re->value();
     r->d()->global = re->global();
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 008bc309e4..ae618ceb6e 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -314,7 +314,7 @@ ReturnedValue Runtime::deleteName(ExecutionEngine *engine, int nameIndex)
 QV4::ReturnedValue Runtime::instanceof(ExecutionEngine *engine, const Value &left, const Value &right)
 {
     Scope scope(engine);
-    ScopedFunctionObject f(scope, right.asFunctionObject());
+    ScopedFunctionObject f(scope, right.as<FunctionObject>());
     if (!f)
         return engine->throwTypeError();
 
@@ -405,7 +405,7 @@ ReturnedValue RuntimeHelpers::objectDefaultValue(const Object *object, int typeH
     callData->thisObject = *object;
 
     ScopedValue conv(scope, object->get(*meth1));
-    if (FunctionObject *o = conv->asFunctionObject()) {
+    if (FunctionObject *o = conv->as<FunctionObject>()) {
         ScopedValue r(scope, o->call(callData));
         if (r->isPrimitive())
             return r->asReturnedValue();
@@ -415,7 +415,7 @@ ReturnedValue RuntimeHelpers::objectDefaultValue(const Object *object, int typeH
         return Encode::undefined();
 
     conv = object->get(*meth2);
-    if (FunctionObject *o = conv->asFunctionObject()) {
+    if (FunctionObject *o = conv->as<FunctionObject>()) {
         ScopedValue r(scope, o->call(callData));
         if (r->isPrimitive())
             return r->asReturnedValue();
@@ -932,7 +932,7 @@ ReturnedValue Runtime::callActivationProperty(ExecutionEngine *engine, int nameI
     if (base)
         callData->thisObject = base;
 
-    FunctionObject *o = func->asFunctionObject();
+    FunctionObject *o = func->as<FunctionObject>();
     if (!o) {
         QString objectAsString = QStringLiteral("[null]");
         if (base)
@@ -1101,7 +1101,7 @@ ReturnedValue Runtime::typeofValue(ExecutionEngine *engine, const Value &value)
     case Value::Managed_Type:
         if (value.isString())
             res = engine->id_string;
-        else if (value.objectValue()->asFunctionObject())
+        else if (value.objectValue()->as<FunctionObject>())
             res = engine->id_function;
         else
             res = engine->id_object; // ### implementation-defined
diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp
index b1f2b69161..79bd1db6c0 100644
--- a/src/qml/jsruntime/qv4sequenceobject.cpp
+++ b/src/qml/jsruntime/qv4sequenceobject.cpp
@@ -419,7 +419,7 @@ public:
         }
 
         QV4::Scope scope(ctx);
-        if (ctx->argc() == 1 && ctx->args()[0].asFunctionObject()) {
+        if (ctx->argc() == 1 && ctx->args()[0].as<FunctionObject>()) {
             CompareFunctor cf(ctx, ctx->args()[0]);
             std::sort(d()->container.begin(), d()->container.end(), cf);
         } else {
diff --git a/src/qml/jsruntime/qv4serialize.cpp b/src/qml/jsruntime/qv4serialize.cpp
index a13b8b2055..ddd7555dde 100644
--- a/src/qml/jsruntime/qv4serialize.cpp
+++ b/src/qml/jsruntime/qv4serialize.cpp
@@ -168,7 +168,7 @@ void Serialize::serialize(QByteArray &data, const QV4::Value &v, ExecutionEngine
         char *buffer = data.data() + offset;
 
         memcpy(buffer, qstr.constData(), length*sizeof(QChar));
-    } else if (v.asFunctionObject()) {
+    } else if (v.as<FunctionObject>()) {
         // XXX TODO: Implement passing function objects between the main and
         // worker scripts
         push(data, valueheader(WorkerUndefined));
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 99911a9c23..f4a6e455cd 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -368,7 +368,7 @@ ReturnedValue StringPrototype::method_match(CallContext *context)
     if (!rx) {
         ScopedCallData callData(scope, 1);
         callData->args[0] = regexp;
-        rx = context->d()->engine->regExpCtor.asFunctionObject()->construct(callData);
+        rx = context->d()->engine->regExpCtor.as<FunctionObject>()->construct(callData);
     }
 
     if (!rx)
@@ -593,7 +593,7 @@ ReturnedValue StringPrototype::method_search(CallContext *ctx)
     if (!regExp) {
         ScopedCallData callData(scope, 1);
         callData->args[0] = regExpValue;
-        regExpValue = ctx->d()->engine->regExpCtor.asFunctionObject()->construct(callData);
+        regExpValue = ctx->d()->engine->regExpCtor.as<FunctionObject>()->construct(callData);
         if (scope.engine->hasException)
             return Encode::undefined();
         regExp = regExpValue->as<RegExpObject>();
diff --git a/src/qml/jsruntime/qv4value_inl_p.h b/src/qml/jsruntime/qv4value_inl_p.h
index 9829b39817..d1508285f3 100644
--- a/src/qml/jsruntime/qv4value_inl_p.h
+++ b/src/qml/jsruntime/qv4value_inl_p.h
@@ -231,11 +231,6 @@ inline uint Value::asArrayLength(bool *ok) const
     return idx;
 }
 
-inline FunctionObject *Value::asFunctionObject() const
-{
-    return isObject() ? managed()->asFunctionObject() : 0;
-}
-
 template<>
 inline ReturnedValue value_convert<String>(ExecutionEngine *e, const Value &v)
 {
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h
index 260f3afe03..7f09fc73ce 100644
--- a/src/qml/jsruntime/qv4value_p.h
+++ b/src/qml/jsruntime/qv4value_p.h
@@ -304,8 +304,6 @@ struct Q_QML_PRIVATE_EXPORT Value
         return b;
     }
 
-    inline FunctionObject *asFunctionObject() const;
-
     template <typename T>
     const T *as() const {
         if (!m || !isManaged())
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 157aa760a3..44bbe14d43 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -180,7 +180,7 @@ void QQmlBinding::update(QQmlPropertyPrivate::WriteFlags flags)
         lineNumber = loc.line;
         columnNumber = loc.column;
     } else {
-        QV4::Function *function = f->asFunctionObject()->function();
+        QV4::Function *function = f->as<QV4::FunctionObject>()->function();
         Q_ASSERT(function);
 
         url = function->sourceFile();
@@ -266,7 +266,7 @@ QString QQmlBinding::expressionIdentifier(QQmlJavaScriptExpression *e)
     QQmlEnginePrivate *ep = QQmlEnginePrivate::get(This->context()->engine);
     QV4::Scope scope(ep->v4engine());
     QV4::ScopedValue f(scope, This->v4function.value());
-    QV4::Function *function = f->asFunctionObject()->function();
+    QV4::Function *function = f->as<QV4::FunctionObject>()->function();
 
     QString url = function->sourceFile();
     quint16 lineNumber = function->compiledFunction->location.line;
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index f605bbf863..881726c00f 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1242,12 +1242,12 @@ void QQmlComponent::createObject(QQmlV4Function *args)
     if (!valuemap->isUndefined()) {
         QV4::ScopedObject qmlglobal(scope, args->qmlGlobal());
         QV4::ScopedValue f(scope, QV4::Script::evaluate(v4, QString::fromLatin1(INITIALPROPERTIES_SOURCE), qmlglobal));
-        Q_ASSERT(f->asFunctionObject());
+        Q_ASSERT(f->as<QV4::FunctionObject>());
         QV4::ScopedCallData callData(scope, 2);
         callData->thisObject = v4->globalObject();
         callData->args[0] = object;
         callData->args[1] = valuemap;
-        f->asFunctionObject()->call(callData);
+        f->as<QV4::FunctionObject>()->call(callData);
     }
 
     d->completeCreate();
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp
index 3ac0f23e4d..6411b569ee 100644
--- a/src/qml/qml/qqmljavascriptexpression.cpp
+++ b/src/qml/qml/qqmljavascriptexpression.cpp
@@ -154,7 +154,7 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QQmlContextData *context,
             callData->thisObject = value;
     }
 
-    result = function.asFunctionObject()->call(callData);
+    result = function.as<QV4::FunctionObject>()->call(callData);
     if (scope.hasException()) {
         if (watcher.wasDeleted())
             scope.engine->catchException(); // ignore exception
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index 931adb9a13..aef2bf0420 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -1545,7 +1545,7 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object,
     if (expression->hasError()) {
         return false;
     } else if (isVarProperty) {
-        QV4::FunctionObject *f = result.asFunctionObject();
+        const QV4::FunctionObject *f = result.as<QV4::FunctionObject>();
         if (f && f->isBinding()) {
             // we explicitly disallow this case to avoid confusion.  Users can still store one
             // in an array in a var property if they need to, but the common case is user error.
@@ -1563,7 +1563,7 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object,
     } else if (isUndefined && type == qMetaTypeId<QVariant>()) {
         writeValueProperty(object, core, QVariant(), context, flags);
     } else if (type == qMetaTypeId<QJSValue>()) {
-        QV4::FunctionObject *f = result.asFunctionObject();
+        const QV4::FunctionObject *f = result.as<QV4::FunctionObject>();
         if (f && f->isBinding()) {
             expression->delayedError()->setErrorDescription(QLatin1String("Invalid use of Qt.binding() in a binding declaration."));
             expression->delayedError()->setErrorObject(object);
@@ -1581,7 +1581,7 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object,
         expression->delayedError()->setErrorDescription(errorStr);
         expression->delayedError()->setErrorObject(object);
         return false;
-    } else if (QV4::FunctionObject *f = result.asFunctionObject()) {
+    } else if (const QV4::FunctionObject *f = result.as<QV4::FunctionObject>()) {
         if (f->isBinding())
             expression->delayedError()->setErrorDescription(QLatin1String("Invalid use of Qt.binding() in a binding declaration."));
         else
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 1c64e1538b..39196e0e65 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1172,7 +1172,7 @@ ReturnedValue QtObject::method_locale(CallContext *ctx)
     return QQmlLocale::locale(ctx->engine(), code);
 }
 
-Heap::QQmlBindingFunction::QQmlBindingFunction(QV4::FunctionObject *originalFunction)
+Heap::QQmlBindingFunction::QQmlBindingFunction(const QV4::FunctionObject *originalFunction)
     : QV4::Heap::FunctionObject(originalFunction->scope(), originalFunction->name())
     , originalFunction(originalFunction->d())
 {
@@ -1250,7 +1250,7 @@ ReturnedValue QtObject::method_binding(CallContext *ctx)
 {
     if (ctx->argc() != 1)
         V4THROW_ERROR("binding() requires 1 argument");
-    QV4::FunctionObject *f = ctx->args()[0].asFunctionObject();
+    const QV4::FunctionObject *f = ctx->args()[0].as<FunctionObject>();
     if (!f)
         V4THROW_TYPE("binding(): argument (binding expression) must be a function");
 
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index 6763a74e05..b1b713d7b6 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -68,7 +68,7 @@ struct ConsoleObject : Object {
 };
 
 struct QQmlBindingFunction : FunctionObject {
-    QQmlBindingFunction(QV4::FunctionObject *originalFunction);
+    QQmlBindingFunction(const QV4::FunctionObject *originalFunction);
     FunctionObject *originalFunction;
     // Set when the binding is created later
     QQmlSourceLocation bindingLocation;