Move ScopedStackFrame into qv4stackframe_p.h

This is where it belongs. We need to apply some tricks to avoid
cyclic includes, but that's better than what we have so far.

Also, sort and clean up the includes in the affected files.

Change-Id: Ia7a957d06c0ca284045d831417740c3f9920bc92
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 20 insertions, 16 deletions

diff --git a/src/qml/jsruntime/qv4regexpobject_p.h b/src/qml/jsruntime/qv4regexpobject_p.h
index 10702c48bd..31e13f5984 100644
--- a/src/qml/jsruntime/qv4regexpobject_p.h
+++ b/src/qml/jsruntime/qv4regexpobject_p.h
@@ -14,17 +14,13 @@
 // We mean it.
 //
 
-#include "qv4engine_p.h"
-#include "qv4context_p.h"
-#include "qv4functionobject_p.h"
-#include "qv4managed_p.h"
-#include "qv4regexp_p.h"
-
-#include <QtCore/QString>
-#include <QtCore/QHash>
-#include <QtCore/QScopedPointer>
-#include <cstdio>
-#include <cassert>
+#include <private/qv4context_p.h>
+#include <private/qv4engine_p.h>
+#include <private/qv4functionobject_p.h>
+#include <private/qv4managed_p.h>
+
+#include <QtCore/qhash.h>
+#include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -110,11 +106,19 @@ struct Q_QML_PRIVATE_EXPORT RegExpObject: Object {
         return s->toQString();
     }
 
-    Heap::RegExp *value() const { return d()->value; }
-    uint flags() const { return d()->value->flags; }
-    bool global() const { return d()->value->global(); }
-    bool sticky() const { return d()->value->sticky(); }
-    bool unicode() const { return d()->value->unicode(); }
+    // We cannot name Heap::RegExp here since we don't want to include qv4regexp_p.h but we still
+    // want to keep the methods inline. We shift the requirement to name the type to the caller by
+    // making it a template.
+    template<typename RegExp = Heap::RegExp>
+    RegExp *value() const { return d()->value; }
+    template<typename RegExp = Heap::RegExp>
+    uint flags() const { return value<RegExp>()->flags; }
+    template<typename RegExp = Heap::RegExp>
+    bool global() const { return value<RegExp>()->global(); }
+    template<typename RegExp = Heap::RegExp>
+    bool sticky() const { return value<RegExp>()->sticky(); }
+    template<typename RegExp = Heap::RegExp>
+    bool unicode() const { return value<RegExp>()->unicode(); }
 
     ReturnedValue builtinExec(ExecutionEngine *engine, const String *s);
 };