1 files changed, 12 insertions, 11 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp
index 9356ea434e..bac5da709e 100644
--- a/src/qml/jsruntime/qv4objectproto.cpp
+++ b/src/qml/jsruntime/qv4objectproto.cpp
@@ -34,10 +34,11 @@
 
 #include "qv4objectproto_p.h"
 #include "qv4argumentsobject_p.h"
-#include "qv4mm_p.h"
+#include <private/qv4mm_p.h>
 #include "qv4scopedvalue_p.h"
 #include "qv4runtime_p.h"
 #include "qv4objectiterator_p.h"
+#include "qv4string_p.h"
 
 #include <QtCore/QDateTime>
 #include <QtCore/QStringList>
@@ -52,9 +53,9 @@ Heap::ObjectCtor::ObjectCtor(QV4::ExecutionContext *scope)
 {
 }
 
-ReturnedValue ObjectCtor::construct(Managed *that, CallData *callData)
+ReturnedValue ObjectCtor::construct(const Managed *that, CallData *callData)
 {
-    ObjectCtor *ctor = static_cast<ObjectCtor *>(that);
+    const ObjectCtor *ctor = static_cast<const ObjectCtor *>(that);
     ExecutionEngine *v4 = ctor->engine();
     Scope scope(v4);
     if (!callData->argc || callData->args[0].isUndefined() || callData->args[0].isNull()) {
@@ -67,9 +68,9 @@ ReturnedValue ObjectCtor::construct(Managed *that, CallData *callData)
     return RuntimeHelpers::toObject(scope.engine, callData->args[0]);
 }
 
-ReturnedValue ObjectCtor::call(Managed *m, CallData *callData)
+ReturnedValue ObjectCtor::call(const Managed *m, CallData *callData)
 {
-    ObjectCtor *ctor = static_cast<ObjectCtor *>(m);
+    const ObjectCtor *ctor = static_cast<const ObjectCtor *>(m);
     ExecutionEngine *v4 = ctor->engine();
     if (!callData->argc || callData->args[0].isUndefined() || callData->args[0].isNull())
         return v4->newObject()->asReturnedValue();
@@ -163,7 +164,7 @@ ReturnedValue ObjectPrototype::method_create(CallContext *ctx)
         return ctx->engine()->throwTypeError();
 
     ScopedObject newObject(scope, ctx->d()->engine->newObject());
-    newObject->setPrototype(O->asObject());
+    newObject->setPrototype(O->as<Object>());
 
     if (ctx->argc() > 1 && !ctx->args()[1].isUndefined()) {
         ctx->d()->callData->args[0] = newObject.asReturnedValue();
@@ -484,7 +485,7 @@ ReturnedValue ObjectPrototype::method_defineGetter(CallContext *ctx)
     if (!o) {
         if (!ctx->thisObject().isUndefined())
             return Encode::undefined();
-        o = ctx->d()->engine->globalObject();
+        o = ctx->d()->engine->globalObject;
     }
 
     ScopedProperty pd(scope);
@@ -512,7 +513,7 @@ ReturnedValue ObjectPrototype::method_defineSetter(CallContext *ctx)
     if (!o) {
         if (!ctx->thisObject().isUndefined())
             return Encode::undefined();
-        o = ctx->d()->engine->globalObject();
+        o = ctx->d()->engine->globalObject;
     }
 
     ScopedProperty pd(scope);
@@ -525,7 +526,7 @@ ReturnedValue ObjectPrototype::method_defineSetter(CallContext *ctx)
 ReturnedValue ObjectPrototype::method_get_proto(CallContext *ctx)
 {
     Scope scope(ctx);
-    ScopedObject o(scope, ctx->thisObject().asObject());
+    ScopedObject o(scope, ctx->thisObject().as<Object>());
     if (!o)
         return ctx->engine()->throwTypeError();
 
@@ -580,7 +581,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 +593,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 {