diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-11-13 12:04:20 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-11-17 11:47:53 +0100 |
| commit | 7fc302520b905fc40cc0fa439d3a2e9dbff3e5a6 (patch) | |
| tree | 8b8113c86e6dc9053f14c5e1e59481eef30c8897 /src/corelib/tools/qarraydataops.h | |
| parent | cadfed83acd392bb9dde6dded241aeefabc235ec (diff) | |
Move the iterator from QTypedArrayData to QList
The low level implementation does not use it at all, so there's no
point having the iterator in QTypedArrayData. Having it in QList removes
and indirection and will lead to clearer error messages.
Change-Id: I4af270c3cdb39620e5e52e835eb8fe1aa659e038
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/corelib/tools/qarraydataops.h')
| -rw-r--r-- | src/corelib/tools/qarraydataops.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index b157e2d7339..c1ae93dc104 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -635,7 +635,7 @@ public: { Q_ASSERT(this->isMutable()); Q_ASSERT(this->size); - (--this->end())->~T(); + (this->end() - 1)->~T(); --this->size; } @@ -883,8 +883,6 @@ struct QCommonArrayOps : QArrayOpsSelector<T>::Type using Data = QTypedArrayData<T>; using DataPointer = QArrayDataPointer<T>; using parameter_type = typename Base::parameter_type; - using iterator = typename Base::iterator; - using const_iterator = typename Base::const_iterator; protected: using Self = QCommonArrayOps<T>; |