path: root/src/corelib/kernel/qmetaobject.cpp
diff options
authorThiago Macieira <>2012-06-04 22:04:13 +0200
committerLars Knoll <>2019-12-07 14:18:12 +0100
commit8fb45ae5b8b8ad276aeb9bc9e40f351f47523087 (patch)
treed6c3c40b59b9650f5ea6815afa06bac3cec78897 /src/corelib/kernel/qmetaobject.cpp
parent64db4861bfcacc8849e8452b73d5c940d97aefd0 (diff)
Introduce QArrayData::allocatedCapacity() and use it instead of d->alloc
In almost all cases, use d->allocatedCapacity() or d->constAllocatedCapacity() instead of d->alloc, since they do the same thing (right now). In the future, the functions will be changed. There is a separate const version because most const code should not need to know the allocation size -- only mutating code should need to know that There are a few cases where d->alloc was replaced with a better alternative, like d->size. The one case that remains in the code will be replaced by a different test when it's available. Change-Id: I48135469db4caf150f82df93fff42d2309b23719 Reviewed-by: Simon Hausmann <>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index b51bb616b2..d9feb76d04 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -159,7 +159,7 @@ static inline const QByteArray stringData(const QMetaObject *mo, int index)
Q_ASSERT(priv(mo->>revision >= 7);
const QByteArrayDataPtr data = { const_cast<QByteArrayData*>(&mo->d.stringdata[index]) };
- Q_ASSERT(data.ptr->alloc == 0);
+ Q_ASSERT(data.ptr->allocatedCapacity() == 0);
Q_ASSERT(data.ptr->size >= 0);
return data;