diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2025-01-16 17:58:55 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2025-01-17 19:29:18 +0000 |
| commit | 256b56f581a66acde829a2f47b3d0f6ed464fb44 (patch) | |
| tree | 7e42c013bc731fbe84c561d5a9e5b98d6439b797 /src | |
| parent | b9a5a7852caf5c1296776351efa1781dbce04bbf (diff) | |
Fix docs for new QDebug streaming operators of std containers
Added the missing function declarations to the #if Q_QDOC part of the
header. Also fixed a typo in the std::unordered_map docs.
Amends 850d4895be565931d18c92e5e2f9a33b7f26de6d,
0c96528e8d43ad4309bdca14b179a5045984655a,
a9fe57fefaac0cb047e4c02e0b8c8f8327e0a58c,
and a8c9a5617c72ad2e55bf497df6ff2c2e141cbdef.
Found in Qt 6.9 API review.
Pick-to: 6.9
Change-Id: I792023b506e2afdbdca4bca3197887e50c98a788
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qdebug.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qdebug.h | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 9e9c4292355..80d5b7497db 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -1216,7 +1216,7 @@ QDebug &QDebug::putTupleLikeImplImpl(const char *ns, const char *what, */ /*! - \fn template <typename Key, typename T, typename Hash, typename KeyEqual, typename Alloc> QDebug operator<<(QDebug debug, const std::unordered_map<Key, T, Compare, Alloc> &unordered_map) + \fn template <typename Key, typename T, typename Hash, typename KeyEqual, typename Alloc> QDebug operator<<(QDebug debug, const std::unordered_map<Key, T, Hash, KeyEqual, Alloc> &map) \relates QDebug \since 6.9 diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 4af152440c7..cf30c79a23a 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -574,6 +574,18 @@ QDebug operator<<(QDebug debug, const std::pair<T1, T2> &pair); template <typename T> QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache); +template <typename Key, typename Compare, typename Alloc> +QDebug operator<<(QDebug debug, const std::multiset<Key, Compare, Alloc> &multiset); + +template <typename Key, typename Compare, typename Alloc> +QDebug operator<<(QDebug debug, const std::set<Key, Compare, Alloc> &set); + +template <typename Key, typename T, typename Hash, typename KeyEqual, typename Alloc> +QDebug operator<<(QDebug debug, const std::unordered_map<Key, T, Hash, KeyEqual, Alloc> &unordered_map); + +template <typename Key, typename Hash, typename KeyEqual, typename Alloc> +QDebug operator<<(QDebug debug, const std::unordered_set<Key, Hash, KeyEqual, Alloc> &unordered_set); + #endif // Q_QDOC template <class T> |