From c1f544546575cb7de6dc8b709f234bdfb1a4f9db Mon Sep 17 00:00:00 2001
From: "G.K.MacGregor" <gkthemac@gmail.com>
Date: Sun, 15 Nov 2020 11:34:15 +0000
Subject: [PATCH] No need to keep page number within every subpage

---
 document.cpp | 7 +------
 pagebase.cpp | 8 --------
 pagebase.h   | 4 ----
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/document.cpp b/document.cpp
index 334a1c3..0cae851 100644
--- a/document.cpp
+++ b/document.cpp
@@ -31,7 +31,6 @@ TeletextDocument::TeletextDocument()
 	m_description.clear();
 	m_empty = true;
 	m_subPages.push_back(new LevelOnePage);
-	m_subPages[0]->setPageNumber(m_pageNumber);
 	m_currentSubPageIndex = 0;
 	m_undoStack = new QUndoStack(this);
 	m_cursorRow = 1;
@@ -70,7 +69,6 @@ void TeletextDocument::loadDocument(QFile *inFile)
 			// This assumes that PN is the first command of a new subpage...
 			if (firstSubPageFound) {
 				m_subPages.push_back(new LevelOnePage);
-				m_subPages.back()->setPageNumber(m_pageNumber);
 				loadingPage = m_subPages.back();
 			}
 			m_pageNumber = pageNumberRead;
@@ -200,7 +198,6 @@ void TeletextDocument::insertSubPage(int beforeSubPageIndex, bool copySubPage)
 		insertedSubPage = new LevelOnePage(*m_subPages.at(beforeSubPageIndex));
 	else
 		insertedSubPage = new LevelOnePage;
-	insertedSubPage->setPageNumber(m_pageNumber);
 	if (beforeSubPageIndex == m_subPages.size())
 		m_subPages.push_back(insertedSubPage);
 	else
@@ -234,14 +231,12 @@ void TeletextDocument::setPageNumber(QString pageNumberString)
 
 	m_pageNumber = pageNumberRead;
 
-	for (auto &subPage : m_subPages) {
-		subPage->setPageNumber(pageNumberRead);
+	for (auto &subPage : m_subPages)
 		if (magazineFlip) {
 			for (int i=0; i<6; i++)
 				subPage->setFastTextLinkPageNumber(i, subPage->fastTextLinkPageNumber(i) ^ magazineFlip);
 			for (int i=0; i<8; i++)
 				subPage->setComposeLinkPageNumber(i, subPage->composeLinkPageNumber(i) ^ magazineFlip);
-		}
 	}
 }
 
diff --git a/pagebase.cpp b/pagebase.cpp
index 49ede84..04018c2 100644
--- a/pagebase.cpp
+++ b/pagebase.cpp
@@ -23,7 +23,6 @@
 
 PageBase::PageBase()
 {
-	m_pageNumber = 0x8ff;
 	m_pageFunction = PFLOP;
 	m_packetCoding = PC7bit;
 	// We use nullptrs to keep track of allocated packets, so initialise them this way
@@ -35,7 +34,6 @@ PageBase::PageBase()
 
 PageBase::PageBase(const PageBase &other)
 {
-	setPageNumber(other.pageNumber());
 	setPageFunction(other.pageFunction());
 	setPacketCoding(other.packetCoding());
 	for (int i=0; i<8; i++)
@@ -53,12 +51,6 @@ PageBase::~PageBase()
 		if (m_packets[i] != nullptr)
 			delete m_packets[i];
 }
-
-void PageBase::setPageNumber(int newPageNumber)
-{
-	m_pageNumber = newPageNumber;
-}
-
 QByteArray PageBase::packet(int packetNumber, int designationCode) const
 {
 	int arrayIndex = packetNumber;
diff --git a/pagebase.h b/pagebase.h
index c8e9699..7bf64a9 100644
--- a/pagebase.h
+++ b/pagebase.h
@@ -37,9 +37,6 @@ public:
 	PageBase(const PageBase &);
 	~PageBase();
 
-	int pageNumber() const { return m_pageNumber; }
-	void setPageNumber(int);
-
 	QByteArray packet(int, int=0) const;
 	bool packetNeeded(int, int=0) const;
 	bool setPacket(int, QByteArray);
@@ -60,7 +57,6 @@ public:
 	bool setPacketCoding(PacketCodingEnum);
 
 private:
-	int m_pageNumber;
 	bool m_controlBits[8];
 	PageFunctionEnum m_pageFunction;
 	PacketCodingEnum m_packetCoding;