1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qlogging: use qsizetype to fix Wconversion warnings

Browse Source 
While the strlen() calls don't raise warnings themselves, it seems like
they were artifacts of indexOf() returning int instead of qsizetype.

Task-number: QTBUG-103527
Pick-to: 6.2 6.4
Change-Id: I32fbf69feca38a5977dde084bef9993f24843ccf
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Johannes Kauffmann 2022-10-24 23:21:52 +02:00
parent 4711f078b7
commit e38a48200b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/global/qlogging.cpp
View File

@ -892,7 +892,7 @@ Q_AUTOTEST_EXPORT QByteArray qCleanupFuncinfo(QByteArray info)
if (info.isEmpty()) if (info.isEmpty())
return info; return info;
int pos; qsizetype pos;
// Skip trailing [with XXX] for templates (gcc), but make // Skip trailing [with XXX] for templates (gcc), but make
// sure to not affect Objective-C message names. // sure to not affect Objective-C message names.
@ -939,7 +939,7 @@ Q_AUTOTEST_EXPORT QByteArray qCleanupFuncinfo(QByteArray info)
info.truncate(++pos); info.truncate(++pos);
if (info.at(pos - 1) == ')') { if (info.at(pos - 1) == ')') {
if (info.indexOf(operator_call) == pos - (int)strlen(operator_call)) if (info.indexOf(operator_call) == pos - (qsizetype)strlen(operator_call))
break; break;
// this function returns a pointer to a function // this function returns a pointer to a function
@ -962,19 +962,19 @@ Q_AUTOTEST_EXPORT QByteArray qCleanupFuncinfo(QByteArray info)
if (pos > -1) { if (pos > -1) {
switch (info.at(pos)) { switch (info.at(pos)) {
case ')': case ')':
if (info.indexOf(operator_call) == pos - (int)strlen(operator_call) + 1) if (info.indexOf(operator_call) == pos - (qsizetype)strlen(operator_call) + 1)
pos -= 2; pos -= 2;
break; break;
case '<': case '<':
if (info.indexOf(operator_lessThan) == pos - (int)strlen(operator_lessThan) + 1) if (info.indexOf(operator_lessThan) == pos - (qsizetype)strlen(operator_lessThan) + 1)
--pos; --pos;
break; break;
case '>': case '>':
if (info.indexOf(operator_greaterThan) == pos - (int)strlen(operator_greaterThan) + 1) if (info.indexOf(operator_greaterThan) == pos - (qsizetype)strlen(operator_greaterThan) + 1)
--pos; --pos;
break; break;
case '=': { case '=': {
int operatorLength = (int)strlen(operator_lessThanEqual); qsizetype operatorLength = (qsizetype)strlen(operator_lessThanEqual);
if (info.indexOf(operator_lessThanEqual) == pos - operatorLength + 1) if (info.indexOf(operator_lessThanEqual) == pos - operatorLength + 1)
pos -= 2; pos -= 2;
else if (info.indexOf(operator_greaterThanEqual) == pos - operatorLength + 1) else if (info.indexOf(operator_greaterThanEqual) == pos - operatorLength + 1)
@ -1018,7 +1018,7 @@ Q_AUTOTEST_EXPORT QByteArray qCleanupFuncinfo(QByteArray info)
break; break;
// find the matching close // find the matching close
int end = pos; qsizetype end = pos;
templatecount = 1; templatecount = 1;
--pos; --pos;
while (pos && templatecount) { while (pos && templatecount) {
@ -1181,7 +1181,7 @@ void QMessagePattern::setPattern(const QString &pattern)
tokens[i] = qthreadptrTokenC; tokens[i] = qthreadptrTokenC;
else if (lexeme.startsWith(QLatin1StringView(timeTokenC))) { else if (lexeme.startsWith(QLatin1StringView(timeTokenC))) {
tokens[i] = timeTokenC; tokens[i] = timeTokenC;
int spaceIdx = lexeme.indexOf(QChar::fromLatin1(' ')); qsizetype spaceIdx = lexeme.indexOf(QChar::fromLatin1(' '));
if (spaceIdx > 0) if (spaceIdx > 0)
timeArgs.append(lexeme.mid(spaceIdx + 1, lexeme.size() - spaceIdx - 2)); timeArgs.append(lexeme.mid(spaceIdx + 1, lexeme.size() - spaceIdx - 2));
else else