From 41745086bacd31342a829e2fbed96a27edc87519 Mon Sep 17 00:00:00 2001
From: Geoffrey Merck <F4FXL@users.noreply.github.com>
Date: Sun, 26 Dec 2021 08:53:18 +0100
Subject: [PATCH] Unify names

---
 DExtraProtocolHandler.cpp     |  8 ++++----
 DExtraProtocolHandler.h       |  8 ++++----
 DExtraProtocolHandlerPool.cpp | 16 ++++++++--------
 DExtraProtocolHandlerPool.h   |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/DExtraProtocolHandler.cpp b/DExtraProtocolHandler.cpp
index bed2f43..5ef827f 100644
--- a/DExtraProtocolHandler.cpp
+++ b/DExtraProtocolHandler.cpp
@@ -158,7 +158,7 @@ bool CDExtraProtocolHandler::readPackets()
 	}
 }
 
-CHeaderData* CDExtraProtocolHandler::newHeader()
+CHeaderData* CDExtraProtocolHandler::readHeader()
 {
 	if (m_type != DE_HEADER)
 		return NULL;
@@ -175,7 +175,7 @@ CHeaderData* CDExtraProtocolHandler::newHeader()
 	return header;
 }
 
-CAMBEData* CDExtraProtocolHandler::newAMBE()
+CAMBEData* CDExtraProtocolHandler::readAMBE()
 {
 	if (m_type != DE_AMBE)
 		return NULL;
@@ -191,7 +191,7 @@ CAMBEData* CDExtraProtocolHandler::newAMBE()
 	return data;
 }
 
-CPollData* CDExtraProtocolHandler::newPoll()
+CPollData* CDExtraProtocolHandler::readPoll()
 {
 	if (m_type != DE_POLL)
 		return NULL;
@@ -207,7 +207,7 @@ CPollData* CDExtraProtocolHandler::newPoll()
 	return poll;
 }
 
-CConnectData* CDExtraProtocolHandler::newConnect()
+CConnectData* CDExtraProtocolHandler::readConnect()
 {
 	if (m_type != DE_CONNECT)
 		return NULL;
diff --git a/DExtraProtocolHandler.h b/DExtraProtocolHandler.h
index 8ab8dbd..7936bd1 100644
--- a/DExtraProtocolHandler.h
+++ b/DExtraProtocolHandler.h
@@ -53,10 +53,10 @@ public:
 	bool writePoll(const CPollData& poll);
 
 	DEXTRA_TYPE   read();
-	CHeaderData*  newHeader();
-	CAMBEData*    newAMBE();
-	CPollData*    newPoll();
-	CConnectData* newConnect();
+	CHeaderData*  readHeader();
+	CAMBEData*    readAMBE();
+	CPollData*    readPoll();
+	CConnectData* readConnect();
 
 	void close();
 
diff --git a/DExtraProtocolHandlerPool.cpp b/DExtraProtocolHandlerPool.cpp
index 23ac48b..96301f3 100644
--- a/DExtraProtocolHandlerPool.cpp
+++ b/DExtraProtocolHandlerPool.cpp
@@ -99,24 +99,24 @@ DEXTRA_TYPE CDExtraProtocolHandlerPool::read()
 	return DE_NONE;
 }
 
-CHeaderData *CDExtraProtocolHandlerPool::newHeader()
+CHeaderData *CDExtraProtocolHandlerPool::readHeader()
 {
-	return m_index->second->newHeader();
+	return m_index->second->readHeader();
 }
 
-CAMBEData *CDExtraProtocolHandlerPool::newAMBE()
+CAMBEData *CDExtraProtocolHandlerPool::readAMBE()
 {
-	return m_index->second->newAMBE();
+	return m_index->second->readAMBE();
 }
 
-CPollData *CDExtraProtocolHandlerPool::newPoll()
+CPollData *CDExtraProtocolHandlerPool::readPoll()
 {
-	return m_index->second->newPoll();
+	return m_index->second->readPoll();
 }
 
-CConnectData *CDExtraProtocolHandlerPool::newConnect()
+CConnectData *CDExtraProtocolHandlerPool::readConnect()
 {
-	return m_index->second->newConnect();
+	return m_index->second->readConnect();
 }
 
 void CDExtraProtocolHandlerPool::close()
diff --git a/DExtraProtocolHandlerPool.h b/DExtraProtocolHandlerPool.h
index 86bee28..27c0e3e 100644
--- a/DExtraProtocolHandlerPool.h
+++ b/DExtraProtocolHandlerPool.h
@@ -34,10 +34,10 @@ public:
 	void release(CDExtraProtocolHandler *handler);
 
 	DEXTRA_TYPE   read();
-	CHeaderData  *newHeader();
-	CAMBEData    *newAMBE();
-	CPollData    *newPoll();
-	CConnectData *newConnect();
+	CHeaderData  *readHeader();
+	CAMBEData    *readAMBE();
+	CPollData    *readPoll();
+	CConnectData *readConnect();
 
 	void close();