diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-13 21:38:25 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-21 19:32:23 +0100 |
| commit | 2784a68d64519ccc5d01b6c1378207572cf1ebcd (patch) | |
| tree | b66287687e7311a24253d60e18bcba829fb475ad /src/qml/qml/qqmllocale_p.h | |
| parent | 2cb6d1bf32e017026f618dcfdbef3980f5363656 (diff) | |
Cleanup destruction of heap objects
Generate the code from a macro instead of duplicating boiler
plate code. Operate on Heap::Base instead of Managed.
Change-Id: I84c5a705980899be3e5b931a093645e50d3923bf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllocale_p.h')
| -rw-r--r-- | src/qml/qml/qqmllocale_p.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 34224b44ff..744d82a6d2 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -135,6 +135,7 @@ struct QQmlLocaleData : Object { struct QQmlLocaleData : public QV4::Object { V4_OBJECT2(QQmlLocaleData, Object) + V4_NEEDS_DESTROY static QLocale *getThisLocale(QV4::CallContext *ctx) { QV4::Object *o = ctx->d()->callData->thisObject.asObject(); @@ -173,12 +174,6 @@ struct QQmlLocaleData : public QV4::Object static QV4::ReturnedValue method_get_exponential(QV4::CallContext *ctx); static QV4::ReturnedValue method_get_amText(QV4::CallContext *ctx); static QV4::ReturnedValue method_get_pmText(QV4::CallContext *ctx); - -private: - static void destroy(Managed *that) - { - static_cast<QQmlLocaleData *>(that)->d()->~Data(); - } }; Heap::QQmlLocaleData::QQmlLocaleData(ExecutionEngine *engine) |