diff options
Diffstat (limited to 'src/corelib/serialization')
-rw-r--r-- | src/corelib/serialization/qcborarray.cpp | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qcborarray.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qcborcommon.h | 4 | ||||
-rw-r--r-- | src/corelib/serialization/qcbormap.cpp | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qcbormap.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qcborvalue.cpp | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qcborvalue.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonarray.cpp | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonarray.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonobject.cpp | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonobject.h | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonvalue.cpp | 2 | ||||
-rw-r--r-- | src/corelib/serialization/qjsonvalue.h | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/src/corelib/serialization/qcborarray.cpp b/src/corelib/serialization/qcborarray.cpp index ca0156e07d..3bb99176af 100644 --- a/src/corelib/serialization/qcborarray.cpp +++ b/src/corelib/serialization/qcborarray.cpp @@ -1200,7 +1200,7 @@ void QCborArray::detach(qsizetype reserved) Returns the offset of this iterator relative to \a other. */ -uint qHash(const QCborArray &array, uint seed) +size_t qHash(const QCborArray &array, size_t seed) { return qHashRange(array.begin(), array.end(), seed); } diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h index fe06b8630f..0438b920ab 100644 --- a/src/corelib/serialization/qcborarray.h +++ b/src/corelib/serialization/qcborarray.h @@ -294,7 +294,7 @@ inline QCborArray QCborValueRef::toArray(const QCborArray &a) const return concrete().toArray(a); } -Q_CORE_EXPORT uint qHash(const QCborArray &array, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QCborArray &array, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborArray &a); diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h index bec46399ce..1497da3d2e 100644 --- a/src/corelib/serialization/qcborcommon.h +++ b/src/corelib/serialization/qcborcommon.h @@ -138,12 +138,12 @@ QDataStream &operator<<(QDataStream &ds, QCborSimpleType st); QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st); #endif -inline uint qHash(QCborSimpleType tag, uint seed = 0) +inline size_t qHash(QCborSimpleType tag, size_t seed = 0) { return qHash(quint8(tag), seed); } -inline uint qHash(QCborTag tag, uint seed = 0) +inline size_t qHash(QCborTag tag, size_t seed = 0) { return qHash(quint64(tag), seed); } diff --git a/src/corelib/serialization/qcbormap.cpp b/src/corelib/serialization/qcbormap.cpp index 4b28ca4a2e..9a8a2c4417 100644 --- a/src/corelib/serialization/qcbormap.cpp +++ b/src/corelib/serialization/qcbormap.cpp @@ -1744,7 +1744,7 @@ void QCborMap::detach(qsizetype reserved) \sa operator+=(), operator-() */ -uint qHash(const QCborMap &map, uint seed) +size_t qHash(const QCborMap &map, size_t seed) { return qHashRange(map.begin(), map.end(), seed); } diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index 6636ce776a..0609c0a39e 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -350,7 +350,7 @@ inline QCborMap QCborValueRef::toMap(const QCborMap &m) const return concrete().toMap(m); } -Q_CORE_EXPORT uint qHash(const QCborMap &map, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QCborMap &map, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborMap &m); diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index ddc303e15d..298ebcfd72 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -2921,7 +2921,7 @@ inline QCborMap::QCborMap(QCborContainerPrivate &dd) noexcept { } -uint qHash(const QCborValue &value, uint seed) +size_t qHash(const QCborValue &value, size_t seed) { switch (value.type()) { case QCborValue::Integer: diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index bbe2774e69..9923710eaa 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -481,7 +481,7 @@ private: qsizetype i; }; -Q_CORE_EXPORT uint qHash(const QCborValue &value, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QCborValue &value, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborValue &v); diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index 05138ad610..98ace021fc 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -1133,7 +1133,7 @@ void QJsonArray::compact() a->compact(a->elements.size()); } -uint qHash(const QJsonArray &array, uint seed) +size_t qHash(const QJsonArray &array, size_t seed) { return qHashRange(array.begin(), array.end(), seed); } diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index 9b7e10766f..d39522bd2f 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -252,7 +252,7 @@ private: Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonArray) -Q_CORE_EXPORT uint qHash(const QJsonArray &array, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QJsonArray &array, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonArray &); diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index b76e50e2d2..1a85429c82 100644 --- a/src/corelib/serialization/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp @@ -1487,7 +1487,7 @@ void QJsonObject::removeAt(int index) o->removeAt(index); } -uint qHash(const QJsonObject &object, uint seed) +size_t qHash(const QJsonObject &object, size_t seed) { QtPrivate::QHashCombine hash; for (auto it = object.begin(), end = object.end(); it != end; ++it) { diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index c31be0353d..dc449eecf4 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -302,7 +302,7 @@ private: Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonObject) -Q_CORE_EXPORT uint qHash(const QJsonObject &object, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QJsonObject &object, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonObject &); diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index e9ba176d7f..5eb33bd2a3 100644 --- a/src/corelib/serialization/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp @@ -943,7 +943,7 @@ QJsonValue QJsonValueRef::toValue() const return o->valueAt(index); } -uint qHash(const QJsonValue &value, uint seed) +size_t qHash(const QJsonValue &value, size_t seed) { switch (value.type()) { case QJsonValue::Null: diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index bd8bf14baf..fa877ff7ee 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -232,7 +232,7 @@ public: Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonValue) -Q_CORE_EXPORT uint qHash(const QJsonValue &value, uint seed = 0); +Q_CORE_EXPORT size_t qHash(const QJsonValue &value, size_t seed = 0); #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); |