summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qmultimap.qdoc
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-10-15 17:04:20 +0200
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2020-10-17 17:34:52 +0000
commit0d9934d4bcf56dc7711060edf5418e96138f4d94 (patch)
treea1066caf09540537461a2900fcd49b49708b1be8 /src/corelib/tools/qmultimap.qdoc
parentf660fedcaba5349aa78222f3e49eec44272a7caf (diff)
Consistenly deprecate QMultiMap insert, add moving unite overload
Change-Id: I8d1d30f3962b0444c27591bf45b6b3c538172039 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/corelib/tools/qmultimap.qdoc')
-rw-r--r--src/corelib/tools/qmultimap.qdoc14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/tools/qmultimap.qdoc b/src/corelib/tools/qmultimap.qdoc
index 8b3337e59b..d07383a366 100644
--- a/src/corelib/tools/qmultimap.qdoc
+++ b/src/corelib/tools/qmultimap.qdoc
@@ -865,15 +865,17 @@
Inserts all the items in \a map into this map.
*/
-#endif
/*! \fn template <class Key, class T> void QMultiMap<Key, T>::insert(QMultiMap<Key, T> &&map)
\since 5.15
+ \obsolete Use unite() instead.
+ \overload
Moves all the items from \a map into this map.
If \a map is shared, then the items will be copied instead.
*/
+#endif
/*! \fn template <class Key, class T> QMultiMap<Key, T>::iterator QMultiMap<Key, T>::replace(const Key &key, const T &value)
@@ -947,6 +949,16 @@
key multiple times.
*/
+/*!
+ \fn template <class Key, class T> QMultiMap<Key, T> &QMultiMap<Key, T>::unite(QMultiMap<Key, T> &&other)
+
+ Moves all the items from the \a other map into this map. If a
+ key is common to both maps, the resulting map will contain the
+ key multiple times.
+
+ If \a other is shared, then the items will be copied instead.
+*/
+
/*! \fn template <class Key, class T> QMultiMap<Key, T> operator+=(QMultiMap<Key, T> &lhs, const QMultiMap<Key, T> &rhs)
Inserts all the items in the \a rhs map into the \a lhs map and