Renamed net::*{part|structure} to net::*message{Part|Structure}. Splitted code in multiple files.

4 files changed, 53 insertions, 52 deletions

diff --git a/src/net/imap/IMAPMessage.cpp b/src/net/imap/IMAPMessage.cpp
index 7e88ef85..185af73e 100644
--- a/src/net/imap/IMAPMessage.cpp
+++ b/src/net/imap/IMAPMessage.cpp
@@ -33,8 +33,8 @@
 #include "vmime/net/imap/IMAPStore.hpp"
 #include "vmime/net/imap/IMAPConnection.hpp"
 #include "vmime/net/imap/IMAPUtils.hpp"
-#include "vmime/net/imap/IMAPStructure.hpp"
-#include "vmime/net/imap/IMAPPart.hpp"
+#include "vmime/net/imap/IMAPMessageStructure.hpp"
+#include "vmime/net/imap/IMAPMessagePart.hpp"
 #include "vmime/net/imap/IMAPMessagePartContentHandler.hpp"
 
 #include "vmime/utility/outputStreamAdapter.hpp"
@@ -169,7 +169,7 @@ int IMAPMessage::getFlags() const
 }
 
 
-ref <const structure> IMAPMessage::getStructure() const
+ref <const messageStructure> IMAPMessage::getStructure() const
 {
 	if (m_structure == NULL)
 		throw exceptions::unfetched_object();
@@ -178,7 +178,7 @@ ref <const structure> IMAPMessage::getStructure() const
 }
 
 
