From b18b6ecbfd55903d57bb8853b2ad614c083647ec Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 3 Feb 2013 11:43:38 +0100 Subject: [PATCH] Rename qv4array.* to qv4sparsearray.* Change-Id: I2c5a683145a4a8e4b243a7f2fe4274dfe2b5abe4 Reviewed-by: Simon Hausmann --- src/v4/qmljs_engine.h | 2 -- src/v4/qv4arrayobject.cpp | 2 +- src/v4/qv4functionobject.h | 1 - src/v4/qv4object.h | 2 +- src/v4/qv4propertytable.h | 1 - src/v4/qv4regexpobject.h | 1 - src/v4/{qv4array.cpp => qv4sparsearray.cpp} | 2 +- src/v4/{qv4array.h => qv4sparsearray.h} | 0 src/v4/v4.pro | 4 ++-- 9 files changed, 5 insertions(+), 10 deletions(-) rename src/v4/{qv4array.cpp => qv4sparsearray.cpp} (99%) rename src/v4/{qv4array.h => qv4sparsearray.h} (100%) diff --git a/src/v4/qmljs_engine.h b/src/v4/qmljs_engine.h index a221c06..e581beb 100644 --- a/src/v4/qmljs_engine.h +++ b/src/v4/qmljs_engine.h @@ -61,7 +61,6 @@ class Debugger; namespace VM { struct Value; -class Array; struct Function; struct Object; struct BooleanObject; @@ -200,7 +199,6 @@ struct Q_V4_EXPORT ExecutionEngine Object *newFunctionObject(ExecutionContext *ctx); ArrayObject *newArrayObject(ExecutionContext *ctx); -// ArrayObject *newArrayObject(ExecutionContext *ctx, const Array &value); Object *newDateObject(const Value &value); diff --git a/src/v4/qv4arrayobject.cpp b/src/v4/qv4arrayobject.cpp index 3fa1885..8f1fc21 100644 --- a/src/v4/qv4arrayobject.cpp +++ b/src/v4/qv4arrayobject.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qv4arrayobject.h" -#include "qv4array.h" +#include "qv4sparsearray.h" using namespace QQmlJS::VM; diff --git a/src/v4/qv4functionobject.h b/src/v4/qv4functionobject.h index 53e06f3..900cb8f 100644 --- a/src/v4/qv4functionobject.h +++ b/src/v4/qv4functionobject.h @@ -46,7 +46,6 @@ #include "qmljs_engine.h" #include "qmljs_environment.h" #include "qv4object.h" -#include "qv4array.h" #include "qv4string.h" #include "qv4codegen_p.h" #include "qv4isel_p.h" diff --git a/src/v4/qv4object.h b/src/v4/qv4object.h index 6e69f9f..0b78109 100644 --- a/src/v4/qv4object.h +++ b/src/v4/qv4object.h @@ -45,7 +45,7 @@ #include "qmljs_runtime.h" #include "qmljs_engine.h" #include "qmljs_environment.h" -#include "qv4array.h" +#include "qv4sparsearray.h" #include "qv4string.h" #include "qv4codegen_p.h" #include "qv4isel_p.h" diff --git a/src/v4/qv4propertytable.h b/src/v4/qv4propertytable.h index 787c319..c98410d 100644 --- a/src/v4/qv4propertytable.h +++ b/src/v4/qv4propertytable.h @@ -70,7 +70,6 @@ struct PropertyTableEntry { class PropertyTable { Q_DISABLE_COPY(PropertyTable) - friend class Array; friend class ArrayObject; public: diff --git a/src/v4/qv4regexpobject.h b/src/v4/qv4regexpobject.h index cd79533..6c7f583 100644 --- a/src/v4/qv4regexpobject.h +++ b/src/v4/qv4regexpobject.h @@ -45,7 +45,6 @@ #include "qmljs_engine.h" #include "qmljs_environment.h" #include "qv4functionobject.h" -#include "qv4array.h" #include "qv4string.h" #include "qv4codegen_p.h" #include "qv4isel_p.h" diff --git a/src/v4/qv4array.cpp b/src/v4/qv4sparsearray.cpp similarity index 99% rename from src/v4/qv4array.cpp rename to src/v4/qv4sparsearray.cpp index 2f42057..703669b 100644 --- a/src/v4/qv4array.cpp +++ b/src/v4/qv4sparsearray.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qv4array.h" +#include "qv4sparsearray.h" #include "qmljs_runtime.h" #include "qv4object.h" #include "qv4functionobject.h" diff --git a/src/v4/qv4array.h b/src/v4/qv4sparsearray.h similarity index 100% rename from src/v4/qv4array.h rename to src/v4/qv4sparsearray.h diff --git a/src/v4/v4.pro b/src/v4/v4.pro index 24832ec..3f1d741 100644 --- a/src/v4/v4.pro +++ b/src/v4/v4.pro @@ -36,7 +36,7 @@ SOURCES += \ debugging.cpp \ qv4mm.cpp \ qv4managed.cpp \ - qv4array.cpp \ + qv4sparsearray.cpp \ qv4arrayobject.cpp \ qv4argumentsobject.cpp \ qv4booleanobject.cpp \ @@ -72,7 +72,7 @@ HEADERS += \ qv4identifier.h \ qv4mm.h \ qv4managed.h \ - qv4array.h \ + qv4sparsearray.h \ qv4arrayobject.h \ qv4argumentsobject.h \ qv4booleanobject.h \ -- 2.7.4