From dad86a80f4230731a95e060dcef058a44943a308 Mon Sep 17 00:00:00 2001
From: Gavin MacGregor <gkthemac@gmail.com>
Date: Sun, 29 Jun 2025 13:46:22 +0100
Subject: [PATCH] Fix compiling with Qt 6.9

---
 src/qteletextmaker/document.cpp    |  4 ++++
 src/qteletextmaker/loadformats.cpp | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/qteletextmaker/document.cpp b/src/qteletextmaker/document.cpp
index f8865e7..faebf70 100644
--- a/src/qteletextmaker/document.cpp
+++ b/src/qteletextmaker/document.cpp
@@ -214,7 +214,11 @@ void TeletextDocument::loadMetaData(QVariantHash const &metadata)
 	}
 
 	for (int i=0; i<numberOfSubPages(); i++) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+		const QString subPageStr = QString("%1").arg(i, 3, '0');
+#else
 		const QString subPageStr = QString("%1").arg(i, 3, QChar('0'));
+#endif
 
 		if (int region = metadata.value("region" + subPageStr).toInt(&valueOk); valueOk)
 			subPage(i)->setDefaultCharSet(region);
diff --git a/src/qteletextmaker/loadformats.cpp b/src/qteletextmaker/loadformats.cpp
index 727b8f1..ed8ee2e 100644
--- a/src/qteletextmaker/loadformats.cpp
+++ b/src/qteletextmaker/loadformats.cpp
@@ -99,14 +99,23 @@ bool LoadTTIFormat::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash
 			bool regionValueOk;
 			const int regionValueRead = inLine.remove(0, 3).toInt(&regionValueOk);
 			if (regionValueOk && metadata != nullptr && regionValueRead >= 0 && regionValueRead <= 15)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+				metadata->insert(QString("region%1").arg(currentSubPageNum, 3, '0'), regionValueRead);
+#else
 				metadata->insert(QString("region%1").arg(currentSubPageNum, 3, QChar('0')), regionValueRead);
+#endif
 		}
 		if (inLine.startsWith("CT,") && (inLine.endsWith(",C") || inLine.endsWith(",T"))) {
 			bool cycleValueOk;
 			const int cycleValueRead = inLine.mid(3, inLine.size()-5).toInt(&cycleValueOk);
 			if (cycleValueOk && metadata != nullptr && cycleValueRead >= 1 && cycleValueRead <= 99) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+				metadata->insert(QString("cycleValue%1").arg(currentSubPageNum, 3, '0'), cycleValueRead);
+				metadata->insert(QString("cycleType%1").arg(currentSubPageNum, 3, '0'), inLine.at(inLine.size()-1));
+#else
 				metadata->insert(QString("cycleValue%1").arg(currentSubPageNum, 3, QChar('0')), cycleValueRead);
 				metadata->insert(QString("cycleType%1").arg(currentSubPageNum, 3, QChar('0')), inLine.at(inLine.size()-1));
+#endif
 			}
 		}
 		if (inLine.startsWith("FL,")) {
@@ -495,7 +504,11 @@ bool LoadEP1Format::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash
 
 		// Deal with language code unique to EP1 - unknown values are mapped to English
 		if (metadata != nullptr)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
+			metadata->insert(QString("region%1").arg(0, 3, '0'), m_languageCode.key(inLine[2], 0x09) >> 3);
+#else
 			metadata->insert(QString("region%1").arg(0, 3, QChar('0')), m_languageCode.key(inLine[2], 0x09) >> 3);
+#endif
 
 		const int nationalOption = m_languageCode.key(inLine[2], 0x09) & 0x7;