-ref <structure> IMAPMessage::getStructure()
+ref <messageStructure> IMAPMessage::getStructure()
 {
 	if (m_structure == NULL)
 		throw exceptions::unfetched_object();
@@ -209,7 +209,7 @@ void IMAPMessage::extract(utility::outputStream& os, utility::progressListener*
 
 
 void IMAPMessage::extractPart
-	(ref <const part> p, utility::outputStream& os, utility::progressListener* progress,
+	(ref <const messagePart> p, utility::outputStream& os, utility::progressListener* progress,
 	 const int start, const int length, const bool peek) const
 {
 	ref <const IMAPFolder> folder = m_folder.acquire();
@@ -221,7 +221,7 @@ void IMAPMessage::extractPart
 }
 
 
-void IMAPMessage::fetchPartHeader(ref <part> p)
+void IMAPMessage::fetchPartHeader(ref <messagePart> p)
 {
 	ref <IMAPFolder> folder = m_folder.acquire();
 
@@ -233,15 +233,15 @@ void IMAPMessage::fetchPartHeader(ref <part> p)
 
 	extractImpl(p, ossAdapter, NULL, 0, -1, EXTRACT_HEADER | EXTRACT_PEEK);
 
-	p.dynamicCast <IMAPPart>()->getOrCreateHeader().parse(oss.str());
+	p.dynamicCast <IMAPMessagePart>()->getOrCreateHeader().parse(oss.str());
 }
 
 
-void IMAPMessage::fetchPartHeaderForStructure(ref <structure> str)
+void IMAPMessage::fetchPartHeaderForStructure(ref <messageStructure> str)
 {
 	for (size_t i = 0, n = str->getPartCount() ; i < n ; ++i)
 	{
-		ref <class part> part = str->getPartAt(i);
+		ref <messagePart> part = str->getPartAt(i);
 
 		// Fetch header of current part
 		fetchPartHeader(part);
@@ -252,7 +252,7 @@ void IMAPMessage::fetchPartHeaderForStructure(ref <structure> str)
 }
 
 
-void IMAPMessage::extractImpl(ref <const part> p, utility::outputStream& os,
+void IMAPMessage::extractImpl(ref <const messagePart> p, utility::outputStream& os,
 	utility::progressListener* progress, const int start,
 	const int length, const int extractFlags) const
 {
@@ -266,7 +266,7 @@ void IMAPMessage::extractImpl(ref <const part> p, utility::outputStream& os,
 
 	if (p != NULL)
 	{
-		ref <const IMAPPart> currentPart = p.dynamicCast <const IMAPPart>();
+		ref <const IMAPMessagePart> currentPart = p.dynamicCast <const IMAPMessagePart>();
 		std::vector <int> numbers;
 
 		numbers.push_back(currentPart->getNumber());
@@ -456,7 +456,7 @@ void IMAPMessage::processFetchResponse
 		}
 		case IMAPParser::msg_att_item::BODY_STRUCTURE:
 		{
-			m_structure = vmime::create <IMAPStructure>((*it)->body());
+			m_structure = vmime::create <IMAPMessageStructure>((*it)->body());
 			break;
 		}
 		case IMAPParser::msg_att_item::RFC822_HEADER:
@@ -632,11 +632,12 @@ void IMAPMessage::setFlags(const int flags, const int mode)
 }
 
 
-void IMAPMessage::constructParsedMessage(ref <bodyPart> parentPart, ref <structure> str, int level)
+void IMAPMessage::constructParsedMessage
+	(ref <bodyPart> parentPart, ref <messageStructure> str, int level)
 {
 	if (level == 0)
 	{
-		ref <class part> part = str->getPartAt(0);
+		ref <messagePart> part = str->getPartAt(0);
 
 		// Copy header
 		ref <const header> hdr = part->getHeader();
@@ -654,7 +655,7 @@ void IMAPMessage::constructParsedMessage(ref <bodyPart> parentPart, ref <structu
 	{
 		for (size_t i = 0, n = str->getPartCount() ; i < n ; ++i)
 		{
-			ref <class part> part = str->getPartAt(i);
+			ref <messagePart> part = str->getPartAt(i);
 
 			ref <bodyPart> childPart = vmime::create <bodyPart>();
 
@@ -681,7 +682,7 @@ void IMAPMessage::constructParsedMessage(ref <bodyPart> parentPart, ref <structu
 ref <vmime::message> IMAPMessage::getParsedMessage()
 {
 	// Fetch structure
-	ref <structure> structure = NULL;
+	ref <messageStructure> structure = NULL;
 
 	try
 	{
diff --git a/src/net/imap/IMAPPart.cpp b/src/net/imap/IMAPMessagePart.cpp
index b5b754cb..48e063e8 100644
--- a/src/net/imap/IMAPPart.cpp
+++ b/src/net/imap/IMAPMessagePart.cpp
@@ -27,8 +27,8 @@
 #if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP
 
 
-#include "vmime/net/imap/IMAPPart.hpp"
-#include "vmime/net/imap/IMAPStructure.hpp"
+#include "vmime/net/imap/IMAPMessagePart.hpp"
+#include "vmime/net/imap/IMAPMessageStructure.hpp"
 
 
 namespace vmime {
@@ -36,7 +36,7 @@ namespace net {
 namespace imap {
 
 
-IMAPPart::IMAPPart(ref <IMAPPart> parent, const int number, const IMAPParser::body_type_mpart* mpart)
+IMAPMessagePart::IMAPMessagePart(ref <IMAPMessagePart> parent, const int number, const IMAPParser::body_type_mpart* mpart)
 	: m_parent(parent), m_header(NULL), m_number(number), m_size(0)
 {
 	m_mediaType = vmime::mediaType
@@ -44,7 +44,7 @@ IMAPPart::IMAPPart(ref <IMAPPart> parent, const int number, const IMAPParser::bo
 }
 
 
-IMAPPart::IMAPPart(ref <IMAPPart> parent, const int number, const IMAPParser::body_type_1part* part)
+IMAPMessagePart::IMAPMessagePart(ref <IMAPMessagePart> parent, const int number, const IMAPParser::body_type_1part* part)
 	: m_parent(parent), m_header(NULL), m_number(number), m_size(0)
 {
 	if (part->body_type_text())
@@ -74,49 +74,49 @@ IMAPPart::IMAPPart(ref <IMAPPart> parent, const int number, const IMAPParser::bo
 }
 
 
-ref <const structure> IMAPPart::getStructure() const
+ref <const messageStructure> IMAPMessagePart::getStructure() const
 {
 	if (m_structure != NULL)
 		return m_structure;
 	else
-		return IMAPStructure::emptyStructure();
+		return IMAPMessageStructure::emptyStructure();
 }
 
 
-ref <structure> IMAPPart::getStructure()
+ref <messageStructure> IMAPMessagePart::getStructure()
 {
 	if (m_structure != NULL)
 		return m_structure;
 	else
-		return IMAPStructure::emptyStructure();
+		return IMAPMessageStructure::emptyStructure();
 }
 
 
-ref <const IMAPPart> IMAPPart::getParent() const
+ref <const IMAPMessagePart> IMAPMessagePart::getParent() const
 {
 	return m_parent.acquire();
 }
 
 
-const mediaType& IMAPPart::getType() const
+const mediaType& IMAPMessagePart::getType() const
 {
 	return m_mediaType;
 }
 
 
-int IMAPPart::getSize() const
+int IMAPMessagePart::getSize() const
 {
 	return m_size;
 }
 
 
-int IMAPPart::getNumber() const
+int IMAPMessagePart::getNumber() const
 {
 	return m_number;
 }
 
 
-ref <const header> IMAPPart::getHeader() const
+ref <const header> IMAPMessagePart::getHeader() const
 {
 	if (m_header == NULL)
 		throw exceptions::unfetched_object();
@@ -126,24 +126,24 @@ ref <const header> IMAPPart::getHeader() const
 
 
 // static
-ref <IMAPPart> IMAPPart::create
-	(ref <IMAPPart> parent, const int number, const IMAPParser::body* body)
+ref <IMAPMessagePart> IMAPMessagePart::create
+	(ref <IMAPMessagePart> parent, const int number, const IMAPParser::body* body)
 {
 	if (body->body_type_mpart())
 	{
-		ref <IMAPPart> part = vmime::create <IMAPPart>(parent, number, body->body_type_mpart());
-		part->m_structure = vmime::create <IMAPStructure>(part, body->body_type_mpart()->list());
+		ref <IMAPMessagePart> part = vmime::create <IMAPMessagePart>(parent, number, body->body_type_mpart());
+		part->m_structure = vmime::create <IMAPMessageStructure>(part, body->body_type_mpart()->list());
 
 		return part;
 	}
 	else
 	{
-		return vmime::create <IMAPPart>(parent, number, body->body_type_1part());
+		return vmime::create <IMAPMessagePart>(parent, number, body->body_type_1part());
 	}
 }
 
 
-header& IMAPPart::getOrCreateHeader()
+header& IMAPMessagePart::getOrCreateHeader()
 {
 	if (m_header != NULL)
 		return *m_header;
diff --git a/src/net/imap/IMAPMessagePartContentHandler.cpp b/src/net/imap/IMAPMessagePartContentHandler.cpp
index c34dc076..34d53ac5 100644
--- a/src/net/imap/IMAPMessagePartContentHandler.cpp
+++ b/src/net/imap/IMAPMessagePartContentHandler.cpp
@@ -39,7 +39,7 @@ namespace imap {
 
 
 IMAPMessagePartContentHandler::IMAPMessagePartContentHandler
-	(ref <IMAPMessage> msg, ref <class part> part, const vmime::encoding& encoding)
+	(ref <IMAPMessage> msg, ref <messagePart> part, const vmime::encoding& encoding)
 	: m_message(msg), m_part(part), m_encoding(encoding)
 {
 }
@@ -49,7 +49,7 @@ ref <contentHandler> IMAPMessagePartContentHandler::clone() const
 {
 	return create <IMAPMessagePartContentHandler>
 		(m_message.acquire().constCast <IMAPMessage>(),
-		 m_part.acquire().constCast <part>(),
+		 m_part.acquire().constCast <messagePart>(),
 		 m_encoding);
 }
 
@@ -58,7 +58,7 @@ void IMAPMessagePartContentHandler::generate
 	(utility::outputStream& os, const vmime::encoding& enc, const string::size_type maxLineLength) const
 {
 	ref <IMAPMessage> msg = m_message.acquire().constCast <IMAPMessage>();
-	ref <part> part = m_part.acquire().constCast <class part>();
+	ref <messagePart> part = m_part.acquire().constCast <messagePart>();
 
 	// Data is already encoded
 	if (isEncoded())
@@ -125,7 +125,7 @@ void IMAPMessagePartContentHandler::extract
 	(utility::outputStream& os, utility::progressListener* progress) const
 {
 	ref <IMAPMessage> msg = m_message.acquire().constCast <IMAPMessage>();
-	ref <part> part = m_part.acquire().constCast <class part>();
+	ref <messagePart> part = m_part.acquire().constCast <messagePart>();
 
 	// No decoding to perform
 	if (!isEncoded())
@@ -155,7 +155,7 @@ void IMAPMessagePartContentHandler::extractRaw
 	(utility::outputStream& os, utility::progressListener* progress) const
 {
 	ref <IMAPMessage> msg = m_message.acquire().constCast <IMAPMessage>();
-	ref <part> part = m_part.acquire().constCast <class part>();
+	ref <messagePart> part = m_part.acquire().constCast <messagePart>();
 
 	msg->extractPart(part, os, progress);
 }
diff --git a/src/net/imap/IMAPStructure.cpp b/src/net/imap/IMAPMessageStructure.cpp
index 4e04aa95..60f26c68 100644
--- a/src/net/imap/IMAPStructure.cpp
+++ b/src/net/imap/IMAPMessageStructure.cpp
@@ -27,8 +27,8 @@
 #if VMIME_HAVE_MESSAGING_FEATURES && VMIME_HAVE_MESSAGING_PROTO_IMAP
 
 
-#include "vmime/net/imap/IMAPStructure.hpp"
-#include "vmime/net/imap/IMAPPart.hpp"
+#include "vmime/net/imap/IMAPMessageStructure.hpp"
+#include "vmime/net/imap/IMAPMessagePart.hpp"
 
 
 namespace vmime {
@@ -36,51 +36,51 @@ namespace net {
 namespace imap {
 
 
-IMAPStructure::IMAPStructure()
+IMAPMessageStructure::IMAPMessageStructure()
 {
 }
 
 
-IMAPStructure::IMAPStructure(const IMAPParser::body* body)
+IMAPMessageStructure::IMAPMessageStructure(const IMAPParser::body* body)
 {
-	m_parts.push_back(IMAPPart::create(NULL, 0, body));
+	m_parts.push_back(IMAPMessagePart::create(NULL, 0, body));
 }
 
 
-IMAPStructure::IMAPStructure(ref <IMAPPart> parent, const std::vector <IMAPParser::body*>& list)
+IMAPMessageStructure::IMAPMessageStructure(ref <IMAPMessagePart> parent, const std::vector <IMAPParser::body*>& list)
 {
 	int number = 0;
 
 	for (std::vector <IMAPParser::body*>::const_iterator
 	     it = list.begin() ; it != list.end() ; ++it, ++number)
 	{
-		m_parts.push_back(IMAPPart::create(parent, number, *it));
+		m_parts.push_back(IMAPMessagePart::create(parent, number, *it));
 	}
 }
 
 
-ref <const part> IMAPStructure::getPartAt(const size_t x) const
+ref <const messagePart> IMAPMessageStructure::getPartAt(const size_t x) const
 {
 	return m_parts[x];
 }
 
 
-ref <part> IMAPStructure::getPartAt(const size_t x)
+ref <messagePart> IMAPMessageStructure::getPartAt(const size_t x)
 {
 	return m_parts[x];
 }
 
 
-size_t IMAPStructure::getPartCount() const
+size_t IMAPMessageStructure::getPartCount() const
 {
 	return m_parts.size();
 }
 
 
 // static
-ref <IMAPStructure> IMAPStructure::emptyStructure()
+ref <IMAPMessageStructure> IMAPMessageStructure::emptyStructure()
 {
-	static ref <IMAPStructure> emptyStructure = vmime::create <IMAPStructure>();
+	static ref <IMAPMessageStructure> emptyStructure = vmime::create <IMAPMessageStructure>();
 	return emptyStructure;
 }