Move qmljs_object.* to qv4object.*

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

diff --git a/debugging.cpp b/debugging.cpp
index bcebe44..61ae0e6 100644 (file)
--- a/debugging.cpp
+++ b/debugging.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "debugging.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4functionobject.h"
 #include <iostream>
 

diff --git a/main.cpp b/main.cpp
index 93f4312..3f3e2df 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -44,7 +44,7 @@
 #endif
 
 #include "debugging.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qmljs_runtime.h"
 #include "qv4functionobject.h"
 #include "qv4errorobject.h"

diff --git a/moth/qv4instr_moth_p.h b/moth/qv4instr_moth_p.h
index 8136a68..e3cc843 100644 (file)
--- a/moth/qv4instr_moth_p.h
+++ b/moth/qv4instr_moth_p.h
@@ -2,7 +2,7 @@
 #define QV4INSTR_MOTH_P_H
 
 #include <QtCore/qglobal.h>
-#include "qmljs_objects.h"
+#include "qv4object.h"
 
 #define FOR_EACH_MOTH_INSTR(F) \
     F(Ret, ret) \

diff --git a/moth/qv4isel_moth_p.h b/moth/qv4isel_moth_p.h
index f02914f..e109064 100644 (file)
--- a/moth/qv4isel_moth_p.h
+++ b/moth/qv4isel_moth_p.h
@@ -3,7 +3,7 @@
 
 #include "qv4isel_p.h"
 #include "qv4ir_p.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4instr_moth_p.h"
 
 namespace QQmlJS {

diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp
index 9dc0eb3..231c6b8 100644 (file)
--- a/qmljs_engine.cpp
+++ b/qmljs_engine.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <qmljs_engine.h>
-#include <qmljs_objects.h>
+#include <qv4object.h>
 #include <qv4ecmaobjects_p.h>
 #include <qv4globalobject.h>
 #include <qv4errorobject.h>

diff --git a/qmljs_engine.h b/qmljs_engine.h
index 72722e0..fbb6e48 100644 (file)
--- a/qmljs_engine.h
+++ b/qmljs_engine.h
@@ -42,7 +42,7 @@
 #define QMLJS_ENGINE_H
 
 #include <qv4isel_p.h>
-#include <qmljs_objects.h>
+#include <qv4object.h>
 #include <qmljs_environment.h>
 #include <setjmp.h>
 

diff --git a/qmljs_environment.cpp b/qmljs_environment.cpp
index bdfd685..b756f97 100644 (file)
--- a/qmljs_environment.cpp
+++ b/qmljs_environment.cpp
@@ -42,7 +42,7 @@
 #include <QString>
 #include "debugging.h"
 #include <qmljs_environment.h>
-#include <qmljs_objects.h>
+#include <qv4object.h>
 #include <qv4ecmaobjects_p.h>
 #include "qv4mm.h"
 #include <qv4argumentsobject.h>

diff --git a/qmljs_runtime.cpp b/qmljs_runtime.cpp
index 9ba9b89..2c03f47 100644 (file)
--- a/qmljs_runtime.cpp
+++ b/qmljs_runtime.cpp
@@ -41,7 +41,7 @@
 
 #include "debugging.h"
 #include "qmljs_runtime.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4ir_p.h"
 #include "qv4ecmaobjects_p.h"
 #include "private/qlocale_tools_p.h"

diff --git a/qmljs_value.cpp b/qmljs_value.cpp
index 9121ea8..ebea41e 100644 (file)
--- a/qmljs_value.cpp
+++ b/qmljs_value.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <qmljs_engine.h>
-#include <qmljs_objects.h>
+#include <qv4object.h>
 #include <qv4ecmaobjects_p.h>
 
 namespace QQmlJS {

diff --git a/qv4argumentsobject.h b/qv4argumentsobject.h
index b8f15b3..90af02f 100644 (file)
--- a/qv4argumentsobject.h
+++ b/qv4argumentsobject.h
@@ -41,7 +41,7 @@
 #ifndef QV4ARGUMENTSOBJECTS_H
 #define QV4ARGUMENTSOBJECTS_H
 
-#include <qmljs_objects.h>
+#include <qv4object.h>
 #include <qv4functionobject.h>
 
 namespace QQmlJS {

diff --git a/qv4array.cpp b/qv4array.cpp
index 1bbd266..15150cc 100644 (file)
--- a/qv4array.cpp
+++ b/qv4array.cpp
@@ -41,7 +41,7 @@
 
 #include "qv4array.h"
 #include "qmljs_runtime.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4functionobject.h"
 #include <stdlib.h>
 

diff --git a/qv4dateobject.h b/qv4dateobject.h
index 1113755..204b837 100644 (file)
--- a/qv4dateobject.h
+++ b/qv4dateobject.h
@@ -41,7 +41,7 @@
 #ifndef QV4DATEOBJECT_P_H
 #define QV4DATEOBJECT_P_H
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4functionobject.h"
 #include <QtCore/qnumeric.h>
 

diff --git a/qv4ecmaobjects_p.h b/qv4ecmaobjects_p.h
index d17bfc4..687601c 100644 (file)
--- a/qv4ecmaobjects_p.h
+++ b/qv4ecmaobjects_p.h
@@ -41,7 +41,7 @@
 #ifndef QV4ECMAOBJECTS_P_H
 #define QV4ECMAOBJECTS_P_H
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4functionobject.h"
 #include <QtCore/qnumeric.h>
 

diff --git a/qv4errorobject.h b/qv4errorobject.h
index 95867e1..66f2676 100644 (file)
--- a/qv4errorobject.h
+++ b/qv4errorobject.h
@@ -41,7 +41,7 @@
 #ifndef QV4ERROROBJECT_H
 #define QV4ERROROBJECT_H
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4functionobject.h"
 
 namespace QQmlJS {

diff --git a/qv4functionobject.cpp b/qv4functionobject.cpp
index 6d8b19f..01be726 100644 (file)
--- a/qv4functionobject.cpp
+++ b/qv4functionobject.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4ir_p.h"
 #include "qv4isel_p.h"
 #include "qv4ecmaobjects_p.h"

diff --git a/qv4functionobject.h b/qv4functionobject.h
index 775c84f..727361f 100644 (file)
--- a/qv4functionobject.h
+++ b/qv4functionobject.h
@@ -44,7 +44,7 @@
 #include "qmljs_runtime.h"
 #include "qmljs_engine.h"
 #include "qmljs_environment.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4array.h"
 #include "qv4string.h"
 #include "qv4codegen_p.h"

diff --git a/qv4isel_masm.cpp b/qv4isel_masm.cpp
index 8998618..085706b 100644 (file)
--- a/qv4isel_masm.cpp
+++ b/qv4isel_masm.cpp
@@ -41,7 +41,7 @@
 
 #include "qv4isel_masm_p.h"
 #include "qmljs_runtime.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4functionobject.h"
 #include "qv4regexpobject.h"
 

diff --git a/qv4isel_masm_p.h b/qv4isel_masm_p.h
index 6bc0420..192439b 100644 (file)
--- a/qv4isel_masm_p.h
+++ b/qv4isel_masm_p.h
@@ -44,7 +44,7 @@
 #include "qv4ir_p.h"
 #include "qv4isel_p.h"
 #include "qv4isel_util_p.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qmljs_runtime.h"
 
 #include <QtCore/QHash>

diff --git a/qv4jsonobject.h b/qv4jsonobject.h
index 1a6f24a..193d490 100644 (file)
--- a/qv4jsonobject.h
+++ b/qv4jsonobject.h
@@ -41,7 +41,7 @@
 #ifndef QV4JSONOBJECTS_H
 #define QV4SJONOBJECTS_H
 
-#include <qmljs_objects.h>
+#include <qv4object.h>
 
 namespace QQmlJS {
 namespace VM {

diff --git a/qv4mathobject.h b/qv4mathobject.h
index 5f3f56f..68014f1 100644 (file)
--- a/qv4mathobject.h
+++ b/qv4mathobject.h
@@ -41,7 +41,7 @@
 #ifndef QV4MATHOBJECT_H
 #define QV$MATHOBJECT_H
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 
 namespace QQmlJS {
 

diff --git a/qv4mm.cpp b/qv4mm.cpp
index fd7d86a..daac6e8 100644 (file)
--- a/qv4mm.cpp
+++ b/qv4mm.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include "qmljs_engine.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4ecmaobjects_p.h"
 #include "qv4mm.h"
 #include "PageAllocation.h"

diff --git a/qv4mm.h b/qv4mm.h
index 33ffc88..5790ba4 100644 (file)
--- a/qv4mm.h
+++ b/qv4mm.h
@@ -30,7 +30,7 @@
 #ifndef QV4GC_H
 #define QV4GC_H
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 
 #include <QScopedPointer>
 

diff --git a/qmljs_objects.cpp b/qv4object.cpp
similarity index 99%
rename from qmljs_objects.cpp
rename to qv4object.cpp
index eb93cf8..a8814b3 100644 (file)
--- a/qmljs_objects.cpp
+++ b/qv4object.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4ir_p.h"
 #include "qv4isel_p.h"
 #include "qv4ecmaobjects_p.h"

diff --git a/qmljs_objects.h b/qv4object.h
similarity index 100%
rename from qmljs_objects.h
rename to qv4object.h

diff --git a/qv4objectiterator.cpp b/qv4objectiterator.cpp
index 271a3c5..8da2e7b 100644 (file)
--- a/qv4objectiterator.cpp
+++ b/qv4objectiterator.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include "qv4objectiterator.h"
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4stringobject.h"
 
 namespace QQmlJS {

diff --git a/qv4stringobject.h b/qv4stringobject.h
index 465ab34..7e2fc84 100644 (file)
--- a/qv4stringobject.h
+++ b/qv4stringobject.h
@@ -41,7 +41,7 @@
 #ifndef QV4STRINGOBJECT_P_H
 #define QV4STRINGOBJECT_P_H
 
-#include "qmljs_objects.h"
+#include "qv4object.h"
 #include "qv4functionobject.h"
 #include <QtCore/qnumeric.h>
 

diff --git a/v4.pro b/v4.pro
index 69c4a0c..d85e283 100644 (file)
--- a/v4.pro
+++ b/v4.pro
@@ -16,7 +16,6 @@ SOURCES += main.cpp \
     qmljs_engine.cpp \
     qmljs_environment.cpp \
     qmljs_runtime.cpp \
-    qmljs_objects.cpp \
     qmljs_value.cpp \
     qv4syntaxchecker.cpp \
     qv4ecmaobjects.cpp \
@@ -34,6 +33,7 @@ SOURCES += main.cpp \
     qv4globalobject.cpp \
     qv4jsonobject.cpp \
     qv4mathobject.cpp \
+    qv4object.cpp \
     qv4regexpobject.cpp \
     qv4stringobject.cpp \
     qv4string.cpp \
@@ -46,7 +46,6 @@ HEADERS += \
     qmljs_engine.h \
     qmljs_environment.h \
     qmljs_runtime.h \
-    qmljs_objects.h \
     qmljs_math.h \
     qmljs_value.h \
     qv4syntaxchecker_p.h \
@@ -65,6 +64,7 @@ HEADERS += \
     qv4globalobject.h \
     qv4jsonobject.h \
     qv4mathobject.h \
+    qv4object.h \
     qv4regexpobject.h \
     qv4stringobject.h \
     qv4string.h \