diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-07-06 19:36:00 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-07-09 17:16:21 +0000 |
| commit | 6c49c7cf5b9dbb8e24bb11ea7d024a1b2e4c4406 (patch) | |
| tree | e47c573a40257185e36ffabcbd0a02141fa88c94 /src/core5/text | |
| parent | 3af9c76e3a85dc1b6cf56ff2766f4ba1ab5a222f (diff) | |
Prepare for adding -Wshorten-64-to-32 to headersclean
Pick-to: 6.4 6.3 6.2
Change-Id: I52074fc67909c05daae6d750fc9bf9294d55eaf4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/core5/text')
| -rw-r--r-- | src/core5/text/qstringref.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core5/text/qstringref.h b/src/core5/text/qstringref.h index e6223a4..d6d5194 100644 --- a/src/core5/text/qstringref.h +++ b/src/core5/text/qstringref.h @@ -256,13 +256,13 @@ inline Q_DECL_PURE_FUNCTION size_t qHash(const QStringRef &key, size_t seed = 0) QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QStringRef) inline QStringRef &QStringRef::operator=(const QString *aString) -{ m_string = aString; m_position = 0; m_size = aString?aString->size():0; return *this; } +{ m_string = aString; m_position = 0; m_size = aString ? int(aString->size()) : 0; return *this; } inline QStringRef::QStringRef(const QString *aString, int aPosition, int aSize) :m_string(aString), m_position(aPosition), m_size(aSize){} inline QStringRef::QStringRef(const QString *aString) - :m_string(aString), m_position(0), m_size(aString?aString->size() : 0){} + :m_string(aString), m_position(0), m_size(aString ? int(aString->size()) : 0){} // QStringRef <> QStringRef Q_CORE5COMPAT_EXPORT bool operator==(const QStringRef &s1, const QStringRef &s2) noexcept; |