diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:24:13 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:15 +0100 |
| commit | 84aae25c0b3003fb846568cf26a2c7150db14d9d (patch) | |
| tree | 53a78f1a54f6605008668a1bbe21f81bec3e13e4 /src/qml/jsruntime/qv4managed_p.h | |
| parent | ec8f1f68d623ae68cc7d79e19067884532e3db6f (diff) | |
Refactor ExecutionContexts
Move the Data class out into the Heap namespace.
Change-Id: I2b798deb53812a08155c92a0e6ef2dcd2ea137b8
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4managed_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4managed_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index cc7ce9d6b9..1cf90cba48 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -69,17 +69,18 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {} const Data *d() const { return &static_cast<const Data &>(Managed::data); } \ Data *d() { return &static_cast<Data &>(Managed::data); } -#define V4_MANAGED2(Data, superClass) \ +#define V4_MANAGED2(DataClass, superClass) \ public: \ Q_MANAGED_CHECK \ + typedef QV4::Heap::DataClass Data; \ typedef superClass SuperClass; \ static const QV4::ManagedVTable static_vtbl; \ static inline const QV4::ManagedVTable *staticVTable() { return &static_vtbl; } \ template <typename _T> \ QV4::Returned<_T> *asReturned() { return QV4::Returned<_T>::create(this); } \ V4_MANAGED_SIZE_TEST \ - const QV4::Heap::Data *d() const { return &static_cast<const QV4::Heap::Data &>(Managed::data); } \ - QV4::Heap::Data *d() { return &static_cast<QV4::Heap::Data &>(Managed::data); } + const QV4::Heap::DataClass *d() const { return &static_cast<const QV4::Heap::DataClass &>(Managed::data); } \ + QV4::Heap::DataClass *d() { return &static_cast<QV4::Heap::DataClass &>(Managed::data); } #define V4_OBJECT(superClass) \ public: \ |