aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-01-10 20:51:15 +0100
committerLars Knoll <lars.knoll@digia.com>2015-01-21 13:18:47 +0100
commit36662b60b09f636c3623057f8116e862f94ff440 (patch)
tree1a8a1ee74db89745ea3e327f70229b6b29bb2e62 /src/qml/qml
parent85bf8d732b9651ce7b88d5464b8b3aae138e1893 (diff)
Remove all the setVTable() calls that aren't required anymore
The memory manager's allocation methods now set this up correctly for us :) Change-Id: I8492bf732df601f95a1a851fb3804127ffc83935 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp2
-rw-r--r--src/qml/qml/qqmlcontextwrapper.cpp2
-rw-r--r--src/qml/qml/qqmllistwrapper.cpp2
-rw-r--r--src/qml/qml/qqmllocale_p.h1
-rw-r--r--src/qml/qml/qqmltypewrapper.cpp1
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper.cpp2
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp10
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp3
8 files changed, 0 insertions, 23 deletions
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()