diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-13 21:49:09 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-21 13:19:02 +0100 |
| commit | 630f118f043edb88501e387d779c62c86b1030d4 (patch) | |
| tree | 2c8c3cdcadae94b859760a0603e22748da33453a /src/qml/jsruntime/qv4managed_p.h | |
| parent | 47fbcb47771a36ab9fd0a4d5ede7b7504ab1410d (diff) | |
Move the internalClass pointer into Heap::Object
The other classes that derive from Heap::Base don't need it
at all. So get rid of it there and save a pointer.
Change-Id: I9c5df2e43cd6eeac2e6e41f3d3b8077d3afbc8f2
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, 2 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4managed_p.h b/src/qml/jsruntime/qv4managed_p.h index a23785837e..6636cb19cf 100644 --- a/src/qml/jsruntime/qv4managed_p.h +++ b/src/qml/jsruntime/qv4managed_p.h @@ -231,7 +231,7 @@ public: template <typename T> T *as() { - Q_ASSERT(internalClass()); + Q_ASSERT(d()->vtable); #if !defined(QT_NO_QOBJECT_CHECK) static_cast<T *>(this)->qt_check_for_QMANAGED_macro(static_cast<T *>(this)); #endif @@ -245,7 +245,7 @@ public: } template <typename T> const T *as() const { - Q_ASSERT(internalClass()); + Q_ASSERT(d()->vtable); #if !defined(QT_NO_QOBJECT_CHECK) static_cast<T *>(this)->qt_check_for_QMANAGED_macro(static_cast<T *>(const_cast<Managed *>(this))); #endif @@ -283,9 +283,6 @@ public: ReturnedValue asReturnedValue() { return Value::fromManaged(this).asReturnedValue(); } - InternalClass *internalClass() const { return d()->internalClass; } - void setInternalClass(InternalClass *ic) { d()->internalClass = ic; } - bool inUse() const { return d()->inUse(); } bool markBit() const { return d()->isMarked(); } |