aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4qobjectwrapper_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-03-26 15:11:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-27 20:39:59 +0100
commit7ae796cb141b73a1b215b2b0fd64b7ffbbd1e510 (patch)
tree9f9b45d8f2036cc50b4298f8a3fdbe33d4d1eeda /src/qml/jsruntime/qv4qobjectwrapper_p.h
parentb9bf708bf85ba062d009ccf5e13e3494dc88a5d1 (diff)
Get rid of collectDeletables
The method is only required for the QObjectWrapper, but there we can instead simply register the deletable in the destroy method. Change-Id: I944319d327859cce33ac31a174e8d56fc4babfc1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper_p.h')
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper_p.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
index b11f0af93f..0af01c5614 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper_p.h
+++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
@@ -117,11 +117,7 @@ private:
static PropertyAttributes query(const Managed *, StringRef name);
static void advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uint *index, Property *p, PropertyAttributes *attributes);
static void markObjects(Managed *that, QV4::ExecutionEngine *e);
- static void collectDeletables(Managed *m, GCDeletable **deletable);
- static void destroy(Managed *that)
- {
- static_cast<QObjectWrapper *>(that)->~QObjectWrapper();
- }
+ static void destroy(Managed *that);
static ReturnedValue method_connect(CallContext *ctx);
static ReturnedValue method_disconnect(CallContext *ctx);