diff --git a/src/qteletextdecoder/drcspage.cpp b/src/qteletextdecoder/drcspage.cpp index f927610..e5a5752 100644 --- a/src/qteletextdecoder/drcspage.cpp +++ b/src/qteletextdecoder/drcspage.cpp @@ -41,11 +41,6 @@ PageBase::PageFunctionEnum DRCSPage::pageFunction() const return PFGlobalPOP; } -PageBase::PacketCodingEnum DRCSPage::packetCoding() const -{ - return Coding7bit; -} - int DRCSPage::drcsMode(int c) const { if (!packetExists(28, 3)) diff --git a/src/qteletextdecoder/drcspage.h b/src/qteletextdecoder/drcspage.h index 4bc1070..57ebe1d 100644 --- a/src/qteletextdecoder/drcspage.h +++ b/src/qteletextdecoder/drcspage.h @@ -31,7 +31,6 @@ public: // TODO PFNormalPOP as well? PageFunctionEnum pageFunction() const; - PacketCodingEnum packetCoding() const; int drcsMode(int c) const; bool ptu(int c, uchar *data) const; diff --git a/src/qteletextdecoder/levelonepage.cpp b/src/qteletextdecoder/levelonepage.cpp index 46e0ac7..30564b0 100644 --- a/src/qteletextdecoder/levelonepage.cpp +++ b/src/qteletextdecoder/levelonepage.cpp @@ -80,16 +80,6 @@ void LevelOnePage::clearPage() // If clearPage() is called outside constructor, we need to implement m_enhancements.clear(); } -PageBase::PageFunctionEnum LevelOnePage::pageFunction() const -{ - return PFLevelOnePage; -} - -PageBase::PacketCodingEnum LevelOnePage::packetCoding() const -{ - return Coding7bit; -} - bool LevelOnePage::isEmpty() const { if (!m_enhancements.isEmpty()) diff --git a/src/qteletextdecoder/levelonepage.h b/src/qteletextdecoder/levelonepage.h index d05e72e..1d4aed6 100644 --- a/src/qteletextdecoder/levelonepage.h +++ b/src/qteletextdecoder/levelonepage.h @@ -42,9 +42,6 @@ public: LevelOnePage(); LevelOnePage(const PageBase &other); - PageFunctionEnum pageFunction() const override; - PacketCodingEnum packetCoding() const override; - bool isEmpty() const override; QByteArray packet(int y, int d) const override; diff --git a/src/qteletextdecoder/pagebase.cpp b/src/qteletextdecoder/pagebase.cpp index 47e959f..a6a4738 100644 --- a/src/qteletextdecoder/pagebase.cpp +++ b/src/qteletextdecoder/pagebase.cpp @@ -29,12 +29,12 @@ PageBase::PageBase() PageBase::PageFunctionEnum PageBase::pageFunction() const { - return PFUnknown; + return PFLevelOnePage; } PageBase::PacketCodingEnum PageBase::packetCoding() const { - return CodingUnknown; + return Coding7bit; } bool PageBase::isEmpty() const diff --git a/src/qteletextdecoder/pagebase.h b/src/qteletextdecoder/pagebase.h index 3641d7a..17366e3 100644 --- a/src/qteletextdecoder/pagebase.h +++ b/src/qteletextdecoder/pagebase.h @@ -27,9 +27,9 @@ class PageBase public: enum ControlBitsEnum { C4ErasePage, C5Newsflash, C6Subtitle, C7SuppressHeader, C8Update, C9InterruptedSequence, C10InhibitDisplay, C11SerialMagazine, C12NOS, C13NOS, C14NOS }; // Available Page Functions according to 9.4.2.1 of the spec - enum PageFunctionEnum { PFUnknown = -1, PFLevelOnePage, PFDataBroadcasting, PFGlobalPOP, PFNormalPOP, PFGlobalDRCS, PFNormalDRCS, PFMOT, PFMIP, PFBasicTOPTable, PFAdditionalInformationTable, PFMultiPageTable, PFMultiPageExtensionTable, PFTriggerMessages }; + enum PageFunctionEnum { PFLevelOnePage, PFDataBroadcasting, PFGlobalPOP, PFNormalPOP, PFGlobalDRCS, PFNormalDRCS, PFMOT, PFMIP, PFBasicTOPTable, PFAdditionalInformationTable, PFMultiPageTable, PFMultiPageExtensionTable, PFTriggerMessages }; // Available Page Codings of X/1 to X/25 according to 9.4.2.1 of the spec - enum PacketCodingEnum { CodingUnknown = -1, Coding7bit, Coding8bit, Coding18bit, Coding4bit, Coding4bitThen7bit, CodingPerPacket }; + enum PacketCodingEnum { Coding7bit, Coding8bit, Coding18bit, Coding4bit, Coding4bitThen7bit, CodingPerPacket }; PageBase();