From aa65084ae1c8199f122e03b5d36e43e3d9c56b17 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 11 Jul 2014 23:08:41 -0700 Subject: [PATCH] Code cleanup --- .../script-engine/src/ArrayBufferClass.cpp | 15 ++++++++++- libraries/script-engine/src/ScriptEngine.cpp | 27 ++----------------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/libraries/script-engine/src/ArrayBufferClass.cpp b/libraries/script-engine/src/ArrayBufferClass.cpp index 4f85eeeae2..f8299266fd 100644 --- a/libraries/script-engine/src/ArrayBufferClass.cpp +++ b/libraries/script-engine/src/ArrayBufferClass.cpp @@ -12,12 +12,13 @@ #include #include "ArrayBufferPrototype.h" +#include "DataViewClass.h" #include "ScriptEngine.h" +#include "TypedArrays.h" #include "ArrayBufferClass.h" static const QString CLASS_NAME = "ArrayBuffer"; -static const QString BYTE_LENGTH_PROPERTY_NAME = "byteLength"; Q_DECLARE_METATYPE(QByteArray*) @@ -46,6 +47,18 @@ _scriptEngine(scriptEngine) { _ctor.setData(engine()->toScriptValue(this)); engine()->globalObject().setProperty(name(), _ctor); + + // Registering other array types + new DataViewClass(scriptEngine); + new Int8ArrayClass(scriptEngine); + new Uint8ArrayClass(scriptEngine); + new Uint8ClampedArrayClass(scriptEngine); + new Int16ArrayClass(scriptEngine); + new Uint16ArrayClass(scriptEngine); + new Int32ArrayClass(scriptEngine); + new Uint32ArrayClass(scriptEngine); + new Float32ArrayClass(scriptEngine); + new Float64ArrayClass(scriptEngine); } QScriptValue ArrayBufferClass::newInstance(qint32 size) { diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 0279e2ea27..a224b9fa33 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -94,19 +94,8 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam _vec3Library(), _uuidLibrary(), _animationCache(this), - _arrayBufferClass(NULL) + _arrayBufferClass(new ArrayBufferClass(this)) { - _arrayBufferClass = new ArrayBufferClass(this); - new DataViewClass(this); - new Int8ArrayClass(this); - new Uint8ArrayClass(this); - new Uint8ClampedArrayClass(this); - new Int16ArrayClass(this); - new Uint16ArrayClass(this); - new Int32ArrayClass(this); - new Uint32ArrayClass(this); - new Float32ArrayClass(this); - new Float64ArrayClass(this); } ScriptEngine::ScriptEngine(const QUrl& scriptURL, @@ -131,25 +120,13 @@ ScriptEngine::ScriptEngine(const QUrl& scriptURL, _vec3Library(), _uuidLibrary(), _animationCache(this), - _arrayBufferClass(NULL) + _arrayBufferClass(new ArrayBufferClass(this)) { QString scriptURLString = scriptURL.toString(); _fileNameString = scriptURLString; QUrl url(scriptURL); - _arrayBufferClass = new ArrayBufferClass(this); - new DataViewClass(this); - new Int8ArrayClass(this); - new Uint8ArrayClass(this); - new Uint8ClampedArrayClass(this); - new Int16ArrayClass(this); - new Uint16ArrayClass(this); - new Int32ArrayClass(this); - new Uint32ArrayClass(this); - new Float32ArrayClass(this); - new Float64ArrayClass(this); - // if the scheme length is one or lower, maybe they typed in a file, let's try const int WINDOWS_DRIVE_LETTER_SIZE = 1; if (url.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) {