1 files changed, 61 insertions, 56 deletions

diff --git a/src/qml/jsruntime/qv4dateobject_p.h b/src/qml/jsruntime/qv4dateobject_p.h
index 573326adc4..45a9420a41 100644
--- a/src/qml/jsruntime/qv4dateobject_p.h
+++ b/src/qml/jsruntime/qv4dateobject_p.h
@@ -52,25 +52,30 @@ class QDateTime;
 namespace QV4 {
 
 struct DateObject: Object {
+    Q_MANAGED
     Value value;
-    DateObject(ExecutionEngine *engine, const Value &value): Object(engine->dateClass), value(value) { type = Type_DateObject; }
+    DateObject(ExecutionEngine *engine, const Value &value): Object(engine->dateClass), value(value) {
+        vtbl = &static_vtbl;
+        type = Type_DateObject;
+    }
     DateObject(ExecutionEngine *engine, const QDateTime &value);
 
     QDateTime toQDateTime() const;
 
 protected:
-    DateObject(InternalClass *ic): Object(ic), value(Value::fromDouble(qSNaN())) { type = Type_DateObject; }
+    DateObject(InternalClass *ic): Object(ic), value(Value::fromDouble(qSNaN())) {
+        vtbl = &static_vtbl;
+        type = Type_DateObject;
+    }
 };
 
 struct DateCtor: FunctionObject
 {
+    Q_MANAGED
     DateCtor(ExecutionContext *scope);
 
-    static Value construct(Managed *, CallData *callData);
-    static Value call(Managed *that, CallData *);
-
-protected:
-    static const ManagedVTable static_vtbl;
+    static ReturnedValue construct(Managed *, CallData *callData);
+    static ReturnedValue call(Managed *that, CallData *);
 };
 
 struct DatePrototype: DateObject
@@ -80,55 +85,55 @@ struct DatePrototype: DateObject
 
     static double getThisDate(ExecutionContext *ctx);
 
-    static Value method_parse(SimpleCallContext *ctx);
-    static Value method_UTC(SimpleCallContext *ctx);
-    static Value method_now(SimpleCallContext *ctx);
-
-    static Value method_toString(SimpleCallContext *ctx);
-    static Value method_toDateString(SimpleCallContext *ctx);
-    static Value method_toTimeString(SimpleCallContext *ctx);
-    static Value method_toLocaleString(SimpleCallContext *ctx);
-    static Value method_toLocaleDateString(SimpleCallContext *ctx);
-    static Value method_toLocaleTimeString(SimpleCallContext *ctx);
-    static Value method_valueOf(SimpleCallContext *ctx);
-    static Value method_getTime(SimpleCallContext *ctx);
-    static Value method_getYear(SimpleCallContext *ctx);
-    static Value method_getFullYear(SimpleCallContext *ctx);
-    static Value method_getUTCFullYear(SimpleCallContext *ctx);
-    static Value method_getMonth(SimpleCallContext *ctx);
-    static Value method_getUTCMonth(SimpleCallContext *ctx);
-    static Value method_getDate(SimpleCallContext *ctx);
-    static Value method_getUTCDate(SimpleCallContext *ctx);
-    static Value method_getDay(SimpleCallContext *ctx);
-    static Value method_getUTCDay(SimpleCallContext *ctx);
-    static Value method_getHours(SimpleCallContext *ctx);
-    static Value method_getUTCHours(SimpleCallContext *ctx);
-    static Value method_getMinutes(SimpleCallContext *ctx);
-    static Value method_getUTCMinutes(SimpleCallContext *ctx);
-    static Value method_getSeconds(SimpleCallContext *ctx);
-    static Value method_getUTCSeconds(SimpleCallContext *ctx);
-    static Value method_getMilliseconds(SimpleCallContext *ctx);
-    static Value method_getUTCMilliseconds(SimpleCallContext *ctx);
-    static Value method_getTimezoneOffset(SimpleCallContext *ctx);
-    static Value method_setTime(SimpleCallContext *ctx);
-    static Value method_setMilliseconds(SimpleCallContext *ctx);
-    static Value method_setUTCMilliseconds(SimpleCallContext *ctx);
-    static Value method_setSeconds(SimpleCallContext *ctx);
-    static Value method_setUTCSeconds(SimpleCallContext *ctx);
-    static Value method_setMinutes(SimpleCallContext *ctx);
-    static Value method_setUTCMinutes(SimpleCallContext *ctx);
-    static Value method_setHours(SimpleCallContext *ctx);
-    static Value method_setUTCHours(SimpleCallContext *ctx);
-    static Value method_setDate(SimpleCallContext *ctx);
-    static Value method_setUTCDate(SimpleCallContext *ctx);
-    static Value method_setMonth(SimpleCallContext *ctx);
-    static Value method_setUTCMonth(SimpleCallContext *ctx);
-    static Value method_setYear(SimpleCallContext *ctx);
-    static Value method_setFullYear(SimpleCallContext *ctx);
-    static Value method_setUTCFullYear(SimpleCallContext *ctx);
-    static Value method_toUTCString(SimpleCallContext *ctx);
-    static Value method_toISOString(SimpleCallContext *ctx);
-    static Value method_toJSON(SimpleCallContext *ctx);
+    static ReturnedValue method_parse(SimpleCallContext *ctx);
+    static ReturnedValue method_UTC(SimpleCallContext *ctx);
+    static ReturnedValue method_now(SimpleCallContext *ctx);
+
+    static ReturnedValue method_toString(SimpleCallContext *ctx);
+    static ReturnedValue method_toDateString(SimpleCallContext *ctx);
+    static ReturnedValue method_toTimeString(SimpleCallContext *ctx);
+    static ReturnedValue method_toLocaleString(SimpleCallContext *ctx);
+    static ReturnedValue method_toLocaleDateString(SimpleCallContext *ctx);
+    static ReturnedValue method_toLocaleTimeString(SimpleCallContext *ctx);
+    static ReturnedValue method_valueOf(SimpleCallContext *ctx);
+    static ReturnedValue method_getTime(SimpleCallContext *ctx);
+    static ReturnedValue method_getYear(SimpleCallContext *ctx);
+    static ReturnedValue method_getFullYear(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCFullYear(SimpleCallContext *ctx);
+    static ReturnedValue method_getMonth(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCMonth(SimpleCallContext *ctx);
+    static ReturnedValue method_getDate(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCDate(SimpleCallContext *ctx);
+    static ReturnedValue method_getDay(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCDay(SimpleCallContext *ctx);
+    static ReturnedValue method_getHours(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCHours(SimpleCallContext *ctx);
+    static ReturnedValue method_getMinutes(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCMinutes(SimpleCallContext *ctx);
+    static ReturnedValue method_getSeconds(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCSeconds(SimpleCallContext *ctx);
+    static ReturnedValue method_getMilliseconds(SimpleCallContext *ctx);
+    static ReturnedValue method_getUTCMilliseconds(SimpleCallContext *ctx);
+    static ReturnedValue method_getTimezoneOffset(SimpleCallContext *ctx);
+    static ReturnedValue method_setTime(SimpleCallContext *ctx);
+    static ReturnedValue method_setMilliseconds(SimpleCallContext *ctx);
+    static ReturnedValue method_setUTCMilliseconds(SimpleCallContext *ctx);
+    static ReturnedValue method_setSeconds(SimpleCallContext *ctx);
+    static ReturnedValue method_setUTCSeconds(SimpleCallContext *ctx);
+    static ReturnedValue method_setMinutes(SimpleCallContext *ctx);
+    static ReturnedValue method_setUTCMinutes(SimpleCallContext *ctx);
+    static ReturnedValue method_setHours(SimpleCallContext *ctx);
+    static ReturnedValue method_setUTCHours(SimpleCallContext *ctx);
+    static ReturnedValue method_setDate(SimpleCallContext *ctx);
+    static ReturnedValue method_setUTCDate(SimpleCallContext *ctx);
+    static ReturnedValue method_setMonth(SimpleCallContext *ctx);
+    static ReturnedValue method_setUTCMonth(SimpleCallContext *ctx);
+    static ReturnedValue method_setYear(SimpleCallContext *ctx);
+    static ReturnedValue method_setFullYear(SimpleCallContext *ctx);
+    static ReturnedValue method_setUTCFullYear(SimpleCallContext *ctx);
+    static ReturnedValue method_toUTCString(SimpleCallContext *ctx);
+    static ReturnedValue method_toISOString(SimpleCallContext *ctx);
+    static ReturnedValue method_toJSON(SimpleCallContext *ctx);
 
     static void timezoneUpdated();
 };