1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMultiMap: Add unite documentation

Browse Source 
I missed copying over the documentation from QMap::unite when
deprecating it.

Amends 4ec6748c6a30f74e6d8fbb90fc118b306d1fa690

Change-Id: I118382c4645bdc679a378e02a462d104b9af9aad
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Mårten Nordheim 2020-01-24 12:21:46 +01:00
parent ea4b837fa1
commit a4363030bf
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/tools/qmap.cpp
View File

@ -1203,7 +1203,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
key is common to both maps, the resulting map will contain the key is common to both maps, the resulting map will contain the
key multiple times. key multiple times.
\sa QMap::unite() \sa QMultiMap::unite()
*/ */
/*! \typedef QMap::Iterator /*! \typedef QMap::Iterator
@ -2128,4 +2128,11 @@ void QMapDataBase::freeData(QMapDataBase *d)
once in the returned list. once in the returned list.
*/ */
/*! \fn template <class Key, class T> QMultiMap<Key, T> &QMultiMap<Key, T>::unite(const QMultiMap<Key, T> &other)
Inserts all the items in the \a other map into this map. If a
key is common to both maps, the resulting map will contain the
key multiple times.
*/
QT_END_NAMESPACE QT_END_NAMESPACE