aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Fabio Bas2023-09-27 17:22:01 +0200
committerGravatar ctrlaltca2023-10-18 10:26:35 +0200
commit2e402d15b5eb28cc70ce5783ebf6473bab97949a (patch)
treea500cdefe65b9126e45e816b2cfa8705bbbf96ca /src/modules
parentPort QDateTime::setTime_t() to setSecsSinceEpoch() (diff)
downloadKVIrc-2e402d15b5eb28cc70ce5783ebf6473bab97949a.tar.gz
KVIrc-2e402d15b5eb28cc70ce5783ebf6473bab97949a.tar.bz2
KVIrc-2e402d15b5eb28cc70ce5783ebf6473bab97949a.zip
Qt6 is stricter when casting numericals and chars. Add an explicit cast/conversion to better digest them
cast
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/list/ListWindow.cpp2
-rw-r--r--src/modules/logview/ExportOperation.cpp4
-rw-r--r--src/modules/logview/LogFile.cpp2
-rw-r--r--src/modules/objects/qtftp/qftp.cpp6
-rw-r--r--src/modules/rijndael/libkvirijndael.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index c84a4eab6..4b7f9c288 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -124,7 +124,7 @@ QSize ChannelTreeWidgetItemDelegate::sizeHint(const QStyleOptionViewItem & sovIt
break;
case 1:
//users
- return QSize(fm.horizontalAdvance(item->itemData()->m_szUsers.toInt()), iHeight);
+ return QSize(fm.horizontalAdvance(item->itemData()->m_szUsers), iHeight);
break;
case 2:
default:
diff --git a/src/modules/logview/ExportOperation.cpp b/src/modules/logview/ExportOperation.cpp
index 49c9f47be..1b9b453d3 100644
--- a/src/modules/logview/ExportOperation.cpp
+++ b/src/modules/logview/ExportOperation.cpp
@@ -36,8 +36,8 @@ void ExportOperation::start()
pFutureWatcher->setFuture(QtConcurrent::map(m_logs, [this](const std::shared_ptr<LogFile> & pLog) {
const QString szDate = pLog->date().toString("yyyy.MM.dd");
QString filename = QString("%1_%2.%3_%4").arg(pLog->typeString(), pLog->name(), pLog->network(), szDate);
- filename.replace(QRegExp("[\\\\/:*?\"<>|]"), "_");
- QString szLog = m_szDir + KVI_PATH_SEPARATOR_CHAR + filename;
+ filename.replace(KviRegExp("[\\\\/:*?\"<>|]"), "_");
+ QString szLog = m_szDir + QString(KVI_PATH_SEPARATOR_CHAR) + filename;
KviFileUtils::adjustFilePath(szLog);
pLog->createLog(m_type, szLog);
}));
diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp
index 0c15b27be..bb2235545 100644
--- a/src/modules/logview/LogFile.cpp
+++ b/src/modules/logview/LogFile.cpp
@@ -207,7 +207,7 @@ void LogFile::createLog(ExportType exportType, QString szLog, QString * pszFile)
/* Save export directory - this directory path is also used in the HTML export
* and info is used when working with pszFile */
QFileInfo info(szLog);
- szLogDir = info.absoluteDir().absolutePath() + KVI_PATH_SEPARATOR_CHAR;
+ szLogDir = info.absoluteDir().absolutePath() + QString(KVI_PATH_SEPARATOR_CHAR);
/* Reading in log file - LogFiles are read in as bytes, so '\r' isn't
* sanitised by default */
diff --git a/src/modules/objects/qtftp/qftp.cpp b/src/modules/objects/qtftp/qftp.cpp
index 935bdb8b0..8fa31ef04 100644
--- a/src/modules/objects/qtftp/qftp.cpp
+++ b/src/modules/objects/qtftp/qftp.cpp
@@ -837,9 +837,9 @@ void QFtpPI::readyRead()
}
}
QString endOfMultiLine;
- endOfMultiLine[0] = '0' + replyCode[0];
- endOfMultiLine[1] = '0' + replyCode[1];
- endOfMultiLine[2] = '0' + replyCode[2];
+ endOfMultiLine[0] = QString::number(replyCode[0])[0];
+ endOfMultiLine[1] = QString::number(replyCode[1])[0];
+ endOfMultiLine[2] = QString::number(replyCode[2])[0];
endOfMultiLine[3] = QLatin1Char(' ');
QString lineCont(endOfMultiLine);
lineCont[3] = QLatin1Char('-');
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index f8443b7b9..27c401e88 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -281,7 +281,7 @@ KviCryptEngine::EncryptResult KviRijndaelEngine::encrypt(const char * plainText,
return KviCryptEngine::EncryptError;
}
}
- outBuffer.prepend(KviControlCodes::CryptEscape);
+ outBuffer.prepend((char) KviControlCodes::CryptEscape);
return KviCryptEngine::Encrypted;
}