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

Fix compiling on Qt < 5.14

Browse Source
This commit is contained in:
G.K.MacGregor
2021-04-18 21:21:41 +01:00
parent 690f340922
commit 2ad5d45153
1 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
loadsave.cpp
View File

@@ -193,7 +193,11 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
outLine.insert(c, 0x1b); outLine.insert(c, 0x1b);
c++; c++;
} }
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << outLine << Qt::endl; outStream << outLine << Qt::endl;
#else
outStream << outLine << endl;
#endif
} }
}; };
@@ -207,14 +211,22 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
outLine[0] = designationCode | 0x40; outLine[0] = designationCode | 0x40;
for (int c=1; c<outLine.size(); c++) for (int c=1; c<outLine.size(); c++)
outLine[c] = outLine.at(c) | 0x40; outLine[c] = outLine.at(c) | 0x40;
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << outLine << Qt::endl; outStream << outLine << Qt::endl;
#else
outStream << outLine << endl;
#endif
} }
}; };
outStream.setCodec("ISO-8859-1"); outStream.setCodec("ISO-8859-1");
if (!document.description().isEmpty()) if (!document.description().isEmpty())
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << "DE," << document.description() << Qt::endl; outStream << "DE," << document.description() << Qt::endl;
#else
outStream << "DE," << document.description() << endl;
#endif
// TODO DS and SP commands // TODO DS and SP commands
@@ -224,21 +236,48 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
for (p=0; p<document.numberOfSubPages(); p++) { for (p=0; p<document.numberOfSubPages(); p++) {
outStream << QString("PN,%1%2").arg(document.pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 16, QChar('0')) << Qt::endl; // Page number
outStream << QString("PN,%1%2").arg(document.pageNumber(), 3, 16, QChar('0')).arg(subPageNumber & 0xff, 2, 16, QChar('0'));
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << Qt::endl;
#else
outStream << endl;
#endif
// Subpage
// Magazine Organisation Table and Magazine Inventory Page don't have subpages // Magazine Organisation Table and Magazine Inventory Page don't have subpages
if (document.pageFunction() != TeletextDocument::PFMOT && document.pageFunction() != TeletextDocument::PFMIP) if (document.pageFunction() != TeletextDocument::PFMOT && document.pageFunction() != TeletextDocument::PFMIP) {
outStream << QString("SC,%1").arg(subPageNumber, 4, 16, QChar('0')) << Qt::endl; outStream << QString("SC,%1").arg(subPageNumber, 4, 16, QChar('0'));
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << Qt::endl;
#else
outStream << endl;
#endif
}
outStream << QString("PS,%1").arg(0x8000 | controlBitsToPS(document.subPage(p)), 4, 16, QChar('0')) << Qt::endl; // Status bits
outStream << QString("PS,%1").arg(0x8000 | controlBitsToPS(document.subPage(p)), 4, 16, QChar('0'));
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << Qt::endl;
#else
outStream << endl;
#endif
// Cycle time
if (document.pageFunction() == TeletextDocument::PFLevelOnePage) if (document.pageFunction() == TeletextDocument::PFLevelOnePage)
// Assume that only Level One Pages have configurable cycle times // Assume that only Level One Pages have configurable cycle times
outStream << QString("CT,%1,%2").arg(document.subPage(p)->cycleValue()).arg(document.subPage(p)->cycleType()==LevelOnePage::CTcycles ? 'C' : 'T') << Qt::endl; outStream << QString("CT,%1,%2").arg(document.subPage(p)->cycleValue()).arg(document.subPage(p)->cycleType()==LevelOnePage::CTcycles ? 'C' : 'T');
else else
// X/28/0 specifies page function and coding but the PF command // X/28/0 specifies page function and coding but the PF command
// should make it obvious to a human that this isn't a Level One Page // should make it obvious to a human that this isn't a Level One Page
outStream << QString("PF,%1,%2").arg(document.pageFunction()).arg(document.packetCoding()) << Qt::endl; outStream << QString("PF,%1,%2").arg(document.pageFunction()).arg(document.packetCoding());
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << Qt::endl;
#else
outStream << endl;
#endif
// FastText links
bool writeFLCommand = false; bool writeFLCommand = false;
if (document.pageFunction() == TeletextDocument::PFLevelOnePage && document.subPage(p)->packetNeeded(27,0)) { if (document.pageFunction() == TeletextDocument::PFLevelOnePage && document.subPage(p)->packetNeeded(27,0)) {
// Subpage has FastText links - if any link to a specific subpage, we need to write X/27/0 as raw // Subpage has FastText links - if any link to a specific subpage, we need to write X/27/0 as raw
@@ -285,7 +324,11 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document)
if (i<5) if (i<5)
outStream << ','; outStream << ',';
} }
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
outStream << Qt::endl; outStream << Qt::endl;
#else
outStream << endl;
#endif
} }
subPageNumber++; subPageNumber++;