diff --git a/levelonepage.cpp b/levelonepage.cpp index d55f2c8..79aafdb 100644 --- a/levelonepage.cpp +++ b/levelonepage.cpp @@ -37,11 +37,11 @@ LevelOnePage::LevelOnePage(const PageBase &other) clearPage(); for (int i=0; i<26; i++) - if (other.packetNeeded(i)) + if (other.packetExists(i)) setPacket(i, other.packet(i)); for (int i=26; i<30; i++) for (int j=0; j<16; j++) - if (other.packetNeeded(i, j)) + if (other.packetExists(i, j)) setPacket(i, j, other.packet(i)); for (int i=PageBase::C4ErasePage; i<=PageBase::C14NOS; i++) @@ -254,7 +254,7 @@ bool LevelOnePage::setPacket(int packetNumber, int designationCode, QByteArray p return PageBase::setPacket(packetNumber, designationCode, packetContents); } -bool LevelOnePage::packetNeeded(int packetNumber) const +bool LevelOnePage::packetExists(int packetNumber) const { if (packetNumber <= 24) { for (int c=0; c<40; c++) @@ -263,10 +263,10 @@ bool LevelOnePage::packetNeeded(int packetNumber) const return false; } - return PageBase::packetNeeded(packetNumber); + return PageBase::packetExists(packetNumber); } -bool LevelOnePage::packetNeeded(int packetNumber, int designationCode) const +bool LevelOnePage::packetExists(int packetNumber, int designationCode) const { if (packetNumber == 26) return packetFromEnhancementListNeeded(designationCode); @@ -298,7 +298,7 @@ bool LevelOnePage::packetNeeded(int packetNumber, int designationCode) const return !isPaletteDefault(0,15); } - return PageBase::packetNeeded(packetNumber, designationCode); + return PageBase::packetExists(packetNumber, designationCode); } bool LevelOnePage::controlBit(int bitNumber) const diff --git a/levelonepage.h b/levelonepage.h index 110b926..5856670 100644 --- a/levelonepage.h +++ b/levelonepage.h @@ -42,8 +42,8 @@ public: QByteArray packet(int) const override; QByteArray packet(int, int) const override; - bool packetNeeded(int) const override; - bool packetNeeded(int, int) const override; + bool packetExists(int) const override; + bool packetExists(int, int) const override; bool setPacket(int, QByteArray) override; bool setPacket(int, int, QByteArray) override; diff --git a/loadsave.cpp b/loadsave.cpp index 0d9a5c5..b0eb1a0 100644 --- a/loadsave.cpp +++ b/loadsave.cpp @@ -182,7 +182,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document) auto write7bitPacket=[&](int packetNumber) { - if (document.subPage(p)->packetNeeded(packetNumber)) { + if (document.subPage(p)->packetExists(packetNumber)) { QByteArray outLine = document.subPage(p)->packet(packetNumber); outStream << QString("OL,%1,").arg(packetNumber); @@ -203,7 +203,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document) auto writeHammingPacket=[&](int packetNumber, int designationCode=0) { - if (document.subPage(p)->packetNeeded(packetNumber, designationCode)) { + if (document.subPage(p)->packetExists(packetNumber, designationCode)) { QByteArray outLine = document.subPage(p)->packet(packetNumber, designationCode); outStream << QString("OL,%1,").arg(packetNumber); @@ -279,7 +279,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document) // FastText links bool writeFLCommand = false; - if (document.pageFunction() == TeletextDocument::PFLevelOnePage && document.subPage(p)->packetNeeded(27,0)) { + if (document.pageFunction() == TeletextDocument::PFLevelOnePage && document.subPage(p)->packetExists(27,0)) { // Subpage has FastText links - if any link to a specific subpage, we need to write X/27/0 as raw // otherwise we write the links as a human-readable FL command later on writeFLCommand = true; @@ -337,7 +337,7 @@ void saveTTI(QSaveFile &file, const TeletextDocument &document) QByteArray rowPacketAlways(PageBase *subPage, int packetNumber) { - if (subPage->packetNeeded(packetNumber)) + if (subPage->packetExists(packetNumber)) return subPage->packet(packetNumber); else return QByteArray(40, ' '); @@ -388,7 +388,7 @@ QString exportHashStringPackets(LevelOnePage *subPage) const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"; QString result; - if (subPage->packetNeeded(28,0) || subPage->packetNeeded(28,4)) { + if (subPage->packetExists(28,0) || subPage->packetExists(28,4)) { // X/28/0 and X/28/4 are duplicates apart from the CLUT definitions // Assemble the duplicate beginning and ending of both packets QString x28StringBegin, x28StringEnd; @@ -399,9 +399,9 @@ QString exportHashStringPackets(LevelOnePage *subPage) x28StringEnd = QString("%1%2%3%4").arg(subPage->defaultScreenColour(), 2, 16, QChar('0')).arg(subPage->defaultRowColour(), 2, 16, QChar('0')).arg(subPage->blackBackgroundSubst(), 1, 10).arg(subPage->colourTableRemap(), 1, 10); - if (subPage->packetNeeded(28,0)) + if (subPage->packetExists(28,0)) result.append(":X280=" + x28StringBegin + colourToHexString(2) + colourToHexString(3) + x28StringEnd); - if (subPage->packetNeeded(28,4)) + if (subPage->packetExists(28,4)) result.append(":X284=" + x28StringBegin + colourToHexString(0) + colourToHexString(1) + x28StringEnd); } diff --git a/pagebase.h b/pagebase.h index f285673..3a3f8ea 100644 --- a/pagebase.h +++ b/pagebase.h @@ -37,8 +37,8 @@ public: virtual QByteArray packet(int) const; virtual QByteArray packet(int, int) const; - virtual bool packetNeeded(int i) const { return m_displayPackets[i] != nullptr; } - virtual bool packetNeeded(int i, int j) const { return m_designationPackets[i-26][j] != nullptr; } + virtual bool packetExists(int i) const { return m_displayPackets[i] != nullptr; } + virtual bool packetExists(int i, int j) const { return m_designationPackets[i-26][j] != nullptr; } virtual bool setPacket(int, QByteArray); virtual bool setPacket(int, int, QByteArray); // bool deletePacket(int);