diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-10 01:00:42 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-10 01:00:42 +0200 |
commit | 3d2832790a478f915db8b0b75bb752bbe51e4d29 (patch) | |
tree | 13569be049a6facaa616a78adda296b2268888f3 /src/corelib | |
parent | c82ab86ceacd0321a19282b9fca612e404929cb8 (diff) | |
parent | 85917c4b72a498e86d6dd057a5b6df26c0565fc4 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: If1baf48f0f396fb223672d14f0e1847ac42ca1a6
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/serialization/qcborarray.cpp | 12 | ||||
-rw-r--r-- | src/corelib/serialization/qcborarray.h | 1 | ||||
-rw-r--r-- | src/corelib/serialization/qcbormap.cpp | 12 | ||||
-rw-r--r-- | src/corelib/serialization/qcbormap.h | 1 |
4 files changed, 24 insertions, 2 deletions
diff --git a/src/corelib/serialization/qcborarray.cpp b/src/corelib/serialization/qcborarray.cpp index 05403795b0..921fcf2fca 100644 --- a/src/corelib/serialization/qcborarray.cpp +++ b/src/corelib/serialization/qcborarray.cpp @@ -186,11 +186,21 @@ qsizetype QCborArray::size() const noexcept } /*! + Empties this array. + + \sa isEmpty() + */ +void QCborArray::clear() +{ + d.reset(); +} + +/*! \fn bool QCborArray::isEmpty() const Returns true if this QCborArray is empty (that is if size() is 0). - \sa size() + \sa size(), clear() */ /*! diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h index 6b07b52a02..f24bb41759 100644 --- a/src/corelib/serialization/qcborarray.h +++ b/src/corelib/serialization/qcborarray.h @@ -180,6 +180,7 @@ public: qsizetype size() const noexcept; bool isEmpty() const { return size() == 0; } + void clear(); QCborValue at(qsizetype i) const; QCborValue first() const { return at(0); } diff --git a/src/corelib/serialization/qcbormap.cpp b/src/corelib/serialization/qcbormap.cpp index b18945ded1..33f9249993 100644 --- a/src/corelib/serialization/qcbormap.cpp +++ b/src/corelib/serialization/qcbormap.cpp @@ -270,7 +270,7 @@ QCborMap &QCborMap::operator=(const QCborMap &other) noexcept Returns true if this map is empty (that is, size() is 0). - \sa size() + \sa size(), clear() */ /*! @@ -284,6 +284,16 @@ qsizetype QCborMap::size() const noexcept } /*! + Empties this map. + + \sa isEmpty() + */ +void QCborMap::clear() +{ + d.reset(); +} + +/*! Returns a list of all keys in this map. \sa QMap::keys(), QHash::keys() diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index c895abfa59..45ef430e40 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -184,6 +184,7 @@ public: qsizetype size() const noexcept Q_DECL_PURE_FUNCTION; bool isEmpty() const { return size() == 0; } + void clear(); QVector<QCborValue> keys() const; QCborValue value(qint64 key) const |