diff options
Diffstat (limited to 'src/gui/painting')
-rw-r--r-- | src/gui/painting/qicc.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qtextureglyphcache_p.h | 2 | ||||
-rw-r--r-- | src/gui/painting/qtransform.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qtransform.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qicc.cpp b/src/gui/painting/qicc.cpp index 2b5cd58fb1..e2257c27da 100644 --- a/src/gui/painting/qicc.cpp +++ b/src/gui/painting/qicc.cpp @@ -136,7 +136,7 @@ enum class Tag : quint32 { aabg = IccTag('a', 'a', 'b', 'g'), }; -inline uint qHash(const Tag &key, uint seed = 0) +inline size_t qHash(const Tag &key, size_t seed = 0) { return qHash(quint32(key), seed); } diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index b6fc7230a8..2f99f44741 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -156,7 +156,7 @@ protected: int m_currentRowHeight; // Height of last row }; -inline uint qHash(const QTextureGlyphCache::GlyphAndSubPixelPosition &g) +inline size_t qHash(const QTextureGlyphCache::GlyphAndSubPixelPosition &g) { return (g.glyph << 8) | (g.subPixelPosition * 10).round().toInt(); } diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 4adc2b075e..41237592d5 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -783,7 +783,7 @@ bool QTransform::operator==(const QTransform &o) const Returns the hash value for \a key, using \a seed to seed the calculation. */ -uint qHash(const QTransform &key, uint seed) noexcept +size_t qHash(const QTransform &key, size_t seed) noexcept { QtPrivate::QHashCombine hash; seed = hash(seed, key.m11()); diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index d235f15029..6e04559c1b 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -206,7 +206,7 @@ private: }; Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE); -Q_GUI_EXPORT Q_DECL_CONST_FUNCTION uint qHash(const QTransform &key, uint seed = 0) noexcept; +Q_GUI_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(const QTransform &key, size_t seed = 0) noexcept; /******* inlines *****/ inline QTransform::TransformationType QTransform::inline_type() const |