Port ErrorObject away from v4classgen

Not worth it for one single line :)

Change-Id: I67fa8d222f1a382c4304c7d86cae98cf7842eb6f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/qml/qml/v4/qv4errorobject.cpp b/src/qml/qml/v4/qv4errorobject.cpp
index 79504e1..b8939a9 100644 (file)
--- a/src/qml/qml/v4/qv4errorobject.cpp
+++ b/src/qml/qml/v4/qv4errorobject.cpp
@@ -78,7 +78,7 @@ ErrorObject::ErrorObject(ExecutionEngine *engine, const Value &message, ErrorTyp
 {
     type = Type_ErrorObject;
     subtype = t;
-    initClass(engine);
+    defineAccessorProperty(engine, QStringLiteral("stack"), ErrorObject::method_get_stack, 0);
 
     if (!message.isUndefined())
         defineDefaultProperty(engine->newString(QStringLiteral("message")), message);
@@ -323,5 +323,3 @@ Value ErrorPrototype::method_toString(SimpleCallContext *ctx)
 
     return Value::fromString(ctx, str);
 }
-
-#include "qv4errorobject_p_jsclass.cpp"

diff --git a/src/qml/qml/v4/qv4errorobject_p.h b/src/qml/qml/v4/qv4errorobject_p.h
index eecda5d..41e3aba 100644 (file)
--- a/src/qml/qml/v4/qv4errorobject_p.h
+++ b/src/qml/qml/v4/qv4errorobject_p.h
@@ -50,7 +50,7 @@ namespace QV4 {
 
 struct SyntaxErrorObject;
 
-struct QV4_JS_CLASS(ErrorObject): Object {
+struct ErrorObject: Object {
     enum ErrorType {
         Error,
         EvalError,
@@ -62,14 +62,13 @@ struct QV4_JS_CLASS(ErrorObject): Object {
     };
 
     ErrorObject(ExecutionEngine *engine, const Value &message, ErrorType t = Error);
-    void initClass(ExecutionEngine *engine);
 
     SyntaxErrorObject *asSyntaxError();
 
     ExecutionEngine::StackTrace stackTrace;
     Value stack;
 
-    static Value method_get_stack(SimpleCallContext *ctx) QV4_ANNOTATE(attributes QV4::Attr_NotEnumerable);
+    static Value method_get_stack(SimpleCallContext *ctx);
 };
 
 struct EvalErrorObject: ErrorObject {

diff --git a/src/qml/qml/v4/v4.pri b/src/qml/qml/v4/v4.pri
index 5edcfd5..f613ae6 100644 (file)
--- a/src/qml/qml/v4/v4.pri
+++ b/src/qml/qml/v4/v4.pri
@@ -112,8 +112,7 @@ OTHER_FILES += \
 
 JS_CLASS_SOURCES += $$PWD/qv4dateobject_p.h \
                     $$PWD/qv4variantobject_p.h \
-                    $$PWD/qv4sequenceobject_p.h \
-                    $$PWD/qv4errorobject_p.h
+                    $$PWD/qv4sequenceobject_p.h
 
 js_class_bindings.output = ${QMAKE_FILE_BASE}_jsclass.cpp
 js_class_bindings.input = JS_CLASS_SOURCES