diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-01-31 12:11:54 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-09 20:03:25 +0200 |
commit | c6cdf38e752c22babdbe645366bdfb7ce51d01ff (patch) | |
tree | 450b02523cb5a16791674ad1d06fb68c72eac971 /examples | |
parent | 775945137b6ef62de9a7d416b1fe59d79006ba82 (diff) |
Change qHash() to work with size_t instead of uint
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 <marten.nordheim@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/embedded/lightmaps/slippymap.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/tools/i18n/languagechooser.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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); |