diff options
39 files changed, 2 insertions, 100 deletions
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp index 84b0b2387a..2de47b232a 100644 --- a/src/imports/localstorage/plugin.cpp +++ b/src/imports/localstorage/plugin.cpp @@ -138,7 +138,6 @@ DEFINE_OBJECT_VTABLE(QV4::QQmlSqlDatabaseWrapper); QV4::Heap::QQmlSqlDatabaseWrapper::QQmlSqlDatabaseWrapper(ExecutionEngine *e) : QV4::Heap::Object(e) { - setVTable(QV4::QQmlSqlDatabaseWrapper::staticVTable()); type = Database; } diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index b9cf926052..a83c2052fc 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -270,7 +270,6 @@ struct QV4ParticleData : public QV4::Object : QV4::Heap::Object(engine) , datum(datum) { - setVTable(QV4ParticleData::staticVTable()); } QQuickParticleData* datum;//TODO: Guard needed? }; diff --git a/src/qml/jsruntime/qv4argumentsobject_p.h b/src/qml/jsruntime/qv4argumentsobject_p.h index bf5b532216..ca7fdffa6c 100644 --- a/src/qml/jsruntime/qv4argumentsobject_p.h +++ b/src/qml/jsruntime/qv4argumentsobject_p.h @@ -79,7 +79,6 @@ Heap::ArgumentsGetterFunction::ArgumentsGetterFunction(QV4::ExecutionContext *sc : Heap::FunctionObject(scope) , index(index) { - setVTable(QV4::ArgumentsGetterFunction::staticVTable()); } struct ArgumentsSetterFunction: FunctionObject @@ -95,7 +94,6 @@ Heap::ArgumentsSetterFunction::ArgumentsSetterFunction(QV4::ExecutionContext *sc : Heap::FunctionObject(scope) , index(index) { - setVTable(QV4::ArgumentsSetterFunction::staticVTable()); } diff --git a/src/qml/jsruntime/qv4arraybuffer.cpp b/src/qml/jsruntime/qv4arraybuffer.cpp index 665d7cfced..60ab527a42 100644 --- a/src/qml/jsruntime/qv4arraybuffer.cpp +++ b/src/qml/jsruntime/qv4arraybuffer.cpp @@ -42,7 +42,6 @@ DEFINE_OBJECT_VTABLE(ArrayBuffer); Heap::ArrayBufferCtor::ArrayBufferCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("ArrayBuffer")) { - setVTable(QV4::ArrayBufferCtor::staticVTable()); } ReturnedValue ArrayBufferCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4arraydata_p.h b/src/qml/jsruntime/qv4arraydata_p.h index e32aea7423..f78d0234cc 100644 --- a/src/qml/jsruntime/qv4arraydata_p.h +++ b/src/qml/jsruntime/qv4arraydata_p.h @@ -275,7 +275,6 @@ namespace Heap { inline SparseArrayData::SparseArrayData(ExecutionEngine *engine) : ArrayData(engine->emptyClass) { - setVTable(QV4::SparseArrayData::staticVTable()); } inline SparseArrayData::~SparseArrayData() diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index 1186afb77c..078b7fee70 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -45,7 +45,6 @@ DEFINE_OBJECT_VTABLE(ArrayCtor); Heap::ArrayCtor::ArrayCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("Array")) { - setVTable(QV4::ArrayCtor::staticVTable()); } ReturnedValue ArrayCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4booleanobject.cpp b/src/qml/jsruntime/qv4booleanobject.cpp index 6de7059034..0b3ae4e705 100644 --- a/src/qml/jsruntime/qv4booleanobject.cpp +++ b/src/qml/jsruntime/qv4booleanobject.cpp @@ -41,7 +41,6 @@ DEFINE_OBJECT_VTABLE(BooleanObject); Heap::BooleanCtor::BooleanCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("Boolean")) { - setVTable(QV4::BooleanCtor::staticVTable()); } ReturnedValue BooleanCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4dataview.cpp b/src/qml/jsruntime/qv4dataview.cpp index 6bbf9eeade..f50ce768ae 100644 --- a/src/qml/jsruntime/qv4dataview.cpp +++ b/src/qml/jsruntime/qv4dataview.cpp @@ -44,7 +44,6 @@ DEFINE_OBJECT_VTABLE(DataView); Heap::DataViewCtor::DataViewCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("DataView")) { - setVTable(QV4::DataViewCtor::staticVTable()); } ReturnedValue DataViewCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index 7c845fd068..bfc97b12af 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -633,7 +633,6 @@ DEFINE_OBJECT_VTABLE(DateObject); Heap::DateObject::DateObject(QV4::ExecutionEngine *engine, const QDateTime &date) : Heap::Object(engine->emptyClass, engine->datePrototype.asObject()) { - setVTable(QV4::DateObject::staticVTable()); value.setDouble(date.isValid() ? date.toMSecsSinceEpoch() : qSNaN()); } @@ -647,7 +646,6 @@ DEFINE_OBJECT_VTABLE(DateCtor); Heap::DateCtor::DateCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("Date")) { - setVTable(QV4::DateCtor::staticVTable()); } ReturnedValue DateCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp index 2eceab91d6..bf966e5028 100644 --- a/src/qml/jsruntime/qv4errorobject.cpp +++ b/src/qml/jsruntime/qv4errorobject.cpp @@ -248,13 +248,11 @@ DEFINE_OBJECT_VTABLE(URIErrorCtor); Heap::ErrorCtor::ErrorCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("Error")) { - setVTable(QV4::ErrorCtor::staticVTable()); } Heap::ErrorCtor::ErrorCtor(QV4::ExecutionContext *scope, const QString &name) : Heap::FunctionObject(scope, name) { - setVTable(QV4::ErrorCtor::staticVTable()); } ReturnedValue ErrorCtor::construct(Managed *m, CallData *callData) @@ -272,7 +270,6 @@ ReturnedValue ErrorCtor::call(Managed *that, CallData *callData) Heap::EvalErrorCtor::EvalErrorCtor(QV4::ExecutionContext *scope) : Heap::ErrorCtor(scope, QStringLiteral("EvalError")) { - setVTable(QV4::EvalErrorCtor::staticVTable()); } ReturnedValue EvalErrorCtor::construct(Managed *m, CallData *callData) @@ -285,7 +282,6 @@ ReturnedValue EvalErrorCtor::construct(Managed *m, CallData *callData) Heap::RangeErrorCtor::RangeErrorCtor(QV4::ExecutionContext *scope) : Heap::ErrorCtor(scope, QStringLiteral("RangeError")) { - setVTable(QV4::RangeErrorCtor::staticVTable()); } ReturnedValue RangeErrorCtor::construct(Managed *m, CallData *callData) @@ -298,7 +294,6 @@ ReturnedValue RangeErrorCtor::construct(Managed *m, CallData *callData) Heap::ReferenceErrorCtor::ReferenceErrorCtor(QV4::ExecutionContext *scope) : Heap::ErrorCtor(scope, QStringLiteral("ReferenceError")) { - setVTable(QV4::ReferenceErrorCtor::staticVTable()); } ReturnedValue ReferenceErrorCtor::construct(Managed *m, CallData *callData) @@ -311,7 +306,6 @@ ReturnedValue ReferenceErrorCtor::construct(Managed *m, CallData *callData) Heap::SyntaxErrorCtor::SyntaxErrorCtor(QV4::ExecutionContext *scope) : Heap::ErrorCtor(scope, QStringLiteral("SyntaxError")) { - setVTable(QV4::SyntaxErrorCtor::staticVTable()); } ReturnedValue SyntaxErrorCtor::construct(Managed *m, CallData *callData) @@ -324,7 +318,6 @@ ReturnedValue SyntaxErrorCtor::construct(Managed *m, CallData *callData) Heap::TypeErrorCtor::TypeErrorCtor(QV4::ExecutionContext *scope) : Heap::ErrorCtor(scope, QStringLiteral("TypeError")) { - setVTable(QV4::TypeErrorCtor::staticVTable()); } ReturnedValue TypeErrorCtor::construct(Managed *m, CallData *callData) @@ -337,7 +330,6 @@ ReturnedValue TypeErrorCtor::construct(Managed *m, CallData *callData) Heap::URIErrorCtor::URIErrorCtor(QV4::ExecutionContext *scope) : Heap::ErrorCtor(scope, QStringLiteral("URIError")) { - setVTable(QV4::URIErrorCtor::staticVTable()); } ReturnedValue URIErrorCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 3f1f9e189c..5c5674d380 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -216,7 +216,6 @@ DEFINE_OBJECT_VTABLE(FunctionCtor); Heap::FunctionCtor::FunctionCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("Function")) { - setVTable(QV4::FunctionCtor::staticVTable()); } // 15.3.2 @@ -390,7 +389,6 @@ DEFINE_OBJECT_VTABLE(ScriptFunction); Heap::ScriptFunction::ScriptFunction(QV4::ExecutionContext *scope, Function *function) : Heap::SimpleScriptFunction(scope, function, true) { - setVTable(QV4::ScriptFunction::staticVTable()); } ReturnedValue ScriptFunction::construct(Managed *that, CallData *callData) @@ -452,8 +450,6 @@ DEFINE_OBJECT_VTABLE(SimpleScriptFunction); Heap::SimpleScriptFunction::SimpleScriptFunction(QV4::ExecutionContext *scope, Function *function, bool createProto) : Heap::FunctionObject(scope, function, createProto) { - setVTable(QV4::SimpleScriptFunction::staticVTable()); - this->function = function; function->compilationUnit->addref(); Q_ASSERT(function); @@ -570,7 +566,6 @@ Heap::BuiltinFunction::BuiltinFunction(QV4::ExecutionContext *scope, QV4::String : Heap::FunctionObject(scope, name) , code(code) { - setVTable(QV4::BuiltinFunction::staticVTable()); } ReturnedValue BuiltinFunction::construct(Managed *f, CallData *) @@ -631,7 +626,6 @@ Heap::BoundFunction::BoundFunction(QV4::ExecutionContext *scope, QV4::FunctionOb , boundArgs(boundArgs ? boundArgs->d() : 0) { this->boundThis = boundThis; - setVTable(QV4::BoundFunction::staticVTable()); Scope s(scope); ScopedObject f(s, this); diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index e806888243..c00597d469 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -198,7 +198,6 @@ Heap::IndexedBuiltinFunction::IndexedBuiltinFunction(QV4::ExecutionContext *scop code(code) , index(index) { - setVTable(QV4::IndexedBuiltinFunction::staticVTable()); } diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index c521337ce6..823eeda76d 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -341,7 +341,6 @@ DEFINE_OBJECT_VTABLE(EvalFunction); Heap::EvalFunction::EvalFunction(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, scope->d()->engine->id_eval) { - setVTable(QV4::EvalFunction::staticVTable()); Scope s(scope); ScopedFunctionObject f(s, this); f->defineReadonlyProperty(s.engine->id_length, Primitive::fromInt32(1)); diff --git a/src/qml/jsruntime/qv4managed.cpp b/src/qml/jsruntime/qv4managed.cpp index 9aaf73d02f..b783d70163 100644 --- a/src/qml/jsruntime/qv4managed.cpp +++ b/src/qml/jsruntime/qv4managed.cpp @@ -144,19 +144,6 @@ QString Managed::className() const return QString::fromLatin1(s); } -void Managed::setVTable(const ManagedVTable *vt) -{ - d()->vtable = vt; - Q_ASSERT(internalClass()); -} - -void Heap::Base::setVTable(const ManagedVTable *vt) -{ - vtable = vt; - Q_ASSERT(internalClass); -} - - bool Managed::isEqualTo(Managed *, Managed *) { return false; diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 69d81442b7..99d6cdafbb 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -278,8 +278,6 @@ public: QString className() const; - void setVTable(const ManagedVTable *vt); - bool isEqualTo(const Managed *other) const { return d()->vtable->isEqualTo(const_cast<Managed *>(this), const_cast<Managed *>(other)); } diff --git a/src/qml/jsruntime/qv4numberobject.cpp b/src/qml/jsruntime/qv4numberobject.cpp index 404ad8f61e..67bf92d552 100644 --- a/src/qml/jsruntime/qv4numberobject.cpp +++ b/src/qml/jsruntime/qv4numberobject.cpp @@ -48,7 +48,6 @@ DEFINE_OBJECT_VTABLE(NumberObject); Heap::NumberCtor::NumberCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("Number")) { - setVTable(QV4::NumberCtor::staticVTable()); } ReturnedValue NumberCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4objectiterator_p.h b/src/qml/jsruntime/qv4objectiterator_p.h index f1f70d07a2..cee7024df8 100644 --- a/src/qml/jsruntime/qv4objectiterator_p.h +++ b/src/qml/jsruntime/qv4objectiterator_p.h @@ -89,7 +89,6 @@ Heap::ForEachIteratorObject::ForEachIteratorObject(QV4::ExecutionEngine *engine, : Heap::Object(engine) , it(engine, workArea, workArea + 1, o, ObjectIterator::EnumerableOnly|ObjectIterator::WithProtoChain) { - setVTable(QV4::ForEachIteratorObject::staticVTable()); } diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 445d4f7a68..8762935268 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -52,7 +52,6 @@ DEFINE_OBJECT_VTABLE(ObjectCtor); Heap::ObjectCtor::ObjectCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("Object")) { - setVTable(QV4::ObjectCtor::staticVTable()); } ReturnedValue ObjectCtor::construct(Managed *that, CallData *callData) diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index 1248991789..1d6a89a647 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -236,7 +236,6 @@ Heap::QObjectWrapper::QObjectWrapper(ExecutionEngine *engine, QObject *object) : Heap::Object(engine) , object(object) { - setVTable(QV4::QObjectWrapper::staticVTable()); } void QObjectWrapper::initializeBindings(ExecutionEngine *engine) @@ -1761,7 +1760,6 @@ ReturnedValue QObjectMethod::create(ExecutionContext *scope, QQmlValueTypeWrappe Heap::QObjectMethod::QObjectMethod(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope) { - setVTable(QV4::QObjectMethod::staticVTable()); } const QMetaObject *Heap::QObjectMethod::metaObject() @@ -1904,7 +1902,6 @@ Heap::QmlSignalHandler::QmlSignalHandler(QV4::ExecutionEngine *engine, QObject * , object(object) , signalIndex(signalIndex) { - setVTable(QV4::QmlSignalHandler::staticVTable()); } DEFINE_OBJECT_VTABLE(QmlSignalHandler); diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp index c9c220f74a..533703ff29 100644 --- a/src/qml/jsruntime/qv4regexp.cpp +++ b/src/qml/jsruntime/qv4regexp.cpp @@ -91,7 +91,6 @@ Heap::RegExp::RegExp(ExecutionEngine* engine, const QString &pattern, bool ignor , ignoreCase(ignoreCase) , multiLine(multiline) { - setVTable(QV4::RegExp::staticVTable()); const char* error = 0; JSC::Yarr::YarrPattern yarrPattern(WTF::String(pattern), ignoreCase, multiline, &error); if (error) diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index 0081664e3b..cd1d1563fa 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -68,8 +68,6 @@ DEFINE_OBJECT_VTABLE(RegExpPrototype); Heap::RegExpObject::RegExpObject(InternalClass *ic, QV4::Object *prototype) : Heap::Object(ic, prototype) { - setVTable(QV4::RegExpObject::staticVTable()); - Scope scope(ic->engine); Scoped<QV4::RegExpObject> o(scope, this); o->d()->value = QV4::RegExp::create(ic->engine, QString(), false, false); @@ -82,8 +80,6 @@ Heap::RegExpObject::RegExpObject(QV4::ExecutionEngine *engine, QV4::RegExp *valu , value(value->d()) , global(global) { - setVTable(QV4::RegExpObject::staticVTable()); - Scope scope(engine); Scoped<QV4::RegExpObject> o(scope, this); o->init(engine); @@ -95,8 +91,6 @@ Heap::RegExpObject::RegExpObject(QV4::ExecutionEngine *engine, QV4::RegExp *valu Heap::RegExpObject::RegExpObject(QV4::ExecutionEngine *engine, const QRegExp &re) : Heap::Object(engine->emptyClass, engine->regExpPrototype.asObject()) { - setVTable(QV4::RegExpObject::staticVTable()); - value = 0; global = false; @@ -232,7 +226,6 @@ DEFINE_OBJECT_VTABLE(RegExpCtor); Heap::RegExpCtor::RegExpCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("RegExp")) { - setVTable(QV4::RegExpCtor::staticVTable()); clearLastMatch(); } diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index e8471ca019..f7afd004b9 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -75,7 +75,6 @@ Heap::CompilationUnitHolder::CompilationUnitHolder(ExecutionEngine *engine, Comp : Heap::Object(engine) , unit(unit) { - setVTable(QV4::CompilationUnitHolder::staticVTable()); } } @@ -93,7 +92,6 @@ Heap::QmlBindingWrapper::QmlBindingWrapper(QV4::ExecutionContext *scope, Functio { Q_ASSERT(scope->inUse()); - setVTable(QV4::QmlBindingWrapper::staticVTable()); function = f; if (function) function->compilationUnit->addref(); @@ -114,8 +112,6 @@ Heap::QmlBindingWrapper::QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::Ob { Q_ASSERT(scope->inUse()); - setVTable(QV4::QmlBindingWrapper::staticVTable()); - Scope s(scope); Scoped<QV4::QmlBindingWrapper> o(s, this); diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 617670e326..5ce4b5b33c 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -88,7 +88,6 @@ Heap::StringObject::StringObject(ExecutionEngine *engine, const ValueRef val) value = val; Q_ASSERT(value.isString()); tmpProperty.value = Primitive::undefinedValue(); - setVTable(QV4::StringObject::staticVTable()); Scope scope(engine); ScopedObject s(scope, this); @@ -163,7 +162,6 @@ DEFINE_OBJECT_VTABLE(StringCtor); Heap::StringCtor::StringCtor(QV4::ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("String")) { - setVTable(QV4::StringCtor::staticVTable()); } ReturnedValue StringCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4typedarray.cpp b/src/qml/jsruntime/qv4typedarray.cpp index 7aff0b8d61..11b675646d 100644 --- a/src/qml/jsruntime/qv4typedarray.cpp +++ b/src/qml/jsruntime/qv4typedarray.cpp @@ -197,7 +197,6 @@ Heap::TypedArrayCtor::TypedArrayCtor(QV4::ExecutionContext *scope, TypedArray::T : Heap::FunctionObject(scope, QLatin1String(operations[t].name)) , type(t) { - setVTable(QV4::TypedArrayCtor::staticVTable()); } ReturnedValue TypedArrayCtor::construct(Managed *m, CallData *callData) diff --git a/src/qml/jsruntime/qv4typedarray_p.h b/src/qml/jsruntime/qv4typedarray_p.h index adc3368243..6c9bcfbba4 100644 --- a/src/qml/jsruntime/qv4typedarray_p.h +++ b/src/qml/jsruntime/qv4typedarray_p.h @@ -133,7 +133,6 @@ Heap::TypedArrayPrototype::TypedArrayPrototype(ExecutionEngine *e, TypedArray::T : Heap::Object(e) , type(t) { - setVTable(QV4::TypedArrayPrototype::staticVTable()); } } // namespace QV4 diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index 8ae8676b7b..5a4c1b9ca5 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -61,7 +61,6 @@ struct Q_QML_EXPORT Base { }; InternalClass *internalClass; - void setVTable(const ManagedVTable *vt); inline ReturnedValue asReturnedValue() const; inline void mark(QV4::ExecutionEngine *engine); diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 8f146b7a8a..5aed1bc0dc 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1481,8 +1481,6 @@ QV4::Heap::QmlIncubatorObject::QmlIncubatorObject(ExecutionEngine *engine, QQmlI , qmlGlobal(QV4::Primitive::undefinedValue()) , statusChanged(QV4::Primitive::undefinedValue()) { - setVTable(QV4::QmlIncubatorObject::staticVTable()); - incubator.reset(new QQmlComponentIncubator(this, m)); } diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index 78a77f79d4..dda5187b4f 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -61,7 +61,6 @@ Heap::QmlContextWrapper::QmlContextWrapper(QV4::ExecutionEngine *engine, QQmlCon , context(context) , scopeObject(scopeObject) { - setVTable(QV4::QmlContextWrapper::staticVTable()); } Heap::QmlContextWrapper::~QmlContextWrapper() @@ -425,7 +424,6 @@ Heap::QQmlIdObjectsArray::QQmlIdObjectsArray(ExecutionEngine *engine, QV4::QmlCo : Heap::Object(engine) , contextWrapper(contextWrapper->d()) { - setVTable(QV4::QQmlIdObjectsArray::staticVTable()); } ReturnedValue QQmlIdObjectsArray::getIndexed(Managed *m, uint index, bool *hasProperty) diff --git a/src/qml/qml/qqmllistwrapper.cpp b/src/qml/qml/qqmllistwrapper.cpp index b2e84c0724..022a60faf4 100644 --- a/src/qml/qml/qqmllistwrapper.cpp +++ b/src/qml/qml/qqmllistwrapper.cpp @@ -48,8 +48,6 @@ DEFINE_OBJECT_VTABLE(QmlListWrapper); Heap::QmlListWrapper::QmlListWrapper(ExecutionEngine *engine) : Heap::Object(engine) { - setVTable(QV4::QmlListWrapper::staticVTable()); - QV4::Scope scope(engine); QV4::ScopedObject o(scope, this); o->setArrayType(Heap::ArrayData::Custom); diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index f294137340..1b9afd1c81 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -178,7 +178,6 @@ struct QQmlLocaleData : public QV4::Object Heap::QQmlLocaleData::QQmlLocaleData(ExecutionEngine *engine) : Heap::Object(engine) { - setVTable(QV4::QQmlLocaleData::staticVTable()); } } diff --git a/src/qml/qml/qqmltypewrapper.cpp b/src/qml/qml/qqmltypewrapper.cpp index 1cb98fd996..a72950e7d8 100644 --- a/src/qml/qml/qqmltypewrapper.cpp +++ b/src/qml/qml/qqmltypewrapper.cpp @@ -52,7 +52,6 @@ Heap::QmlTypeWrapper::QmlTypeWrapper(ExecutionEngine *engine) : Heap::Object(engine) , mode(IncludeEnums) { - setVTable(QV4::QmlTypeWrapper::staticVTable()); } Heap::QmlTypeWrapper::~QmlTypeWrapper() diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 76be5ae895..d36549fcf5 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -81,7 +81,6 @@ Heap::QQmlValueTypeWrapper::QQmlValueTypeWrapper(ExecutionEngine *engine) : Heap::Object(engine) , gadgetPtr(0) { - setVTable(QV4::QQmlValueTypeWrapper::staticVTable()); } Heap::QQmlValueTypeWrapper::~QQmlValueTypeWrapper() @@ -107,7 +106,6 @@ QVariant Heap::QQmlValueTypeWrapper::toVariant() const Heap::QQmlValueTypeReference::QQmlValueTypeReference(ExecutionEngine *engine) : Heap::QQmlValueTypeWrapper(engine) { - setVTable(QV4::QQmlValueTypeReference::staticVTable()); } bool QQmlValueTypeReference::readReferenceValue() const diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 552fcd3975..6d730970b3 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -230,8 +230,6 @@ Heap::NamedNodeMap::NamedNodeMap(ExecutionEngine *engine, NodeImpl *data, const , list(list) , d(data) { - setVTable(QV4::NamedNodeMap::staticVTable()); - if (d) d->addref(); } @@ -257,8 +255,6 @@ Heap::NodeList::NodeList(ExecutionEngine *engine, NodeImpl *data) : Heap::Object(engine) , d(data) { - setVTable(QV4::NodeList::staticVTable()); - if (d) d->addref(); } @@ -299,8 +295,6 @@ public: Heap::NodePrototype::NodePrototype(ExecutionEngine *engine) : Heap::Object(engine) { - setVTable(QV4::NodePrototype::staticVTable()); - Scope scope(engine); ScopedObject o(scope, this); @@ -339,8 +333,6 @@ Heap::Node::Node(ExecutionEngine *engine, NodeImpl *data) : Heap::Object(engine) , d(data) { - setVTable(QV4::Node::staticVTable()); - if (d) d->addref(); } @@ -1609,7 +1601,6 @@ Heap::QQmlXMLHttpRequestWrapper::QQmlXMLHttpRequestWrapper(ExecutionEngine *engi : Heap::Object(engine) , request(request) { - setVTable(QV4::QQmlXMLHttpRequestWrapper::staticVTable()); } struct QQmlXMLHttpRequestCtor : public FunctionObject @@ -1662,7 +1653,6 @@ DEFINE_OBJECT_VTABLE(QQmlXMLHttpRequestWrapper); Heap::QQmlXMLHttpRequestCtor::QQmlXMLHttpRequestCtor(ExecutionEngine *engine) : Heap::FunctionObject(engine->rootContext(), QStringLiteral("XMLHttpRequest")) { - setVTable(QV4::QQmlXMLHttpRequestCtor::staticVTable()); Scope scope(engine); Scoped<QV4::QQmlXMLHttpRequestCtor> ctor(scope, this); diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 140572a99a..360c560d0b 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -81,8 +81,6 @@ struct StaticQtMetaObject : public QObject Heap::QtObject::QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine) : Heap::Object(v4) { - setVTable(QV4::QtObject::staticVTable()); - Scope scope(v4); ScopedObject o(scope, this); @@ -1149,7 +1147,6 @@ Heap::QQmlBindingFunction::QQmlBindingFunction(QV4::FunctionObject *originalFunc : QV4::Heap::FunctionObject(originalFunction->scope(), originalFunction->name()) , originalFunction(originalFunction->d()) { - setVTable(QV4::QQmlBindingFunction::staticVTable()); } void QQmlBindingFunction::initBindingLocation() diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index 8309df8403..8d9a06ff75 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -110,7 +110,6 @@ Heap::DelegateModelGroupFunction::DelegateModelGroupFunction(QV4::ExecutionConte , flag(flag) , code(code) { - setVTable(QV4::DelegateModelGroupFunction::staticVTable()); } } @@ -3263,7 +3262,6 @@ struct QQmlDelegateModelGroupChange : QV4::Object QV4::Heap::QQmlDelegateModelGroupChange::QQmlDelegateModelGroupChange(QV4::ExecutionEngine *engine) : QV4::Heap::Object(engine) { - setVTable(::QQmlDelegateModelGroupChange::staticVTable()); } DEFINE_OBJECT_VTABLE(QQmlDelegateModelGroupChange); @@ -3325,7 +3323,6 @@ QV4::Heap::QQmlDelegateModelGroupChangeArray::QQmlDelegateModelGroupChangeArray( : QV4::Heap::Object(engine) , changes(changes) { - setVTable(::QQmlDelegateModelGroupChangeArray::staticVTable()); QV4::Scope scope(engine); QV4::ScopedObject o(scope, this); o->setArrayType(QV4::Heap::ArrayData::Custom); diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h index 8635795820..ced30b9d1b 100644 --- a/src/qml/types/qqmldelegatemodel_p_p.h +++ b/src/qml/types/qqmldelegatemodel_p_p.h @@ -172,7 +172,6 @@ QV4::Heap::QQmlDelegateModelItemObject::QQmlDelegateModelItemObject(QV4::Executi : QV4::Heap::Object(engine) , item(item) { - setVTable(::QQmlDelegateModelItemObject::staticVTable()); } diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index bc5fd8504f..59e4b021e8 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -557,7 +557,6 @@ struct QQuickJSContext2D : public QV4::Object QV4::Heap::QQuickJSContext2D::QQuickJSContext2D(QV4::ExecutionEngine *engine) : QV4::Heap::Object(engine) { - setVTable(::QQuickJSContext2D::staticVTable()); } DEFINE_OBJECT_VTABLE(QQuickJSContext2D); @@ -683,7 +682,6 @@ QV4::Heap::QQuickContext2DStyle::QQuickContext2DStyle(QV4::ExecutionEngine *e) { patternRepeatX = false; patternRepeatY = false; - setVTable(::QQuickContext2DStyle::staticVTable()); } DEFINE_OBJECT_VTABLE(QQuickContext2DStyle); @@ -897,7 +895,6 @@ struct QQuickJSContext2DPixelData : public QV4::Object QV4::Heap::QQuickJSContext2DPixelData::QQuickJSContext2DPixelData(QV4::ExecutionEngine *engine) : QV4::Heap::Object(engine) { - setVTable(::QQuickJSContext2DPixelData::staticVTable()); QV4::Scope scope(engine); QV4::ScopedObject o(scope, this); o->setArrayType(QV4::Heap::ArrayData::Custom); @@ -922,7 +919,6 @@ struct QQuickJSContext2DImageData : public QV4::Object QV4::Heap::QQuickJSContext2DImageData::QQuickJSContext2DImageData(QV4::ExecutionEngine *engine) : QV4::Heap::Object(engine) { - setVTable(::QQuickJSContext2DImageData::staticVTable()); pixelData = QV4::Primitive::undefinedValue(); QV4::Scope scope(engine); diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index 1017913469..bc55a826e8 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -120,7 +120,6 @@ Heap::QQuickRootItemMarker::QQuickRootItemMarker(QV4::ExecutionEngine *engine, Q : Heap::Object(engine) , window(window) { - setVTable(QV4::QQuickRootItemMarker::staticVTable()); } } diff --git a/tools/qmljs/qmljs.cpp b/tools/qmljs/qmljs.cpp index f4a561fac6..ef0a3622f9 100644 --- a/tools/qmljs/qmljs.cpp +++ b/tools/qmljs/qmljs.cpp @@ -66,8 +66,8 @@ struct Print: FunctionObject { struct Data : Heap::FunctionObject { Data(ExecutionContext *scope) - : Heap::FunctionObject(scope, QStringLiteral("print")) { - setVTable(staticVTable()); + : Heap::FunctionObject(scope, QStringLiteral("print")) + { } }; V4_OBJECT(FunctionObject) @@ -93,7 +93,6 @@ struct GC: public FunctionObject Data(ExecutionContext *scope) : Heap::FunctionObject(scope, QStringLiteral("gc")) { - setVTable(staticVTable()); } }; |