Let markObjects() operate directly on HeapObjects

This decouples things a bit better and helps moving
over to directly store heapobject pointers in other
objects.

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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index b16a6bd875..23b46c8492 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -170,11 +170,11 @@ void RegExpObject::init(ExecutionEngine *engine)
 }
 
 
-void RegExpObject::markObjects(Managed *that, ExecutionEngine *e)
+void RegExpObject::markObjects(HeapObject *that, ExecutionEngine *e)
 {
-    RegExpObject *re = static_cast<RegExpObject*>(that);
-    if (re->value())
-        re->value()->mark(e);
+    RegExpObject::Data *re = static_cast<RegExpObject::Data *>(that);
+    if (re->value)
+        re->value->mark(e);
     Object::markObjects(that, e);
 }
 
@@ -303,11 +303,11 @@ ReturnedValue RegExpCtor::call(Managed *that, CallData *callData)
     return construct(that, callData);
 }
 
-void RegExpCtor::markObjects(Managed *that, ExecutionEngine *e)
+void RegExpCtor::markObjects(HeapObject *that, ExecutionEngine *e)
 {
-    RegExpCtor *This = static_cast<RegExpCtor*>(that);
-    This->lastMatch().mark(e);
-    This->lastInput().mark(e);
+    RegExpCtor::Data *This = static_cast<RegExpCtor::Data *>(that);
+    This->lastMatch.mark(e);
+    This->lastInput.mark(e);
     FunctionObject::markObjects(that, e);
 }