Remove subtype usage in ErrorObject

Change-Id: I77e23516270a2330ec22215aef6782a38d7fca09
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp
index 849c560..eda3714 100644 (file)
--- a/src/qml/jsruntime/qv4errorobject.cpp
+++ b/src/qml/jsruntime/qv4errorobject.cpp
@@ -76,7 +76,7 @@ Heap::ErrorObject::ErrorObject(InternalClass *ic, QV4::Object *prototype)
 Heap::ErrorObject::ErrorObject(InternalClass *ic, QV4::Object *prototype, const ValueRef message, ErrorType t)
     : Heap::Object(ic, prototype)
 {
-    subtype = t;
+    errorType = t;
 
     Scope scope(ic->engine);
     Scoped<QV4::ErrorObject> e(scope, this);
@@ -98,7 +98,7 @@ Heap::ErrorObject::ErrorObject(InternalClass *ic, QV4::Object *prototype, const
 Heap::ErrorObject::ErrorObject(InternalClass *ic, QV4::Object *prototype, const QString &message, ErrorObject::ErrorType t)
     : Heap::Object(ic, prototype)
 {
-    subtype = t;
+    errorType = t;
 
     Scope scope(ic->engine);
     Scoped<QV4::ErrorObject> e(scope, this);
@@ -120,7 +120,7 @@ Heap::ErrorObject::ErrorObject(InternalClass *ic, QV4::Object *prototype, const
 Heap::ErrorObject::ErrorObject(InternalClass *ic, QV4::Object *prototype, const QString &message, const QString &fileName, int line, int column, ErrorObject::ErrorType t)
     : Heap::Object(ic, prototype)
 {
-    subtype = t;
+    errorType = t;
 
     Scope scope(ic->engine);
     Scoped<QV4::ErrorObject> e(scope, this);

diff --git a/src/qml/jsruntime/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h
index 71a811c..54762d8 100644 (file)
--- a/src/qml/jsruntime/qv4errorobject_p.h
+++ b/src/qml/jsruntime/qv4errorobject_p.h
@@ -59,6 +59,8 @@ struct ErrorObject : Object {
     ErrorObject(InternalClass *ic, QV4::Object *prototype, const ValueRef message, ErrorType t = Error);
     ErrorObject(InternalClass *ic, QV4::Object *prototype, const QString &message, ErrorType t = Error);
     ErrorObject(InternalClass *ic, QV4::Object *prototype, const QString &message, const QString &fileName, int line, int column, ErrorType t = Error);
+
+    ErrorType errorType;
     StackTrace stackTrace;
     String *stack;
 };
@@ -269,7 +271,7 @@ struct URIErrorPrototype : ErrorObject
 
 inline SyntaxErrorObject *ErrorObject::asSyntaxError()
 {
-    return subtype() == QV4::Heap::ErrorObject::SyntaxError ? static_cast<SyntaxErrorObject *>(this) : 0;
+    return d()->errorType == QV4::Heap::ErrorObject::SyntaxError ? static_cast<SyntaxErrorObject *>(this) : 0;
 }
 
 }

diff --git a/src/qml/jsruntime/qv4managed.cpp b/src/qml/jsruntime/qv4managed.cpp
index 9dc583b..668e7d2 100644 (file)
--- a/src/qml/jsruntime/qv4managed.cpp
+++ b/src/qml/jsruntime/qv4managed.cpp
@@ -100,7 +100,7 @@ QString Managed::className() const
         s = "RegExp";
         break;
     case Type_ErrorObject:
-        switch (Heap::ErrorObject::ErrorType(subtype())) {
+        switch (static_cast<Heap::ErrorObject *>(d())->errorType) {
         case Heap::ErrorObject::Error:
             s = "Error";
             break;