From c6cdf38e752c22babdbe645366bdfb7ce51d01ff Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 31 Jan 2020 12:11:54 +0100 Subject: Change qHash() to work with size_t instead of uint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required, so that QHash and QSet can hold more than 2^32 items on 64 bit platforms. The actual hashing functions for strings are still 32bit, this will be changed in a follow-up commit. Change-Id: I4372125252486075ff3a0b45ecfa818359fe103b Reviewed-by: Mårten Nordheim --- examples/embedded/lightmaps/slippymap.cpp | 2 +- examples/widgets/tools/i18n/languagechooser.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/embedded/lightmaps/slippymap.cpp b/examples/embedded/lightmaps/slippymap.cpp index da003981ff..66957bea18 100644 --- a/examples/embedded/lightmaps/slippymap.cpp +++ b/examples/embedded/lightmaps/slippymap.cpp @@ -53,7 +53,7 @@ #include "slippymap.h" #include "qmath.h" -uint qHash(const QPoint& p) +size_t qHash(const QPoint& p) { return p.x() * 17 ^ p.y(); } diff --git a/examples/widgets/tools/i18n/languagechooser.cpp b/examples/widgets/tools/i18n/languagechooser.cpp index 2ce3471873..51dfce915f 100644 --- a/examples/widgets/tools/i18n/languagechooser.cpp +++ b/examples/widgets/tools/i18n/languagechooser.cpp @@ -173,7 +173,7 @@ QString LanguageChooser::languageName(const QString &qmFile) QColor LanguageChooser::colorForLanguage(const QString &language) { - uint hashValue = qHash(language); + size_t hashValue = qHash(language); int red = 156 + (hashValue & 0x3F); int green = 156 + ((hashValue >> 6) & 0x3F); int blue = 156 + ((hashValue >> 12) & 0x3F); -- cgit v1.2.3