diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-21 07:40:25 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-20 14:33:52 +0000 |
commit | 5d45d89fec1d5d43657758a8152a203d095b8d39 (patch) | |
tree | a11bea47173e560bc91d0665d1ffc63be86e8c51 | |
parent | fc2bd8936a90220feaa18ad87ad773f6fab98d25 (diff) | |
download | qttools-5d45d89fec1d5d43657758a8152a203d095b8d39.tar.gz |
qmake: Fix qHash-related integer conversion warnings
Use size_t instead of uint, following
qtbase/008343a05e16081e2ed2b7f5166c6d5381a427ca.
Change-Id: I98809c2208bf270835d5e55fcb28d9aeecd087dc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit b34a39904c8bb03ef37bb3d9278cde5cfb69f6ac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/linguist/shared/proitems.cpp | 10 | ||||
-rw-r--r-- | src/linguist/shared/proitems.h | 6 | ||||
-rw-r--r-- | src/linguist/shared/qmakeparser.cpp | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/linguist/shared/proitems.cpp b/src/linguist/shared/proitems.cpp index 0d80cf53f..2d8faff73 100644 --- a/src/linguist/shared/proitems.cpp +++ b/src/linguist/shared/proitems.cpp @@ -36,9 +36,9 @@ QT_BEGIN_NAMESPACE // from qhash.cpp -uint ProString::hash(const QChar *p, int n) +size_t ProString::hash(const QChar *p, int n) { - uint h = 0; + size_t h = 0; while (n--) { h = (h << 4) + (*p++).unicode(); @@ -80,13 +80,13 @@ ProString::ProString(QStringView str) : } ProString::ProString(const char *str, DoPreHashing) : - m_string(QString::fromLatin1(str)), m_offset(0), m_length(qstrlen(str)), m_file(0) + m_string(QString::fromLatin1(str)), m_offset(0), m_length(int(qstrlen(str))), m_file(0) { updatedHash(); } ProString::ProString(const char *str) : - m_string(QString::fromLatin1(str)), m_offset(0), m_length(qstrlen(str)), m_file(0), m_hash(0x80000000) + m_string(QString::fromLatin1(str)), m_offset(0), m_length(int(qstrlen(str))), m_file(0), m_hash(0x80000000) { } @@ -111,7 +111,7 @@ void ProString::setValue(const QString &str) m_string = str, m_offset = 0, m_length = str.length(), m_hash = 0x80000000; } -uint ProString::updatedHash() const +size_t ProString::updatedHash() const { return (m_hash = hash(m_string.constData() + m_offset, m_length)); } diff --git a/src/linguist/shared/proitems.h b/src/linguist/shared/proitems.h index d9c79e05e..f2600626a 100644 --- a/src/linguist/shared/proitems.h +++ b/src/linguist/shared/proitems.h @@ -139,8 +139,8 @@ public: int toInt(bool *ok = nullptr, int base = 10) const { return toQStringView().toInt(ok, base); } short toShort(bool *ok = nullptr, int base = 10) const { return toQStringView().toShort(ok, base); } - uint hash() const { return m_hash; } - static uint hash(const QChar *p, int n); + size_t hash() const { return m_hash; } + static size_t hash(const QChar *p, int n); ALWAYS_INLINE QStringView toQStringView() const { return QStringView(m_string).mid(m_offset, m_length); } @@ -170,7 +170,7 @@ private: int m_file; mutable uint m_hash; QChar *prepareExtend(int extraLen, int thisTarget, int extraTarget); - uint updatedHash() const; + size_t updatedHash() const; friend size_t qHash(const ProString &str); friend QString operator+(const ProString &one, const ProString &two); friend class ProKey; diff --git a/src/linguist/shared/qmakeparser.cpp b/src/linguist/shared/qmakeparser.cpp index 5ebda399f..20ced5840 100644 --- a/src/linguist/shared/qmakeparser.cpp +++ b/src/linguist/shared/qmakeparser.cpp @@ -291,7 +291,7 @@ void QMakeParser::putBlock(ushort *&tokPtr, const ushort *buf, uint len) void QMakeParser::putHashStr(ushort *&pTokPtr, const ushort *buf, uint len) { - uint hash = ProString::hash((const QChar *)buf, len); + const size_t hash = ProString::hash((const QChar *)buf, len); ushort *tokPtr = pTokPtr; *tokPtr++ = (ushort)hash; *tokPtr++ = (ushort)(hash >> 16); @@ -305,7 +305,7 @@ void QMakeParser::finalizeHashStr(ushort *buf, uint len) { buf[-4] = TokHashLiteral; buf[-1] = len; - uint hash = ProString::hash((const QChar *)buf, len); + const size_t hash = ProString::hash((const QChar *)buf, len); buf[-3] = (ushort)hash; buf[-2] = (ushort)(hash >> 16); } @@ -581,7 +581,7 @@ void QMakeParser::read(ProFile *pro, QStringView in, int line, SubGrammar gramma &buf, &xprBuff, &tokPtr, &tokBuff, cur, in)) { if (rtok == TokVariable || rtok == TokProperty) { xprPtr[-4] = tok; - uint hash = ProString::hash((const QChar *)xprPtr, tlen); + const size_t hash = ProString::hash((const QChar *)xprPtr, tlen); xprPtr[-3] = (ushort)hash; xprPtr[-2] = (ushort)(hash >> 16); xprPtr[-1] = tlen; |