1 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h
index cb2bcbab2d..7432840fcd 100644
--- a/src/qml/jsruntime/qv4regexpobject_p.h
+++ b/src/qml/jsruntime/qv4regexpobject_p.h
@@ -55,8 +55,6 @@
 #include "qv4context_p.h"
 #include "qv4functionobject_p.h"
 #include "qv4string_p.h"
-#include "qv4codegen_p.h"
-#include "qv4isel_p.h"
 #include "qv4managed_p.h"
 #include "qv4property_p.h"
 #include "qv4objectiterator_p.h"
@@ -106,7 +104,7 @@ struct RegExpObject: Object {
     V4_INTERNALCLASS(RegExpObject)
     V4_PROTOTYPE(regExpPrototype)
 
-    // needs to be compatible with the flags in qv4jsir_p.h
+    // needs to be compatible with the flags in qv4compileddata_p.h
     enum Flags {
         RegExp_Global     = 0x01,
         RegExp_IgnoreCase = 0x02,
@@ -152,25 +150,27 @@ struct RegExpCtor: FunctionObject
     int lastMatchStart() { return d()->lastMatchStart; }
     int lastMatchEnd() { return d()->lastMatchEnd; }
 
-    static void construct(const Managed *m, Scope &scope, CallData *callData);
-    static void call(const Managed *that, Scope &scope, CallData *callData);
+    static ReturnedValue construct(const Managed *m, CallData *callData);
+    static ReturnedValue call(const Managed *that, CallData *callData);
 };
 
 struct RegExpPrototype: RegExpObject
 {
     void init(ExecutionEngine *engine, Object *ctor);
 
-    static void method_exec(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_test(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_toString(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_compile(const BuiltinFunction *, Scope &scope, CallData *callData);
+    static ReturnedValue method_exec(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_test(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_toString(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_compile(const BuiltinFunction *, CallData *callData);
 
     template <int index>
-    static void method_get_lastMatch_n(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_get_lastParen(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_get_input(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_get_leftContext(const BuiltinFunction *, Scope &scope, CallData *callData);
-    static void method_get_rightContext(const BuiltinFunction *, Scope &scope, CallData *callData);
+    static ReturnedValue method_get_lastMatch_n(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_get_lastParen(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_get_input(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_get_leftContext(const BuiltinFunction *, CallData *callData);
+    static ReturnedValue method_get_rightContext(const BuiltinFunction *, CallData *callData);
+
+    static ReturnedValue execFirstMatch(const BuiltinFunction *b, CallData *callData);
 };
 
 }