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.

2 files changed, 26 insertions, 1 deletions

diff --git a/autotests/kconfigtest.cpp b/autotests/kconfigtest.cpp
index 20414e45..6f79f072 100644
--- a/autotests/kconfigtest.cpp
+++ b/autotests/kconfigtest.cpp
@@ -518,7 +518,9 @@ void KConfigTest::testPath()
         QFile file(testConfigDir() + "/pathtest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[Test Group]\n"
             << "homePath=$HOME/foo\n"
             << "homePath2=file://$HOME/foo\n"
@@ -580,7 +582,9 @@ void KConfigTest::testPathQtHome()
         QFile file(testConfigDir() + "/pathtest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[Test Group]\n"
             << "dataDir[$e]=$QT_DATA_HOME/kconfigtest\n"
             << "cacheDir[$e]=$QT_CACHE_HOME/kconfigtest\n"
@@ -1020,7 +1024,9 @@ void KConfigTest::testMerge()
         QFile file(testConfigDir() + "/mergetest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[Merged Group]\n"
             << "entry1=Testing\n"
             << "entry2=More Testing\n"
@@ -1058,7 +1064,9 @@ void KConfigTest::testImmutable()
         QFile file(testConfigDir() + "/immutabletest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[$i]\n"
             << "entry1=Testing\n"
             << "[group][$i]\n"
@@ -1083,7 +1091,9 @@ void KConfigTest::testOptionOrder()
         QFile file(testConfigDir() + "/doubleattrtest");
         file.open(QIODevice::WriteOnly | QIODevice::Text);
         QTextStream out(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         out.setCodec("UTF-8");
+#endif
         out << "[group3]\n"
             << "entry2=unlocalized\n"
             << "entry2[$i][de_DE]=t2\n";
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('[')) {