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

Remove documentation for removed qHash overload

Browse Source 
QPair is an alias to std::pair in Qt 6, so no need for two qHash functions.
Also remove note and snippet from std::pair overload documentation.

Change-Id: Ica8f6961af1eac493e909ad06fe46f8f68542bc5
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-10-28 19:30:19 +01:00
parent 173615222a
commit 61574ee963
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp
View File

@ -335,10 +335,6 @@ inline size_t qHash(const std::unordered_set<int> &key, size_t seed = 0)
} }
//! [qhashrangecommutative] //! [qhashrangecommutative]
//! [29]
qHash(qMakePair(key.first, key.second), seed);
//! [29]
//! [30] //! [30]
{0, 1, 2} {0, 1, 2}
//! [30] //! [30]

15
src/corelib/tools/qhash.cpp
View File

@ -713,16 +713,6 @@ uint qt_hash(QStringView key, uint chained) noexcept
return h; return h;
} }
/*!
\fn template <typename T1, typename T2> size_t qHash(const QPair<T1, T2> &key, size_t seed = 0)
\since 5.0
\relates QHash
Returns the hash value for the \a key, using \a seed to seed the calculation.
Types \c T1 and \c T2 must be supported by qHash().
*/
/*! /*!
\fn template <typename T1, typename T2> size_t qHash(const std::pair<T1, T2> &key, size_t seed = 0) \fn template <typename T1, typename T2> size_t qHash(const std::pair<T1, T2> &key, size_t seed = 0)
\since 5.7 \since 5.7
@ -731,11 +721,6 @@ uint qt_hash(QStringView key, uint chained) noexcept
Returns the hash value for the \a key, using \a seed to seed the calculation. Returns the hash value for the \a key, using \a seed to seed the calculation.
Types \c T1 and \c T2 must be supported by qHash(). Types \c T1 and \c T2 must be supported by qHash().
\note The return type of this function is \e{not} the same as that of
\snippet code/src_corelib_tools_qhash.cpp 29
The two functions use different hashing algorithms; due to binary compatibility
constraints, we cannot change the QPair algorithm to match the std::pair one before Qt 6.
*/ */
/*! /*!