Clean up some header dependencies

The compiler should have as little dependencies onto
the runtime as possible.

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

diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index ac7196e..69c7c36 100644 (file)
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -43,7 +43,9 @@
 #define QV4INSTR_MOTH_P_H
 
 #include <QtCore/qglobal.h>
-#include <private/qv4object_p.h>
+#include <private/qv4value_def_p.h>
+#include <private/qv4function_p.h>
+#include <private/qv4runtime_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/qml/compiler/qv4isel_masm_p.h b/src/qml/compiler/qv4isel_masm_p.h
index 29fc8a5..c2f6604 100644 (file)
--- a/src/qml/compiler/qv4isel_masm_p.h
+++ b/src/qml/compiler/qv4isel_masm_p.h
@@ -45,8 +45,7 @@
 #include "qv4jsir_p.h"
 #include "qv4isel_p.h"
 #include "qv4isel_util_p.h"
-#include "private/qv4object_p.h"
-#include "private/qv4runtime_p.h"
+#include "private/qv4value_def_p.h"
 #include "private/qv4lookup_p.h"
 
 #include <QtCore/QHash>

diff --git a/src/qml/compiler/qv4isel_moth.cpp b/src/qml/compiler/qv4isel_moth.cpp
index 610f429..53a3983 100644 (file)
--- a/src/qml/compiler/qv4isel_moth.cpp
+++ b/src/qml/compiler/qv4isel_moth.cpp
@@ -43,10 +43,9 @@
 #include "qv4isel_moth_p.h"
 #include "qv4vme_moth_p.h"
 #include "qv4ssa_p.h"
-#include <private/qv4functionobject_p.h>
-#include <private/qv4regexpobject_p.h>
 #include <private/qv4debugging_p.h>
 #include <private/qv4function_p.h>
+#include <private/qv4regexpobject_p.h>
 
 #undef USE_TYPE_INFO
 

diff --git a/src/qml/compiler/qv4isel_moth_p.h b/src/qml/compiler/qv4isel_moth_p.h
index 9c17245..315d798 100644 (file)
--- a/src/qml/compiler/qv4isel_moth_p.h
+++ b/src/qml/compiler/qv4isel_moth_p.h
@@ -46,7 +46,7 @@
 #include <private/qv4isel_p.h>
 #include <private/qv4isel_util_p.h>
 #include <private/qv4jsir_p.h>
-#include <private/qv4object_p.h>
+#include <private/qv4value_def_p.h>
 #include "qv4instr_moth_p.h"
 
 QT_BEGIN_NAMESPACE

diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index 8e47f3c..34ce6ae 100644 (file)
--- a/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
@@ -72,6 +72,7 @@ struct ExecutionContext;
 struct ScriptFunction;
 struct InternalClass;
 struct Property;
+struct Value;
 
 struct BooleanObject;
 struct NumberObject;