daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiling with Qt 6.9

Browse Source
This commit is contained in:
Gavin MacGregor
2025-06-29 13:46:22 +01:00
parent 541654a7f7
commit dad86a80f4
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qteletextmaker/document.cpp
View File

@@ -214,7 +214,11 @@ void TeletextDocument::loadMetaData(QVariantHash const &metadata)
} }
for (int i=0; i<numberOfSubPages(); i++) { 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')); const QString subPageStr = QString("%1").arg(i, 3, QChar('0'));
#endif
if (int region = metadata.value("region" + subPageStr).toInt(&valueOk); valueOk) if (int region = metadata.value("region" + subPageStr).toInt(&valueOk); valueOk)
subPage(i)->setDefaultCharSet(region); subPage(i)->setDefaultCharSet(region);

13
src/qteletextmaker/loadformats.cpp
View File

@@ -99,14 +99,23 @@ bool LoadTTIFormat::load(QFile *inFile, QList<PageBase>& subPages, QVariantHash
bool regionValueOk; bool regionValueOk;
const int regionValueRead = inLine.remove(0, 3).toInt(&regionValueOk); const int regionValueRead = inLine.remove(0, 3).toInt(&regionValueOk);
if (regionValueOk && metadata != nullptr && regionValueRead >= 0 && regionValueRead <= 15) 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); metadata->insert(QString("region%1").arg(currentSubPageNum, 3, QChar('0')), regionValueRead);
#endif
} }
if (inLine.startsWith("CT,") && (inLine.endsWith(",C") || inLine.endsWith(",T"))) { if (inLine.startsWith("CT,") && (inLine.endsWith(",C") || inLine.endsWith(",T"))) {
bool cycleValueOk; bool cycleValueOk;
const int cycleValueRead = inLine.mid(3, inLine.size()-5).toInt(&cycleValueOk); const int cycleValueRead = inLine.mid(3, inLine.size()-5).toInt(&cycleValueOk);
if (cycleValueOk && metadata != nullptr && cycleValueRead >= 1 && cycleValueRead <= 99) { 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("cycleValue%1").arg(currentSubPageNum, 3, QChar('0')), cycleValueRead);
metadata->insert(QString("cycleType%1").arg(currentSubPageNum, 3, QChar('0')), inLine.at(inLine.size()-1)); metadata->insert(QString("cycleType%1").arg(currentSubPageNum, 3, QChar('0')), inLine.at(inLine.size()-1));
#endif
} }
} }
if (inLine.startsWith("FL,")) { 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 // Deal with language code unique to EP1 - unknown values are mapped to English
if (metadata != nullptr) 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); 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; const int nationalOption = m_languageCode.key(inLine[2], 0x09) & 0x7;