diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:29:21 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:22 +0100 |
| commit | da2396478f04aa66d521e53ff24488e72c87d895 (patch) | |
| tree | 5bce39b395e4b14b7c3e2672c5b01c2060392652 /src/qml/jsruntime/qv4managed_p.h | |
| parent | 84aae25c0b3003fb846568cf26a2c7150db14d9d (diff) | |
Cleanup RegExp
Move it's Data into the Heap namespace.
Change-Id: I4ed6ea481376ae1d0c1fb08b56feee4764083231
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 | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index 1cf90cba48..81c9e81e22 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -57,19 +57,7 @@ inline void qYouForgotTheQ_MANAGED_Macro(T1, T2) {} #define V4_MANAGED_SIZE_TEST #endif -#define V4_MANAGED(superClass) \ - public: \ - Q_MANAGED_CHECK \ - 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 Data *d() const { return &static_cast<const Data &>(Managed::data); } \ - Data *d() { return &static_cast<Data &>(Managed::data); } - -#define V4_MANAGED2(DataClass, superClass) \ +#define V4_MANAGED(DataClass, superClass) \ public: \ Q_MANAGED_CHECK \ typedef QV4::Heap::DataClass Data; \ @@ -190,7 +178,7 @@ const QV4::ObjectVTable classname::static_vtbl = \ struct Q_QML_PRIVATE_EXPORT Managed { Heap::Base data; - V4_MANAGED2(Base, Managed) + V4_MANAGED(Base, Managed) enum { IsExecutionContext = false, IsString = false, |