aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4object_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-11-14 09:31:59 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-22 07:56:58 +0100
commit6d2904ce547757fa554cdab6724a088c80abf5ac (patch)
treef3cd50654b8a140d843656961d107db6231bdce3 /src/qml/jsruntime/qv4object_p.h
parent9f717b650ea0a7efc4240240f957beba8d027bda (diff)
Remove two reinterpret_casts in Object
Change-Id: I921cd8129acb47cffd58be9551a6925c4f296d41 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4object_p.h')
-rw-r--r--src/qml/jsruntime/qv4object_p.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index e3c3e37d70..2e2d433850 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -96,14 +96,14 @@ struct Q_QML_EXPORT Object: Managed {
IsObject = true
};
+ Heap::MemberData *memberData() { return d()->memberData; }
+ const Heap::MemberData *memberData() const { return d()->memberData; }
// ### GC
- MemberData *memberData() { return reinterpret_cast<MemberData *>(d()->memberData); }
- const MemberData *memberData() const { return reinterpret_cast<const MemberData *>(d()->memberData); }
ArrayData *arrayData() const { return reinterpret_cast<ArrayData *>(d()->arrayData); }
void setArrayData(ArrayData *a) { d()->arrayData = a->d(); }
- const Property *propertyAt(uint index) const { return reinterpret_cast<const Property *>(memberData()->data() + index); }
- Property *propertyAt(uint index) { return reinterpret_cast<Property *>(memberData()->data() + index); }
+ const Property *propertyAt(uint index) const { return reinterpret_cast<const Property *>(memberData()->data + index); }
+ Property *propertyAt(uint index) { return reinterpret_cast<Property *>(memberData()->data + index); }
const ObjectVTable *vtable() const { return reinterpret_cast<const ObjectVTable *>(internalClass()->vtable); }
Object *prototype() const { return internalClass()->prototype; }
@@ -339,7 +339,7 @@ struct ArrayObject: Object {
inline void Object::setArrayLengthUnchecked(uint l)
{
if (isArrayObject())
- memberData()->data()[Heap::ArrayObject::LengthPropertyIndex] = Primitive::fromUInt32(l);
+ memberData()->data[Heap::ArrayObject::LengthPropertyIndex] = Primitive::fromUInt32(l);
}
inline void Object::push_back(const ValueRef v)