diff options
Diffstat (limited to 'src/corelib/text')
-rw-r--r-- | src/corelib/text/qbytearray.cpp | 5 | ||||
-rw-r--r-- | src/corelib/text/qlocale.cpp | 5 | ||||
-rw-r--r-- | src/corelib/text/qregexp.cpp | 6 | ||||
-rw-r--r-- | src/corelib/text/qregularexpression.cpp | 5 |
4 files changed, 4 insertions, 17 deletions
diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index b778316a15..8d70955065 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -5030,10 +5030,7 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA */ size_t qHash(const QByteArray::FromBase64Result &key, size_t seed) noexcept { - QtPrivate::QHashCombine hash; - seed = hash(seed, key.decoded); - seed = hash(seed, static_cast<int>(key.decodingStatus)); - return seed; + return qHashMulti(seed, key.decoded, static_cast<int>(key.decodingStatus)); } QT_END_NAMESPACE diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 2ddb27fc6e..8df28797bd 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -1091,10 +1091,7 @@ bool QLocale::operator!=(const QLocale &other) const */ size_t qHash(const QLocale &key, size_t seed) noexcept { - QtPrivate::QHashCombine hash; - seed = hash(seed, key.d->m_data); - seed = hash(seed, key.d->m_numberOptions); - return seed; + return qHashMulti(seed, key.d->m_data, key.d->m_numberOptions); } /*! diff --git a/src/corelib/text/qregexp.cpp b/src/corelib/text/qregexp.cpp index bf76a1992c..758a3695c9 100644 --- a/src/corelib/text/qregexp.cpp +++ b/src/corelib/text/qregexp.cpp @@ -1030,11 +1030,7 @@ static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key static size_t qHash(const QRegExpEngineKey &key, size_t seed = 0) noexcept { - QtPrivate::QHashCombine hash; - seed = hash(seed, key.pattern); - seed = hash(seed, key.patternSyntax); - seed = hash(seed, key.cs); - return seed; + return qHashMulti(seed, key.pattern, key.patternSyntax, key.cs); } class QRegExpEngine; diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp index f479425bed..8197407146 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -1712,10 +1712,7 @@ bool QRegularExpression::operator==(const QRegularExpression &re) const */ size_t qHash(const QRegularExpression &key, size_t seed) noexcept { - QtPrivate::QHashCombine hash; - seed = hash(seed, key.d->pattern); - seed = hash(seed, key.d->patternOptions); - return seed; + return qHashMulti(seed, key.d->pattern, key.d->patternOptions); } #if QT_STRINGVIEW_LEVEL < 2 |