summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qurlquery.cpp5
-rw-r--r--src/corelib/itemmodels/qitemselectionmodel.cpp5
-rw-r--r--src/corelib/serialization/qcborvalue.cpp8
-rw-r--r--src/corelib/tools/qversionnumber.cpp5
4 files changed, 5 insertions, 18 deletions
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 70303273045..e4b6da4cae1 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -428,11 +428,8 @@ bool comparesEqual(const QUrlQuery &lhs, const QUrlQuery &rhs)
size_t qHash(const QUrlQuery &key, size_t seed) noexcept
{
if (const QUrlQueryPrivate *d = key.d) {
- QtPrivate::QHashCombine hash;
// keep in sync with operator==:
- seed = hash(seed, d->valueDelimiter);
- seed = hash(seed, d->pairDelimiter);
- seed = hash(seed, d->itemList);
+ return qHashMulti(seed, d->valueDelimiter, d->pairDelimiter, d->itemList);
}
return seed;
}
diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp
index 3caf7b3405e..3c84e8797d0 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.cpp
+++ b/src/corelib/itemmodels/qitemselectionmodel.cpp
@@ -1813,10 +1813,7 @@ struct RowOrColumnDefinition {
};
size_t qHash(const RowOrColumnDefinition &key, size_t seed = 0) noexcept
{
- QtPrivate::QHashCombine hash;
- seed = hash(seed, key.parent);
- seed = hash(seed, key.rowOrColumn);
- return seed;
+ return qHashMulti(seed, key.parent, key.rowOrColumn);
}
QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(RowOrColumnDefinition)
diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp
index 2e61ed7460d..fed1811af22 100644
--- a/src/corelib/serialization/qcborvalue.cpp
+++ b/src/corelib/serialization/qcborvalue.cpp
@@ -3192,12 +3192,8 @@ size_t qHash(const QCborValue &value, size_t seed)
return qHash(value.toArray(), seed);
case QCborValue::Map:
return qHash(value.toMap(), seed);
- case QCborValue::Tag: {
- QtPrivate::QHashCombine hash;
- seed = hash(seed, value.tag());
- seed = hash(seed, value.taggedValue());
- return seed;
- }
+ case QCborValue::Tag:
+ return qHashMulti(seed, value.tag(), value.taggedValue());
case QCborValue::SimpleType:
break;
case QCborValue::False:
diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp
index 57cfc1767f1..97a7dbdfa9c 100644
--- a/src/corelib/tools/qversionnumber.cpp
+++ b/src/corelib/tools/qversionnumber.cpp
@@ -576,10 +576,7 @@ QDebug operator<<(QDebug debug, const QVersionNumber &version)
*/
size_t qHash(const QVersionNumber &key, size_t seed)
{
- QtPrivate::QHashCombine hash;
- for (int i = 0; i < key.segmentCount(); ++i)
- seed = hash(seed, key.segmentAt(i));
- return seed;
+ return qHashRange(key.begin(), key.end(), seed);
}
QT_END_NAMESPACE