diff options
| author |  Fabio Bas | 2023-09-27 17:22:01 +0200 |
|---|---|---|
| committer | ctrlaltca | 2023-10-18 10:26:35 +0200 |
| commit | 2e402d15b5eb28cc70ce5783ebf6473bab97949a (patch) | |
| tree | a500cdefe65b9126e45e816b2cfa8705bbbf96ca /src/modules/logview | |
| parent | Port QDateTime::setTime_t() to setSecsSinceEpoch() (diff) | |
| download | KVIrc-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/logview')
| -rw-r--r-- | src/modules/logview/ExportOperation.cpp | 4 | ||||
| -rw-r--r-- | src/modules/logview/LogFile.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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 */ |