diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:06:12 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 22:30:59 +0200 |
| commit | 0475460102411979ab51c365cb2bec2c05b69cb4 (patch) | |
| tree | 73b7dbe85249da2bd339cd19b0c584894d3901c7 /src/corelib/serialization/qjson_p.h | |
| parent | e114e580e751b5deb19ab489a8b11f830ff6356f (diff) | |
Use QList instead of QVector in corelib
Applied to headers only. Source file to be changed separately.
Omitted statemachine for now to avoid conflicts.
Omitted qmetatype.h for now - to be handled later.
Task-number: QTBUG-84469
Change-Id: I317376037a62467c313467d92955ad0b7473aa97
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/serialization/qjson_p.h')
| -rw-r--r-- | src/corelib/serialization/qjson_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h index d2bbf928d0..4589284ef3 100644 --- a/src/corelib/serialization/qjson_p.h +++ b/src/corelib/serialization/qjson_p.h @@ -113,7 +113,7 @@ struct ObjectIterator Element m_value; }; - using difference_type = typename QVector<Element>::difference_type; + using difference_type = typename QList<Element>::difference_type; using iterator_category = std::random_access_iterator_tag; ObjectIterator() = default; @@ -182,8 +182,8 @@ inline bool operator==( return a.elementsIterator() == b.elementsIterator(); } -using KeyIterator = ObjectIterator<QtCbor::Element, QVector<QtCbor::Element>::iterator>; -using ConstKeyIterator = ObjectIterator<const QtCbor::Element, QVector<QtCbor::Element>::const_iterator>; +using KeyIterator = ObjectIterator<QtCbor::Element, QList<QtCbor::Element>::iterator>; +using ConstKeyIterator = ObjectIterator<const QtCbor::Element, QList<QtCbor::Element>::const_iterator>; template<> inline KeyIterator::reference &KeyIterator::reference::operator=(const KeyIterator::value_type &value) |