From cdace384899340a8ce8a63f918ea0934eaa5713d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 8 Aug 2020 00:14:12 +0300 Subject: [PATCH] remove unused JSC::ClassInfo::staticPropHashTable member Signed-off-by: Ivailo Monev --- src/3rdparty/javascriptcore/API/JSCallbackConstructor.cpp | 2 +- src/3rdparty/javascriptcore/API/JSCallbackFunction.cpp | 2 +- src/3rdparty/javascriptcore/runtime/Arguments.cpp | 2 +- src/3rdparty/javascriptcore/runtime/ArrayPrototype.cpp | 2 +- src/3rdparty/javascriptcore/runtime/BooleanObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/ClassInfo.h | 4 +--- src/3rdparty/javascriptcore/runtime/DateInstance.cpp | 2 +- src/3rdparty/javascriptcore/runtime/DatePrototype.cpp | 2 +- src/3rdparty/javascriptcore/runtime/ErrorInstance.cpp | 2 +- src/3rdparty/javascriptcore/runtime/InternalFunction.cpp | 2 +- src/3rdparty/javascriptcore/runtime/JSActivation.cpp | 2 +- src/3rdparty/javascriptcore/runtime/JSArray.cpp | 2 +- src/3rdparty/javascriptcore/runtime/JSByteArray.cpp | 2 +- src/3rdparty/javascriptcore/runtime/JSFunction.cpp | 2 +- src/3rdparty/javascriptcore/runtime/JSGlobalObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/JSONObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/JSObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/MathObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/NativeErrorConstructor.cpp | 2 +- src/3rdparty/javascriptcore/runtime/NumberConstructor.cpp | 2 +- src/3rdparty/javascriptcore/runtime/NumberObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/RegExpConstructor.cpp | 2 +- src/3rdparty/javascriptcore/runtime/RegExpObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/RegExpPrototype.cpp | 2 +- src/3rdparty/javascriptcore/runtime/StringObject.cpp | 2 +- src/3rdparty/javascriptcore/runtime/StringPrototype.cpp | 2 +- src/script/bridge/qscriptactivationobject.cpp | 2 +- src/script/bridge/qscriptfunction.cpp | 4 ++-- src/script/bridge/qscriptobject.cpp | 2 +- src/script/bridge/qscriptqobject.cpp | 6 +++--- src/script/bridge/qscriptstaticscopeobject.cpp | 2 +- 31 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/3rdparty/javascriptcore/API/JSCallbackConstructor.cpp b/src/3rdparty/javascriptcore/API/JSCallbackConstructor.cpp index 935b5009a..eaed71912 100644 --- a/src/3rdparty/javascriptcore/API/JSCallbackConstructor.cpp +++ b/src/3rdparty/javascriptcore/API/JSCallbackConstructor.cpp @@ -34,7 +34,7 @@ namespace JSC { -const ClassInfo JSCallbackConstructor::info = { "CallbackConstructor", 0, 0, 0 }; +const ClassInfo JSCallbackConstructor::info = { "CallbackConstructor", 0, 0 }; JSCallbackConstructor::JSCallbackConstructor(NonNullPassRefPtr structure, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback) : JSObject(structure) diff --git a/src/3rdparty/javascriptcore/API/JSCallbackFunction.cpp b/src/3rdparty/javascriptcore/API/JSCallbackFunction.cpp index c044661ff..33cb2d920 100644 --- a/src/3rdparty/javascriptcore/API/JSCallbackFunction.cpp +++ b/src/3rdparty/javascriptcore/API/JSCallbackFunction.cpp @@ -39,7 +39,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(JSCallbackFunction); -const ClassInfo JSCallbackFunction::info = { "CallbackFunction", &InternalFunction::info, 0, 0 }; +const ClassInfo JSCallbackFunction::info = { "CallbackFunction", &InternalFunction::info, 0 }; JSCallbackFunction::JSCallbackFunction(ExecState* exec, JSObjectCallAsFunctionCallback callback, const Identifier& name) : InternalFunction(&exec->globalData(), exec->lexicalGlobalObject()->callbackFunctionStructure(), name) diff --git a/src/3rdparty/javascriptcore/runtime/Arguments.cpp b/src/3rdparty/javascriptcore/runtime/Arguments.cpp index 9bb338808..e2a99057c 100644 --- a/src/3rdparty/javascriptcore/runtime/Arguments.cpp +++ b/src/3rdparty/javascriptcore/runtime/Arguments.cpp @@ -35,7 +35,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(Arguments); -const ClassInfo Arguments::info = { "Arguments", 0, 0, 0 }; +const ClassInfo Arguments::info = { "Arguments", 0, 0 }; Arguments::~Arguments() { diff --git a/src/3rdparty/javascriptcore/runtime/ArrayPrototype.cpp b/src/3rdparty/javascriptcore/runtime/ArrayPrototype.cpp index b51b5713a..218cfb134 100644 --- a/src/3rdparty/javascriptcore/runtime/ArrayPrototype.cpp +++ b/src/3rdparty/javascriptcore/runtime/ArrayPrototype.cpp @@ -78,7 +78,7 @@ static inline bool isNumericCompareFunction(ExecState* exec, CallType callType, // ------------------------------ ArrayPrototype ---------------------------- -const ClassInfo ArrayPrototype::info = {"Array", &JSArray::info, 0, ExecState::arrayTable}; +const ClassInfo ArrayPrototype::info = { "Array", &JSArray::info, ExecState::arrayTable }; /* Source for ArrayPrototype.lut.h @begin arrayTable 16 diff --git a/src/3rdparty/javascriptcore/runtime/BooleanObject.cpp b/src/3rdparty/javascriptcore/runtime/BooleanObject.cpp index d989da7a4..81063bd6b 100644 --- a/src/3rdparty/javascriptcore/runtime/BooleanObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/BooleanObject.cpp @@ -25,7 +25,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(BooleanObject); -const ClassInfo BooleanObject::info = { "Boolean", 0, 0, 0 }; +const ClassInfo BooleanObject::info = { "Boolean", 0, 0 }; BooleanObject::BooleanObject(NonNullPassRefPtr structure) : JSWrapperObject(structure) diff --git a/src/3rdparty/javascriptcore/runtime/ClassInfo.h b/src/3rdparty/javascriptcore/runtime/ClassInfo.h index acec4e78d..4902518cf 100644 --- a/src/3rdparty/javascriptcore/runtime/ClassInfo.h +++ b/src/3rdparty/javascriptcore/runtime/ClassInfo.h @@ -27,7 +27,6 @@ namespace JSC { - class HashEntry; struct HashTable; struct ClassInfo { @@ -49,10 +48,9 @@ namespace JSC { { if (classPropHashTableGetterFunction) return classPropHashTableGetterFunction(exec); - return staticPropHashTable; + return 0; } - const HashTable* staticPropHashTable; typedef const HashTable* (*ClassPropHashTableGetterFunction)(ExecState*); const ClassPropHashTableGetterFunction classPropHashTableGetterFunction; }; diff --git a/src/3rdparty/javascriptcore/runtime/DateInstance.cpp b/src/3rdparty/javascriptcore/runtime/DateInstance.cpp index 9c48b23bd..1f0663b4d 100644 --- a/src/3rdparty/javascriptcore/runtime/DateInstance.cpp +++ b/src/3rdparty/javascriptcore/runtime/DateInstance.cpp @@ -32,7 +32,7 @@ using namespace WTF; namespace JSC { -const ClassInfo DateInstance::info = {"Date", 0, 0, 0}; +const ClassInfo DateInstance::info = { "Date", 0, 0 }; DateInstance::DateInstance(ExecState* exec, NonNullPassRefPtr structure) : JSWrapperObject(structure) diff --git a/src/3rdparty/javascriptcore/runtime/DatePrototype.cpp b/src/3rdparty/javascriptcore/runtime/DatePrototype.cpp index 210be421d..98316ec06 100644 --- a/src/3rdparty/javascriptcore/runtime/DatePrototype.cpp +++ b/src/3rdparty/javascriptcore/runtime/DatePrototype.cpp @@ -256,7 +256,7 @@ static bool fillStructuresUsingDateArgs(ExecState *exec, const ArgList& args, in return ok; } -const ClassInfo DatePrototype::info = {"Date", &DateInstance::info, 0, ExecState::dateTable}; +const ClassInfo DatePrototype::info = { "Date", &DateInstance::info, ExecState::dateTable }; /* Source for DatePrototype.lut.h @begin dateTable diff --git a/src/3rdparty/javascriptcore/runtime/ErrorInstance.cpp b/src/3rdparty/javascriptcore/runtime/ErrorInstance.cpp index 86e1847e7..230798b68 100644 --- a/src/3rdparty/javascriptcore/runtime/ErrorInstance.cpp +++ b/src/3rdparty/javascriptcore/runtime/ErrorInstance.cpp @@ -23,7 +23,7 @@ namespace JSC { -const ClassInfo ErrorInstance::info = { "Error", 0, 0, 0 }; +const ClassInfo ErrorInstance::info = { "Error", 0, 0 }; ErrorInstance::ErrorInstance(NonNullPassRefPtr structure) : JSObject(structure) diff --git a/src/3rdparty/javascriptcore/runtime/InternalFunction.cpp b/src/3rdparty/javascriptcore/runtime/InternalFunction.cpp index 8caa5bf78..ed7cc9869 100644 --- a/src/3rdparty/javascriptcore/runtime/InternalFunction.cpp +++ b/src/3rdparty/javascriptcore/runtime/InternalFunction.cpp @@ -30,7 +30,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(InternalFunction); -const ClassInfo InternalFunction::info = { "Function", 0, 0, 0 }; +const ClassInfo InternalFunction::info = { "Function", 0, 0 }; const ClassInfo* InternalFunction::classInfo() const { diff --git a/src/3rdparty/javascriptcore/runtime/JSActivation.cpp b/src/3rdparty/javascriptcore/runtime/JSActivation.cpp index 878449d89..7ff0a99b0 100644 --- a/src/3rdparty/javascriptcore/runtime/JSActivation.cpp +++ b/src/3rdparty/javascriptcore/runtime/JSActivation.cpp @@ -37,7 +37,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(JSActivation); -const ClassInfo JSActivation::info = { "JSActivation", 0, 0, 0 }; +const ClassInfo JSActivation::info = { "JSActivation", 0, 0 }; JSActivation::JSActivation(CallFrame* callFrame, NonNullPassRefPtr functionExecutable) : Base(callFrame->globalData().activationStructure, new JSActivationData(functionExecutable, callFrame->registers())) diff --git a/src/3rdparty/javascriptcore/runtime/JSArray.cpp b/src/3rdparty/javascriptcore/runtime/JSArray.cpp index b2557288a..7aa2a6e32 100644 --- a/src/3rdparty/javascriptcore/runtime/JSArray.cpp +++ b/src/3rdparty/javascriptcore/runtime/JSArray.cpp @@ -86,7 +86,7 @@ ASSERT_CLASS_FITS_IN_CELL(JSArray); // as long as it is 1/8 full. If more sparse than that, we use a map. static const unsigned minDensityMultiplier = 8; -const ClassInfo JSArray::info = {"Array", 0, 0, 0}; +const ClassInfo JSArray::info = { "Array", 0, 0 }; static inline size_t storageSize(unsigned vectorLength) { diff --git a/src/3rdparty/javascriptcore/runtime/JSByteArray.cpp b/src/3rdparty/javascriptcore/runtime/JSByteArray.cpp index dce198d67..a060bbc30 100644 --- a/src/3rdparty/javascriptcore/runtime/JSByteArray.cpp +++ b/src/3rdparty/javascriptcore/runtime/JSByteArray.cpp @@ -33,7 +33,7 @@ using namespace WTF; namespace JSC { -const ClassInfo JSByteArray::s_defaultInfo = { "ByteArray", 0, 0, 0 }; +const ClassInfo JSByteArray::s_defaultInfo = { "ByteArray", 0, 0 }; JSByteArray::JSByteArray(ExecState* exec, NonNullPassRefPtr structure, ByteArray* storage, const JSC::ClassInfo* classInfo) : JSObject(structure) diff --git a/src/3rdparty/javascriptcore/runtime/JSFunction.cpp b/src/3rdparty/javascriptcore/runtime/JSFunction.cpp index 43c6c3cd5..fe76eebf2 100644 --- a/src/3rdparty/javascriptcore/runtime/JSFunction.cpp +++ b/src/3rdparty/javascriptcore/runtime/JSFunction.cpp @@ -43,7 +43,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(JSFunction); -const ClassInfo JSFunction::info = { "Function", &InternalFunction::info, 0, 0 }; +const ClassInfo JSFunction::info = { "Function", &InternalFunction::info, 0 }; bool JSFunction::isHostFunctionNonInline() const { diff --git a/src/3rdparty/javascriptcore/runtime/JSGlobalObject.cpp b/src/3rdparty/javascriptcore/runtime/JSGlobalObject.cpp index 217c6e980..ccb2cc7a8 100644 --- a/src/3rdparty/javascriptcore/runtime/JSGlobalObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/JSGlobalObject.cpp @@ -72,7 +72,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(JSGlobalObject); -const ClassInfo JSGlobalObject::info = { "CallbackGlobalObject", 0, 0, 0 }; +const ClassInfo JSGlobalObject::info = { "CallbackGlobalObject", 0, 0 }; static inline void markIfNeeded(MarkStack& markStack, JSValue v) { diff --git a/src/3rdparty/javascriptcore/runtime/JSONObject.cpp b/src/3rdparty/javascriptcore/runtime/JSONObject.cpp index a14ad6edc..216d353a5 100644 --- a/src/3rdparty/javascriptcore/runtime/JSONObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/JSONObject.cpp @@ -600,7 +600,7 @@ bool Stringifier::Holder::appendNextProperty(Stringifier& stringifier, StringBui // ------------------------------ JSONObject -------------------------------- -const ClassInfo JSONObject::info = { "JSON", 0, 0, ExecState::jsonTable }; +const ClassInfo JSONObject::info = { "JSON", 0, ExecState::jsonTable }; /* Source for JSONObject.lut.h @begin jsonTable diff --git a/src/3rdparty/javascriptcore/runtime/JSObject.cpp b/src/3rdparty/javascriptcore/runtime/JSObject.cpp index 3ce824d0b..5af89600e 100644 --- a/src/3rdparty/javascriptcore/runtime/JSObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/JSObject.cpp @@ -42,7 +42,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(JSObject); -const ClassInfo JSObject::info = { "CallbackObject", 0, 0, 0 }; +const ClassInfo JSObject::info = { "CallbackObject", 0, 0 }; static inline void getClassPropertyNames(ExecState* exec, const ClassInfo* classInfo, PropertyNameArray& propertyNames, EnumerationMode mode) { diff --git a/src/3rdparty/javascriptcore/runtime/MathObject.cpp b/src/3rdparty/javascriptcore/runtime/MathObject.cpp index 7ff5070b9..350023d88 100644 --- a/src/3rdparty/javascriptcore/runtime/MathObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/MathObject.cpp @@ -58,7 +58,7 @@ namespace JSC { // ------------------------------ MathObject -------------------------------- -const ClassInfo MathObject::info = { "Math", 0, 0, ExecState::mathTable }; +const ClassInfo MathObject::info = { "Math", 0, ExecState::mathTable }; /* Source for MathObject.lut.h @begin mathTable diff --git a/src/3rdparty/javascriptcore/runtime/NativeErrorConstructor.cpp b/src/3rdparty/javascriptcore/runtime/NativeErrorConstructor.cpp index 4d17eee82..74bd83ed9 100644 --- a/src/3rdparty/javascriptcore/runtime/NativeErrorConstructor.cpp +++ b/src/3rdparty/javascriptcore/runtime/NativeErrorConstructor.cpp @@ -30,7 +30,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(NativeErrorConstructor); -const ClassInfo NativeErrorConstructor::info = { "Function", &InternalFunction::info, 0, 0 }; +const ClassInfo NativeErrorConstructor::info = { "Function", &InternalFunction::info, 0 }; NativeErrorConstructor::NativeErrorConstructor(ExecState* exec, NonNullPassRefPtr structure, NativeErrorPrototype* nativeErrorPrototype) : InternalFunction(&exec->globalData(), structure, Identifier(exec, nativeErrorPrototype->getDirect(exec->propertyNames().name).getString(exec))) diff --git a/src/3rdparty/javascriptcore/runtime/NumberConstructor.cpp b/src/3rdparty/javascriptcore/runtime/NumberConstructor.cpp index 541544d47..4b6cacc5a 100644 --- a/src/3rdparty/javascriptcore/runtime/NumberConstructor.cpp +++ b/src/3rdparty/javascriptcore/runtime/NumberConstructor.cpp @@ -41,7 +41,7 @@ static JSValue numberConstructorMinValue(ExecState*, const Identifier&, const Pr namespace JSC { -const ClassInfo NumberConstructor::info = { "Function", &InternalFunction::info, 0, ExecState::numberTable }; +const ClassInfo NumberConstructor::info = { "Function", &InternalFunction::info, ExecState::numberTable }; /* Source for NumberConstructor.lut.h @begin numberTable diff --git a/src/3rdparty/javascriptcore/runtime/NumberObject.cpp b/src/3rdparty/javascriptcore/runtime/NumberObject.cpp index 43afc5a12..e691a6c7d 100644 --- a/src/3rdparty/javascriptcore/runtime/NumberObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/NumberObject.cpp @@ -29,7 +29,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(NumberObject); -const ClassInfo NumberObject::info = { "Number", 0, 0, 0 }; +const ClassInfo NumberObject::info = { "Number", 0, 0 }; NumberObject::NumberObject(NonNullPassRefPtr structure) : JSWrapperObject(structure) diff --git a/src/3rdparty/javascriptcore/runtime/RegExpConstructor.cpp b/src/3rdparty/javascriptcore/runtime/RegExpConstructor.cpp index a4c1c42b1..b35a0a5ef 100644 --- a/src/3rdparty/javascriptcore/runtime/RegExpConstructor.cpp +++ b/src/3rdparty/javascriptcore/runtime/RegExpConstructor.cpp @@ -62,7 +62,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(RegExpConstructor); -const ClassInfo RegExpConstructor::info = { "Function", &InternalFunction::info, 0, ExecState::regExpConstructorTable }; +const ClassInfo RegExpConstructor::info = { "Function", &InternalFunction::info, ExecState::regExpConstructorTable }; /* Source for RegExpConstructor.lut.h @begin regExpConstructorTable diff --git a/src/3rdparty/javascriptcore/runtime/RegExpObject.cpp b/src/3rdparty/javascriptcore/runtime/RegExpObject.cpp index c1e6775fe..cca0aa2ee 100644 --- a/src/3rdparty/javascriptcore/runtime/RegExpObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/RegExpObject.cpp @@ -45,7 +45,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(RegExpObject); -const ClassInfo RegExpObject::info = { "RegExp", 0, 0, ExecState::regExpTable }; +const ClassInfo RegExpObject::info = { "RegExp", 0, ExecState::regExpTable }; /* Source for RegExpObject.lut.h @begin regExpTable diff --git a/src/3rdparty/javascriptcore/runtime/RegExpPrototype.cpp b/src/3rdparty/javascriptcore/runtime/RegExpPrototype.cpp index 5824a1e0d..e393e05a6 100644 --- a/src/3rdparty/javascriptcore/runtime/RegExpPrototype.cpp +++ b/src/3rdparty/javascriptcore/runtime/RegExpPrototype.cpp @@ -44,7 +44,7 @@ static JSValue QT_FASTCALL regExpProtoFuncToString(ExecState*, JSObject*, JSValu // ECMA 15.10.5 -const ClassInfo RegExpPrototype::info = { "RegExpPrototype", 0, 0, 0 }; +const ClassInfo RegExpPrototype::info = { "RegExpPrototype", 0, 0 }; RegExpPrototype::RegExpPrototype(ExecState* exec, NonNullPassRefPtr structure, Structure* prototypeFunctionStructure) : JSObject(structure) diff --git a/src/3rdparty/javascriptcore/runtime/StringObject.cpp b/src/3rdparty/javascriptcore/runtime/StringObject.cpp index 7756ecc77..fdadae2b2 100644 --- a/src/3rdparty/javascriptcore/runtime/StringObject.cpp +++ b/src/3rdparty/javascriptcore/runtime/StringObject.cpp @@ -27,7 +27,7 @@ namespace JSC { ASSERT_CLASS_FITS_IN_CELL(StringObject); -const ClassInfo StringObject::info = { "String", 0, 0, 0 }; +const ClassInfo StringObject::info = { "String", 0, 0 }; StringObject::StringObject(ExecState* exec, NonNullPassRefPtr structure) : JSWrapperObject(structure) diff --git a/src/3rdparty/javascriptcore/runtime/StringPrototype.cpp b/src/3rdparty/javascriptcore/runtime/StringPrototype.cpp index 5b40031b3..9334bc27d 100644 --- a/src/3rdparty/javascriptcore/runtime/StringPrototype.cpp +++ b/src/3rdparty/javascriptcore/runtime/StringPrototype.cpp @@ -83,7 +83,7 @@ static JSValue QT_FASTCALL stringProtoFuncTrimRight(ExecState*, JSObject*, JSVal namespace JSC { -const ClassInfo StringPrototype::info = { "String", &StringObject::info, 0, ExecState::stringTable }; +const ClassInfo StringPrototype::info = { "String", &StringObject::info, ExecState::stringTable }; /* Source for StringPrototype.lut.h @begin stringTable 26 diff --git a/src/script/bridge/qscriptactivationobject.cpp b/src/script/bridge/qscriptactivationobject.cpp index 7ae50b813..6888ab66e 100644 --- a/src/script/bridge/qscriptactivationobject.cpp +++ b/src/script/bridge/qscriptactivationobject.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE namespace QScript { -const JSC::ClassInfo QScriptActivationObject::info = { "QScriptActivationObject", 0, 0, 0 }; +const JSC::ClassInfo QScriptActivationObject::info = { "QScriptActivationObject", 0, 0 }; QScriptActivationObject::QScriptActivationObject(JSC::ExecState *callFrame, JSC::JSObject *delegate) : JSC::JSVariableObject(callFrame->globalData().activationStructure, diff --git a/src/script/bridge/qscriptfunction.cpp b/src/script/bridge/qscriptfunction.cpp index e393b0d24..fbd7245f2 100644 --- a/src/script/bridge/qscriptfunction.cpp +++ b/src/script/bridge/qscriptfunction.cpp @@ -44,8 +44,8 @@ QT_BEGIN_NAMESPACE namespace QScript { -const JSC::ClassInfo FunctionWrapper::info = { "QtNativeFunctionWrapper", &PrototypeFunction::info, 0, 0 }; -const JSC::ClassInfo FunctionWithArgWrapper::info = { "QtNativeFunctionWithArgWrapper", &PrototypeFunction::info, 0, 0 }; +const JSC::ClassInfo FunctionWrapper::info = { "QtNativeFunctionWrapper", &PrototypeFunction::info, 0 }; +const JSC::ClassInfo FunctionWithArgWrapper::info = { "QtNativeFunctionWithArgWrapper", &PrototypeFunction::info, 0 }; FunctionWrapper::FunctionWrapper(JSC::ExecState *exec, int length, const JSC::Identifier &name, QScriptEngine::FunctionSignature function) diff --git a/src/script/bridge/qscriptobject.cpp b/src/script/bridge/qscriptobject.cpp index 5215b1053..a8b55db28 100644 --- a/src/script/bridge/qscriptobject.cpp +++ b/src/script/bridge/qscriptobject.cpp @@ -35,7 +35,7 @@ ASSERT_CLASS_FITS_IN_CELL(QT_PREPEND_NAMESPACE(QScriptObjectPrototype)); QT_BEGIN_NAMESPACE // masquerading as JSC::JSObject -const JSC::ClassInfo QScriptObject::info = { "Object", 0, 0, 0 }; +const JSC::ClassInfo QScriptObject::info = { "Object", 0, 0 }; QScriptObject::Data::~Data() { diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index 4336d2d8d..40a4e831e 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -1017,7 +1017,7 @@ JSC::JSValue QtFunction::execute(JSC::ExecState *exec, JSC::JSValue thisValue, meta, data->initialIndex, data->maybeOverloaded); } -const JSC::ClassInfo QtFunction::info = { "QtFunction", &InternalFunction::info, 0, 0 }; +const JSC::ClassInfo QtFunction::info = { "QtFunction", &InternalFunction::info, 0 }; JSC::JSValue QT_FASTCALL QtFunction::call(JSC::ExecState *exec, JSC::JSObject *callee, JSC::JSValue thisValue, const JSC::ArgList &args) @@ -1074,7 +1074,7 @@ int QtFunction::specificIndex(const QScriptContext *context) const return result.asInt32(); } -const JSC::ClassInfo QtPropertyFunction::info = { "QtPropertyFunction", &InternalFunction::info, 0, 0 }; +const JSC::ClassInfo QtPropertyFunction::info = { "QtPropertyFunction", &InternalFunction::info, 0 }; QtPropertyFunction::QtPropertyFunction(const QMetaObject *meta, int index, JSC::JSGlobalData *data, @@ -1801,7 +1801,7 @@ QObjectPrototype::QObjectPrototype(JSC::ExecState* exec, WTF::PassRefPtrstructure()->setHasGetterSetterProperties(true); } -const JSC::ClassInfo QMetaObjectWrapperObject::info = { "QMetaObject", 0, 0, 0 }; +const JSC::ClassInfo QMetaObjectWrapperObject::info = { "QMetaObject", 0, 0 }; QMetaObjectWrapperObject::QMetaObjectWrapperObject( JSC::ExecState *exec, const QMetaObject *metaObject, JSC::JSValue ctor, diff --git a/src/script/bridge/qscriptstaticscopeobject.cpp b/src/script/bridge/qscriptstaticscopeobject.cpp index 41e34943a..210420eb1 100644 --- a/src/script/bridge/qscriptstaticscopeobject.cpp +++ b/src/script/bridge/qscriptstaticscopeobject.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \sa QScriptContext::pushScope() */ -const JSC::ClassInfo QScriptStaticScopeObject::info = { "QScriptStaticScopeObject", 0, 0, 0 }; +const JSC::ClassInfo QScriptStaticScopeObject::info = { "QScriptStaticScopeObject", 0, 0 }; /*! Creates a static scope object with a fixed set of undeletable properties. -- 2.11.0