summaryrefslogtreecommitdiff
path: root/src/corelib/tools/qmap.cpp
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-02-26 14:53:07 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2020-03-03 11:41:42 +0100
commitb30b3248caff5f3221e2de62a35bc16decb93b6f (patch)
tree248b7295877ba5e4f72cbf79da8305103f30899e /src/corelib/tools/qmap.cpp
parentbac89e2f49c1b7dda063aad8635a5d3cffad2c36 (diff)
downloadqtbase-b30b3248caff5f3221e2de62a35bc16decb93b6f.tar.gz
QMap: undeprecate QMap::count(Key)
For compatibility with std::map Change-Id: Icba536244aadcad97c59dfd4bb22a7fdea881a7b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qmap.cpp')
-rw-r--r--src/corelib/tools/qmap.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 6d2b8f7a3e..25ea5f25d7 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -814,11 +814,10 @@ void QMapDataBase::freeData(QMapDataBase *d)
*/
/*! \fn template <class Key, class T> int QMap<Key, T>::count(const Key &key) const
- \obsolete
Returns the number of items associated with key \a key.
- \sa QMultiMap::count()
+ \sa contains(), QMultiMap::count()
*/
/*! \fn template <class Key, class T> int QMap<Key, T>::count() const
@@ -2115,11 +2114,6 @@ void QMapDataBase::freeData(QMapDataBase *d)
inserted one.
*/
-/*! \fn template <class Key, class T> int QMultiMap<Key, T>::count(const Key &key) const
-
- Returns the number of items associated with key \a key.
-*/
-
/*! \fn template <class Key, class T> QList<Key> QMultiMap<Key, T>::uniqueKeys() const
\since 4.2