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

qHash: pass QByteArrayView to qHash() by value

Browse Source 
The QBAV one should pass the parameter by value, like QStringView. And
now that we have it, the non-View one should call the View one in an
inline function, like we already do for QString.

The extra, defaulted parameter is there only so we get a different
signature in the new inline function compared to the removed one.

Change-Id: If05aeeb7176e4f13af9afffd16e7f08062b1dc86
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit bc144312c18e7436275267ad8900fce980597c45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2022-04-21 07:43:42 -07:00 committed by Qt Cherry-pick Bot
parent ef6d08ac2a
commit cb2e536365
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/compat/removed_api.cpp
View File

@ -170,6 +170,18 @@ QCalendar::QCalendar(QLatin1StringView name)
: QCalendar(QAnyStringView{name}) {}
#include "qhashfunctions.h"
size_t qHash(const QByteArray &key, size_t seed) noexcept
{
return qHashBits(key.constData(), size_t(key.size()), seed);
}
size_t qHash(const QByteArrayView &key, size_t seed) noexcept
{
return qHashBits(key.constData(), size_t(key.size()), seed);
}
#include "qobject.h"
void QObject::setObjectName(const QString &name)

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

@ -957,12 +957,7 @@ size_t qHashBits(const void *p, size_t size, size_t seed) noexcept
return siphash(reinterpret_cast<const uchar *>(p), size, seed, seed2);
}
size_t qHash(const QByteArray &key, size_t seed) noexcept
{
return qHashBits(key.constData(), size_t(key.size()), seed);
}
size_t qHash(const QByteArrayView &key, size_t seed) noexcept
size_t qHash(QByteArrayView key, size_t seed) noexcept
{
return qHashBits(key.constData(), size_t(key.size()), seed);
}

8
src/corelib/tools/qhashfunctions.h
View File

@ -144,8 +144,16 @@ Q_DECL_CONST_FUNCTION constexpr inline size_t qHash(std::nullptr_t, size_t seed
// (some) Qt types
Q_DECL_CONST_FUNCTION constexpr inline size_t qHash(const QChar key, size_t seed = 0) noexcept { return qHash(key.unicode(), seed); }
#if QT_CORE_REMOVED_SINCE(6, 4)
Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(const QByteArray &key, size_t seed = 0) noexcept;
Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(const QByteArrayView &key, size_t seed = 0) noexcept;
#else
Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(QByteArrayView key, size_t seed = 0) noexcept;
inline Q_DECL_PURE_FUNCTION size_t qHash(const QByteArray &key, size_t seed = 0 QT6_ONLY(, int = 0)) noexcept
{ return qHash(qToByteArrayViewIgnoringNull(key), seed); }
#endif
Q_CORE_EXPORT Q_DECL_PURE_FUNCTION size_t qHash(QStringView key, size_t seed = 0) noexcept;
#if QT_STRINGVIEW_LEVEL < 2
inline Q_DECL_PURE_FUNCTION size_t qHash(const QString &key, size_t seed = 0) noexcept