diff options
| author | Nicolas Fella <nicolas.fella@gmx.de> | 2020-12-10 21:15:56 +0100 |
|---|---|---|
| committer | Nicolas Fella <nicolas.fella@gmx.de> | 2021-01-17 19:53:29 +0000 |
| commit | 63b88fed74445e64f05f4cade352a56c7291375e (patch) | |
| tree | b90faaaae3d3dde0a7b9f621c1786d8f65287ebc /src | |
| parent | e4a8a8806c3ebefea4841a59ddee2db8f0d8117a (diff) | |
| download | kconfig-63b88fed74445e64f05f4cade352a56c7291375e.tar.gz kconfig-63b88fed74445e64f05f4cade352a56c7291375e.tar.bz2 | |
Adapt to Qt6 text codec changes
In Qt6 QTextCodec/QTextStream::setCodec is replaced with
QTextStream::setEncoding(QStringConverter::Encoding)
Also UTF-8 is the new default for QTextStream.
Diffstat (limited to 'src')
| -rw-r--r-- | src/kconf_update/kconf_update.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp index 99f6fd5c..08b4e224 100644 --- a/src/kconf_update/kconf_update.cpp +++ b/src/kconf_update/kconf_update.cpp @@ -10,7 +10,6 @@ #include <QDate> #include <QFile> #include <QTextStream> -#include <QTextCodec> #include <QUrl> #include <QTemporaryFile> #include <QCoreApplication> @@ -18,6 +17,10 @@ #include <QProcess> #include <QDebug> +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#include <QTextCodec> +#endif + #include <kconfig.h> #include <kconfiggroup.h> @@ -219,7 +222,11 @@ bool KonfUpdate::checkFile(const QString &filename) } QTextStream ts(&file); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ts.setCodec(QTextCodec::codecForName("ISO-8859-1")); +#else + ts.setEncoding(QStringConverter::Encoding::Latin1); +#endif int lineCount = 0; resetOptions(); QString id; @@ -307,7 +314,11 @@ bool KonfUpdate::updateFile(const QString &filename) qCDebug(KCONF_UPDATE_LOG) << "Checking update-file" << filename << "for new updates"; QTextStream ts(&file); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ts.setCodec(QTextCodec::codecForName("ISO-8859-1")); +#else + ts.setEncoding(QStringConverter::Encoding::Latin1); +#endif m_lineCount = 0; resetOptions(); bool foundVersion = false; @@ -848,7 +859,9 @@ void KonfUpdate::gotScript(const QString &_script) // Copy script stderr to log file { QTextStream ts(proc.readAllStandardError()); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ts.setCodec(QTextCodec::codecForName("UTF-8")); +#endif while (!ts.atEnd()) { QString line = ts.readLine(); qCDebug(KCONF_UPDATE_LOG) << "[Script]" << line; @@ -882,7 +895,9 @@ void KonfUpdate::gotScript(const QString &_script) QFile output(scriptOut.fileName()); if (output.open(QIODevice::ReadOnly)) { QTextStream ts(&output); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ts.setCodec(QTextCodec::codecForName("UTF-8")); +#endif while (!ts.atEnd()) { QString line = ts.readLine(); if (line.startsWith('[')) { |