From 5f564b04bfb99aba2647cded665c9fb883d125dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 13 Jul 2022 13:07:14 +0200 Subject: [PATCH] Doc: Add default value for seed param to all qHash overloads Change-Id: I4d559ccd60ec54d2584dceecaece7e0899c0eea9 Reviewed-by: Marc Mutz (cherry picked from commit 74ed70f17abb7d5236b2fead51ab44f627d4de20) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/tools/qhash.cpp | 2 +- src/corelib/tools/qtaggedpointer.qdoc | 2 +- src/corelib/tools/qversionnumber.cpp | 2 -- src/gui/vulkan/qvulkaninstance.cpp | 4 ++-- src/network/ssl/qocspresponse.cpp | 2 -- src/network/ssl/qsslcertificate.cpp | 2 -- src/network/ssl/qsslellipticcurve.cpp | 2 +- 7 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 2d9b6750c20..9b69c793893 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -1415,7 +1415,7 @@ uint qt_hash(QStringView key, uint chained) noexcept Returns the hash value for the \a key, using \a seed to seed the calculation. */ -/*! \fn size_t qHash(float key, size_t seed) noexcept +/*! \fn size_t qHash(float key, size_t seed = 0) noexcept \relates QHash \since 5.3 diff --git a/src/corelib/tools/qtaggedpointer.qdoc b/src/corelib/tools/qtaggedpointer.qdoc index acabf7047fa..f910e35b69e 100644 --- a/src/corelib/tools/qtaggedpointer.qdoc +++ b/src/corelib/tools/qtaggedpointer.qdoc @@ -187,7 +187,7 @@ */ /*! - \fn template qHash(QTaggedPointer key, std::size_t seed) + \fn template qHash(QTaggedPointer key, std::size_t seed = 0) \relates QTaggedPointer Returns the hash value for the \a key, using \a seed to seed the calculation. diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index 7d96b43898a..7d6ddc9bcd3 100644 --- a/src/corelib/tools/qversionnumber.cpp +++ b/src/corelib/tools/qversionnumber.cpp @@ -525,7 +525,6 @@ QDebug operator<<(QDebug debug, const QVersionNumber &version) #endif /*! - \fn size_t qHash(const QVersionNumber &key, size_t seed) \relates QHash \since 5.6 @@ -723,7 +722,6 @@ QDebug operator<<(QDebug debug, const QTypeRevision &revision) #endif /*! - \fn size_t qHash(const QTypeRevision &key, size_t seed) \relates QHash \since 6.0 diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp index 3b1b715c32f..bfc4b38b5a9 100644 --- a/src/gui/vulkan/qvulkaninstance.cpp +++ b/src/gui/vulkan/qvulkaninstance.cpp @@ -296,7 +296,7 @@ QVulkanInstance::~QVulkanInstance() */ /*! - \fn size_t qHash(const QVulkanLayer &key, size_t seed) + \fn size_t qHash(const QVulkanLayer &key, size_t seed = 0) \since 5.10 \relates QVulkanLayer @@ -340,7 +340,7 @@ QVulkanInstance::~QVulkanInstance() */ /*! - \fn size_t qHash(const QVulkanExtension &key, size_t seed) + \fn size_t qHash(const QVulkanExtension &key, size_t seed = 0) \since 5.10 \relates QVulkanExtension diff --git a/src/network/ssl/qocspresponse.cpp b/src/network/ssl/qocspresponse.cpp index 9911988aff3..74e2c814fd2 100644 --- a/src/network/ssl/qocspresponse.cpp +++ b/src/network/ssl/qocspresponse.cpp @@ -201,8 +201,6 @@ bool QOcspResponse::isEqual(const QOcspResponse &other) const } /*! - \fn size_t qHash(const QOcspResponse &response, size_t seed) - Returns the hash value for the \a response, using \a seed to seed the calculation. \since 5.13 diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index 39745427ebd..0f851ec7c92 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -955,8 +955,6 @@ QString QSslCertificate::subjectDisplayName() const } /*! - \fn size_t qHash(const QSslCertificate &key, size_t seed) - Returns the hash value for the \a key, using \a seed to seed the calculation. \since 5.4 \relates QHash diff --git a/src/network/ssl/qsslellipticcurve.cpp b/src/network/ssl/qsslellipticcurve.cpp index 959bf1de333..77aa66f3ccd 100644 --- a/src/network/ssl/qsslellipticcurve.cpp +++ b/src/network/ssl/qsslellipticcurve.cpp @@ -160,7 +160,7 @@ bool QSslEllipticCurve::isTlsNamedCurve() const noexcept */ /*! - \fn size_t qHash(QSslEllipticCurve curve, size_t seed) + \fn size_t qHash(QSslEllipticCurve curve, size_t seed = 0) \since 5.5 \relates QHash