diff options
| author |  Fabio Bas | 2023-10-05 17:50:54 +0200 |
|---|---|---|
| committer | ctrlaltca | 2023-10-18 10:26:35 +0200 |
| commit | 2d1bc24d6b6b032dc7db5a2ef7e63bcef43fd511 (patch) | |
| tree | 9181ee4ba29dc99e652f0ff07d4f95642607c4f4 /src/modules | |
| parent | Misc Qt6 port for slightly changed class names and method signatures (diff) | |
| download | KVIrc-2d1bc24d6b6b032dc7db5a2ef7e63bcef43fd511.tar.gz KVIrc-2d1bc24d6b6b032dc7db5a2ef7e63bcef43fd511.tar.bz2 KVIrc-2d1bc24d6b6b032dc7db5a2ef7e63bcef43fd511.zip | |
Changes that will need to be reworked.
QFont changed the weight scale in Qt6, in order to use them we'd need to fix all configuration files in all themes.
QStreamConverter only supports Utf8/16/32 and Latin1 before Qt6.5. Stick to qt5compat's QTextCodec by now
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/file/libkvifile.cpp | 11 | ||||
| -rw-r--r-- | src/modules/help/HelpIndex.cpp | 10 | ||||
| -rw-r--r-- | src/modules/logview/LogFile.cpp | 11 |
3 files changed, 28 insertions, 4 deletions
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index b57cd7f26..ac527f720 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -35,7 +35,11 @@ #include <QFileInfo> #include <QDir> #include <QTextStream> +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #include <QTextCodec> +#else +#include <QStringConverter> +#endif #include <QByteArray> #include <QDateTime> @@ -1081,8 +1085,11 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c) QTextStream stream(&f); - if(!bLocal8Bit) - stream.setCodec(QTextCodec::codecForMib(106)); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + stream.setCodec(bLocal8Bit ? QTextCodec::codecForLocale() : QTextCodec::codecForMib(106)); +#else + stream.setEncoding(bLocal8Bit ? QStringConverter::Latin1 : QStringConverter::Utf8); +#endif for(int i = 0; i < iStartLine; i++) stream.readLine(); diff --git a/src/modules/help/HelpIndex.cpp b/src/modules/help/HelpIndex.cpp index 4ce07616f..33c42781a 100644 --- a/src/modules/help/HelpIndex.cpp +++ b/src/modules/help/HelpIndex.cpp @@ -44,7 +44,11 @@ #include <QByteArray> #include <QTextStream> #include <QUrl> +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #include <QTextCodec> +#else +#include <QStringConverter> +#endif #include <cctype> #include <QTextDocument> #include <QTimer> @@ -200,7 +204,11 @@ void HelpIndex::parseDocument(const QString & filename, int docNum) } QTextStream s(&file); - s.setCodec(QTextCodec::codecForMib(106)); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + s.setCodec(QTextCodec::codecForMib(106)); +#else + s.setEncoding(QStringConverter::Utf8); +#endif QString text = s.readAll(); if(text.isNull()) return; diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp index 471099b73..200a2cb0c 100644 --- a/src/modules/logview/LogFile.cpp +++ b/src/modules/logview/LogFile.cpp @@ -40,6 +40,11 @@ #include <QDir> #include <QTextStream> #include <QLocale> +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) +#include <QTextCodec> +#else +#include <QStringConverter> +#endif #ifdef COMPILE_ZLIB_SUPPORT #include <zlib.h> @@ -431,7 +436,11 @@ void LogFile::createLog(ExportType exportType, QString szLog, QString * pszFile) // Ensure we're writing in UTF-8 QTextStream output(&log); - output.setCodec("UTF-8"); +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + output.setCodec(QTextCodec::codecForMib(106)); +#else + output.setEncoding(QStringConverter::Utf8); +#endif output << szOutputBuffer; // Close file descriptors |