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

qlogging: avoid C-style casts

Browse Source 
Amends e38a48200b7e0d20c0ab564bb59bd978d72677b7.

Pick-to: 6.2 6.4
Change-Id: I053cb676398ae3ebc2ba68f0bf7359a0870303bc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Johannes Kauffmann 2022-10-25 21:46:48 +02:00
parent 61a4880cb3
commit 6707b881cf
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 - (qsizetype)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 - (qsizetype)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 - (qsizetype)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 - (qsizetype)strlen(operator_greaterThan) + 1) if (info.indexOf(operator_greaterThan) == pos - qsizetype(strlen(operator_greaterThan)) + 1)
--pos; --pos;
break; break;
case '=': { case '=': {
qsizetype operatorLength = (qsizetype)strlen(operator_lessThanEqual); auto 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)