Get rid of asFunctionObject()

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

6 files changed, 11 insertions, 11 deletions

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;