Unify names

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;

DExtraProtocolHandler.h

@@ -53,10 +53,10 @@ public:
 	bool writePoll(const CPollData& poll);
 
 	DEXTRA_TYPE   read();
-	CHeaderData*  newHeader();
+	CHeaderData*  readHeader();
-	CAMBEData*    newAMBE();
+	CAMBEData*    readAMBE();
-	CPollData*    newPoll();
+	CPollData*    readPoll();
-	CConnectData* newConnect();
+	CConnectData* readConnect();
 
 	void close();
 

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()

DExtraProtocolHandlerPool.h

@@ -34,10 +34,10 @@ public:
 	void release(CDExtraProtocolHandler *handler);
 
 	DEXTRA_TYPE   read();
-	CHeaderData  *newHeader();
+	CHeaderData  *readHeader();
-	CAMBEData    *newAMBE();
+	CAMBEData    *readAMBE();
-	CPollData    *newPoll();
+	CPollData    *readPoll();
-	CConnectData *newConnect();
+	CConnectData *readConnect();
 
 	void close();