Fix a number of MSVC integer conversion warnings

Mostly related to qstrlen().

Change-Id: I69e2052c83766e4fc466ed398d0d0eac011a77ec
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Friedemann Kleint 2020-09-07 14:45:42 +02:00
parent d49a7412f5
commit bbec7aaf3a
10 changed files with 15 additions and 15 deletions

View File

@ -233,7 +233,7 @@ static QStringList childKeysOrGroups(HKEY parentHandle, QSettingsPrivate::ChildS
QByteArray buff(m * sizeof(wchar_t), 0); QByteArray buff(m * sizeof(wchar_t), 0);
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
QString item; QString item;
DWORD l = buff.size() / sizeof(wchar_t); DWORD l = DWORD(buff.size()) / DWORD(sizeof(wchar_t));
if (spec == QSettingsPrivate::ChildKeys) { if (spec == QSettingsPrivate::ChildKeys) {
res = RegEnumValue(parentHandle, i, reinterpret_cast<wchar_t *>(buff.data()), &l, 0, 0, 0, 0); res = RegEnumValue(parentHandle, i, reinterpret_cast<wchar_t *>(buff.data()), &l, 0, 0, 0, 0);
} else { } else {

View File

@ -263,7 +263,7 @@ QObject *QMetaObject::newInstance(QGenericArgument val0,
int paramCount; int paramCount;
for (paramCount = 0; paramCount < MaximumParamCount; ++paramCount) { for (paramCount = 0; paramCount < MaximumParamCount; ++paramCount) {
int len = qstrlen(typeNames[paramCount]); int len = int(qstrlen(typeNames[paramCount]));
if (len <= 0) if (len <= 0)
break; break;
sig.append(typeNames[paramCount], len); sig.append(typeNames[paramCount], len);
@ -1184,8 +1184,8 @@ bool QMetaObject::checkConnectArgs(const char *signal, const char *method)
while (*s2++ != '(') { } while (*s2++ != '(') { }
if (*s2 == ')' || qstrcmp(s1,s2) == 0) // method has no args or if (*s2 == ')' || qstrcmp(s1,s2) == 0) // method has no args or
return true; // exact match return true; // exact match
int s1len = qstrlen(s1); const auto s1len = qstrlen(s1);
int s2len = qstrlen(s2); const auto s2len = qstrlen(s2);
if (s2len < s1len && strncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',') if (s2len < s1len && strncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',')
return true; // method has less args return true; // method has less args
return false; return false;
@ -1414,7 +1414,7 @@ bool QMetaObject::invokeMethod(QObject *obj,
return false; return false;
QVarLengthArray<char, 512> sig; QVarLengthArray<char, 512> sig;
int len = qstrlen(member); int len = int(qstrlen(member));
if (len <= 0) if (len <= 0)
return false; return false;
sig.append(member, len); sig.append(member, len);
@ -1426,7 +1426,7 @@ bool QMetaObject::invokeMethod(QObject *obj,
int paramCount; int paramCount;
for (paramCount = 1; paramCount < MaximumParamCount; ++paramCount) { for (paramCount = 1; paramCount < MaximumParamCount; ++paramCount) {
len = qstrlen(typeNames[paramCount]); len = int(qstrlen(typeNames[paramCount]));
if (len <= 0) if (len <= 0)
break; break;
sig.append(typeNames[paramCount], len); sig.append(typeNames[paramCount], len);

View File

@ -2342,7 +2342,7 @@ static inline int qMetaTypeTypeImpl(const char *typeName, int length)
*/ */
Q_CORE_EXPORT int qMetaTypeTypeInternal(const char *typeName) Q_CORE_EXPORT int qMetaTypeTypeInternal(const char *typeName)
{ {
return qMetaTypeTypeImpl</*tryNormalizedType=*/false>(typeName, qstrlen(typeName)); return qMetaTypeTypeImpl</*tryNormalizedType=*/false>(typeName, int(qstrlen(typeName)));
} }
/*! /*!

View File

@ -3574,7 +3574,7 @@ void QMetaObject::connectSlotsByName(QObject *o)
// chosen 'at random' (order of declaration in source file) // chosen 'at random' (order of declaration in source file)
QList<QByteArray> compatibleSignals; QList<QByteArray> compatibleSignals;
const QMetaObject *smo = co->metaObject(); const QMetaObject *smo = co->metaObject();
int sigLen = qstrlen(signal) - 1; // ignore the trailing ')' int sigLen = int(qstrlen(signal)) - 1; // ignore the trailing ')'
for (int k = QMetaObjectPrivate::absoluteSignalCount(smo)-1; k >= 0; --k) { for (int k = QMetaObjectPrivate::absoluteSignalCount(smo)-1; k >= 0; --k) {
const QMetaMethod method = QMetaObjectPrivate::signal(smo, k); const QMetaMethod method = QMetaObjectPrivate::signal(smo, k);
if (!qstrncmp(method.methodSignature().constData(), signal, sigLen)) { if (!qstrncmp(method.methodSignature().constData(), signal, sigLen)) {

View File

@ -270,7 +270,7 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib)
qsizetype pos = 0; qsizetype pos = 0;
char pattern[] = "qTMETADATA "; char pattern[] = "qTMETADATA ";
pattern[0] = 'Q'; // Ensure the pattern "QTMETADATA" is not found in this library should QPluginLoader ever encounter it. pattern[0] = 'Q'; // Ensure the pattern "QTMETADATA" is not found in this library should QPluginLoader ever encounter it.
const ulong plen = qstrlen(pattern); const ulong plen = ulong(qstrlen(pattern));
#if defined (Q_OF_ELF) && defined(Q_CC_GNU) #if defined (Q_OF_ELF) && defined(Q_CC_GNU)
int r = QElfParser().parse(filedata, fdlen, library, lib, &pos, &fdlen); int r = QElfParser().parse(filedata, fdlen, library, lib, &pos, &fdlen);
if (r == QElfParser::Corrupt || r == QElfParser::NotElf) { if (r == QElfParser::Corrupt || r == QElfParser::NotElf) {

View File

@ -1361,7 +1361,7 @@ QDataStream &QDataStream::operator<<(const char *s)
*this << (quint32)0; *this << (quint32)0;
return *this; return *this;
} }
uint len = qstrlen(s) + 1; // also write null terminator int len = int(qstrlen(s)) + 1; // also write null terminator
*this << (quint32)len; // write length specifier *this << (quint32)len; // write length specifier
writeRawData(s, len); writeRawData(s, len);
return *this; return *this;

View File

@ -636,7 +636,7 @@ QByteArray qUncompress(const uchar* data, qsizetype nbytes)
size_t expectedSize = size_t((data[0] << 24) | (data[1] << 16) | size_t expectedSize = size_t((data[0] << 24) | (data[1] << 16) |
(data[2] << 8) | (data[3] )); (data[2] << 8) | (data[3] ));
size_t len = qMax(expectedSize, 1ul); size_t len = qMax(expectedSize, 1ul);
const ulong maxPossibleSize = MaxAllocSize - sizeof(QByteArray::Data); const size_t maxPossibleSize = MaxAllocSize - sizeof(QByteArray::Data);
if (Q_UNLIKELY(len >= maxPossibleSize)) { if (Q_UNLIKELY(len >= maxPossibleSize)) {
// QByteArray does not support that huge size anyway. // QByteArray does not support that huge size anyway.
return invalidCompressedData(); return invalidCompressedData();

View File

@ -3992,8 +3992,8 @@ QString QLocale::currencySymbol(QLocale::CurrencySymbolFormat format) const
return d->m_data->currencyDisplayName().getListEntry(currency_display_name_data, 0); return d->m_data->currencyDisplayName().getListEntry(currency_display_name_data, 0);
case CurrencyIsoCode: { case CurrencyIsoCode: {
const char *code = d->m_data->m_currency_iso_code; const char *code = d->m_data->m_currency_iso_code;
if (int len = qstrnlen(code, 3)) if (auto len = qstrnlen(code, 3))
return QString::fromLatin1(code, len); return QString::fromLatin1(code, int(len));
break; break;
} }
} }

View File

@ -102,7 +102,7 @@ static bool containsTLDEntry(QStringView entry, TLDMatchType match)
const auto utf8 = tldData[chunk] + chunkIndex; const auto utf8 = tldData[chunk] + chunkIndex;
if ((symbol.isEmpty() || QLatin1Char(*utf8) == symbol) && entry == QString::fromUtf8(utf8 + symbol.size())) if ((symbol.isEmpty() || QLatin1Char(*utf8) == symbol) && entry == QString::fromUtf8(utf8 + symbol.size()))
return true; return true;
chunkIndex += qstrlen(utf8) + 1; // +1 for the ending \0 chunkIndex += uint(qstrlen(utf8)) + 1; // +1 for the ending \0
} }
return false; return false;
} }

View File

@ -678,7 +678,7 @@ QVariant QWindowsMimeText::convertToMime(const QString &mime, LPDATAOBJECT pData
data = getData(CF_TEXT, pDataObj); data = getData(CF_TEXT, pDataObj);
if (!data.isEmpty()) { if (!data.isEmpty()) {
const char* d = data.data(); const char* d = data.data();
const unsigned s = qstrlen(d); const unsigned s = unsigned(qstrlen(d));
QByteArray r(data.size()+1, '\0'); QByteArray r(data.size()+1, '\0');
char* o = r.data(); char* o = r.data();
int j=0; int j=0;