diff --git a/ChangeLog b/ChangeLog index 29d6da1a..0aad72d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ VERSION 0.6.4cvs ================ +2005-04-03 Vincent Richard + + * messaging/*: moved IMAP, POP3, maildir and SMTP files to separate + namespaces. + 2005-03-31 Vincent Richard * misc/importanceHelper.{cpp|hpp}: added support for message importance: diff --git a/SConstruct b/SConstruct index fdc23403..fb75e4f9 100644 --- a/SConstruct +++ b/SConstruct @@ -200,36 +200,36 @@ libvmime_messaging_proto_sources = [ [ 'pop3', [ - 'messaging/POP3Store.cpp', 'messaging/POP3Store.hpp', - 'messaging/POP3Folder.cpp', 'messaging/POP3Folder.hpp', - 'messaging/POP3Message.cpp', 'messaging/POP3Message.hpp' + 'messaging/pop3/POP3Store.cpp', 'messaging/pop3/POP3Store.hpp', + 'messaging/pop3/POP3Folder.cpp', 'messaging/pop3/POP3Folder.hpp', + 'messaging/pop3/POP3Message.cpp', 'messaging/pop3/POP3Message.hpp' ] ], [ 'smtp', [ - 'messaging/SMTPTransport.cpp', 'messaging/SMTPTransport.hpp' + 'messaging/smtp/SMTPTransport.cpp', 'messaging/smtp/SMTPTransport.hpp' ] ], [ 'imap', [ - 'messaging/IMAPConnection.cpp', 'messaging/IMAPConnection.hpp', - 'messaging/IMAPStore.cpp', 'messaging/IMAPStore.hpp', - 'messaging/IMAPFolder.cpp', 'messaging/IMAPFolder.hpp', - 'messaging/IMAPMessage.cpp', 'messaging/IMAPMessage.hpp', - 'messaging/IMAPTag.cpp', 'messaging/IMAPTag.hpp', - 'messaging/IMAPUtils.cpp', 'messaging/IMAPUtils.hpp', - 'messaging/IMAPParser.hpp' + 'messaging/imap/IMAPConnection.cpp', 'messaging/imap/IMAPConnection.hpp', + 'messaging/imap/IMAPStore.cpp', 'messaging/imap/IMAPStore.hpp', + 'messaging/imap/IMAPFolder.cpp', 'messaging/imap/IMAPFolder.hpp', + 'messaging/imap/IMAPMessage.cpp', 'messaging/imap/IMAPMessage.hpp', + 'messaging/imap/IMAPTag.cpp', 'messaging/imap/IMAPTag.hpp', + 'messaging/imap/IMAPUtils.cpp', 'messaging/imap/IMAPUtils.hpp', + 'messaging/imap/IMAPParser.hpp' ] ], [ 'maildir', [ - 'messaging/maildirStore.cpp', 'messaging/maildirStore.hpp', - 'messaging/maildirFolder.cpp', 'messaging/maildirFolder.hpp', - 'messaging/maildirMessage.cpp', 'messaging/maildirMessage.hpp', - 'messaging/maildirUtils.cpp', 'messaging/maildirUtils.hpp' + 'messaging/maildir/maildirStore.cpp', 'messaging/maildir/maildirStore.hpp', + 'messaging/maildir/maildirFolder.cpp', 'messaging/maildir/maildirFolder.hpp', + 'messaging/maildir/maildirMessage.cpp', 'messaging/maildir/maildirMessage.hpp', + 'messaging/maildir/maildirUtils.cpp', 'messaging/maildir/maildirUtils.hpp' ] ] ] diff --git a/src/messaging/builtinServices.inl b/src/messaging/builtinServices.inl index d98e7949..cea2f7a8 100644 --- a/src/messaging/builtinServices.inl +++ b/src/messaging/builtinServices.inl @@ -25,26 +25,26 @@ #if VMIME_BUILTIN_MESSAGING_PROTO_POP3 - #include "vmime/messaging/POP3Store.hpp" - REGISTER_SERVICE(POP3Store, pop3); + #include "vmime/messaging/pop3/POP3Store.hpp" + REGISTER_SERVICE(pop3::POP3Store, pop3); #endif #if VMIME_BUILTIN_MESSAGING_PROTO_SMTP - #include "vmime/messaging/SMTPTransport.hpp" - REGISTER_SERVICE(SMTPTransport, smtp); + #include "vmime/messaging/smtp/SMTPTransport.hpp" + REGISTER_SERVICE(smtp::SMTPTransport, smtp); #endif #if VMIME_BUILTIN_MESSAGING_PROTO_IMAP - #include "vmime/messaging/IMAPStore.hpp" - REGISTER_SERVICE(IMAPStore, imap); + #include "vmime/messaging/imap/IMAPStore.hpp" + REGISTER_SERVICE(imap::IMAPStore, imap); #endif #if VMIME_BUILTIN_MESSAGING_PROTO_MAILDIR - #include "vmime/messaging/maildirStore.hpp" - REGISTER_SERVICE(maildirStore, maildir); + #include "vmime/messaging/maildir/maildirStore.hpp" + REGISTER_SERVICE(maildir::maildirStore, maildir); #endif diff --git a/src/messaging/IMAPConnection.cpp b/src/messaging/imap/IMAPConnection.cpp similarity index 96% rename from src/messaging/IMAPConnection.cpp rename to src/messaging/imap/IMAPConnection.cpp index fa0e6af8..0f5934c8 100644 --- a/src/messaging/IMAPConnection.cpp +++ b/src/messaging/imap/IMAPConnection.cpp @@ -17,10 +17,10 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/IMAPTag.hpp" -#include "vmime/messaging/IMAPConnection.hpp" -#include "vmime/messaging/IMAPUtils.hpp" -#include "vmime/messaging/IMAPStore.hpp" +#include "vmime/messaging/imap/IMAPTag.hpp" +#include "vmime/messaging/imap/IMAPConnection.hpp" +#include "vmime/messaging/imap/IMAPUtils.hpp" +#include "vmime/messaging/imap/IMAPStore.hpp" #include "vmime/exception.hpp" #include "vmime/platformDependant.hpp" @@ -30,6 +30,7 @@ namespace vmime { namespace messaging { +namespace imap { IMAPConnection::IMAPConnection(IMAPStore* store, authenticator* auth) @@ -259,5 +260,6 @@ IMAPParser::response* IMAPConnection::readResponse(IMAPParser::literalHandler* l } +} // imap } // messaging } // vmime diff --git a/src/messaging/IMAPFolder.cpp b/src/messaging/imap/IMAPFolder.cpp similarity index 99% rename from src/messaging/IMAPFolder.cpp rename to src/messaging/imap/IMAPFolder.cpp index 98737165..5bbfa148 100644 --- a/src/messaging/IMAPFolder.cpp +++ b/src/messaging/imap/IMAPFolder.cpp @@ -17,13 +17,13 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/IMAPFolder.hpp" +#include "vmime/messaging/imap/IMAPFolder.hpp" -#include "vmime/messaging/IMAPStore.hpp" -#include "vmime/messaging/IMAPParser.hpp" -#include "vmime/messaging/IMAPMessage.hpp" -#include "vmime/messaging/IMAPUtils.hpp" -#include "vmime/messaging/IMAPConnection.hpp" +#include "vmime/messaging/imap/IMAPStore.hpp" +#include "vmime/messaging/imap/IMAPParser.hpp" +#include "vmime/messaging/imap/IMAPMessage.hpp" +#include "vmime/messaging/imap/IMAPUtils.hpp" +#include "vmime/messaging/imap/IMAPConnection.hpp" #include "vmime/message.hpp" @@ -36,6 +36,7 @@ namespace vmime { namespace messaging { +namespace imap { IMAPFolder::IMAPFolder(const folder::path& path, IMAPStore* store, const int type, const int flags) @@ -1555,5 +1556,6 @@ void IMAPFolder::status(int& count, int& unseen) } +} // imap } // messaging } // vmime diff --git a/src/messaging/IMAPMessage.cpp b/src/messaging/imap/IMAPMessage.cpp similarity index 98% rename from src/messaging/IMAPMessage.cpp rename to src/messaging/imap/IMAPMessage.cpp index bfe72159..629668c5 100644 --- a/src/messaging/IMAPMessage.cpp +++ b/src/messaging/imap/IMAPMessage.cpp @@ -17,12 +17,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/IMAPParser.hpp" -#include "vmime/messaging/IMAPMessage.hpp" -#include "vmime/messaging/IMAPFolder.hpp" -#include "vmime/messaging/IMAPStore.hpp" -#include "vmime/messaging/IMAPConnection.hpp" -#include "vmime/messaging/IMAPUtils.hpp" +#include "vmime/messaging/imap/IMAPParser.hpp" +#include "vmime/messaging/imap/IMAPMessage.hpp" +#include "vmime/messaging/imap/IMAPFolder.hpp" +#include "vmime/messaging/imap/IMAPStore.hpp" +#include "vmime/messaging/imap/IMAPConnection.hpp" +#include "vmime/messaging/imap/IMAPUtils.hpp" #include #include @@ -30,6 +30,7 @@ namespace vmime { namespace messaging { +namespace imap { // @@ -837,5 +838,6 @@ void IMAPMessage::setFlags(const int flags, const int mode) } +} // imap } // messaging } // vmime diff --git a/src/messaging/IMAPStore.cpp b/src/messaging/imap/IMAPStore.cpp similarity index 96% rename from src/messaging/IMAPStore.cpp rename to src/messaging/imap/IMAPStore.cpp index 809957a4..81eab9a7 100644 --- a/src/messaging/IMAPStore.cpp +++ b/src/messaging/imap/IMAPStore.cpp @@ -17,9 +17,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/IMAPStore.hpp" -#include "vmime/messaging/IMAPFolder.hpp" -#include "vmime/messaging/IMAPConnection.hpp" +#include "vmime/messaging/imap/IMAPStore.hpp" +#include "vmime/messaging/imap/IMAPFolder.hpp" +#include "vmime/messaging/imap/IMAPConnection.hpp" #include "vmime/exception.hpp" #include "vmime/platformDependant.hpp" @@ -29,6 +29,7 @@ namespace vmime { namespace messaging { +namespace imap { #ifndef VMIME_BUILDING_DOC @@ -288,5 +289,6 @@ const std::vector IMAPStore::_infos::getAvailableProperties() const } +} // imap } // messaging } // vmime diff --git a/src/messaging/IMAPTag.cpp b/src/messaging/imap/IMAPTag.cpp similarity index 96% rename from src/messaging/IMAPTag.cpp rename to src/messaging/imap/IMAPTag.cpp index f5c669a0..bc6b656d 100644 --- a/src/messaging/IMAPTag.cpp +++ b/src/messaging/imap/IMAPTag.cpp @@ -17,11 +17,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/IMAPTag.hpp" +#include "vmime/messaging/imap/IMAPTag.hpp" namespace vmime { namespace messaging { +namespace imap { const int IMAPTag::sm_maxNumber = 52 * 10 * 10 * 10; @@ -93,5 +94,6 @@ void IMAPTag::generate() } +} // imap } // messaging } // vmime diff --git a/src/messaging/IMAPUtils.cpp b/src/messaging/imap/IMAPUtils.cpp similarity index 99% rename from src/messaging/IMAPUtils.cpp rename to src/messaging/imap/IMAPUtils.cpp index de0c8d30..3a41598d 100644 --- a/src/messaging/IMAPUtils.cpp +++ b/src/messaging/imap/IMAPUtils.cpp @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/IMAPUtils.hpp" +#include "vmime/messaging/imap/IMAPUtils.hpp" #include "vmime/messaging/message.hpp" #include @@ -27,6 +27,7 @@ namespace vmime { namespace messaging { +namespace imap { const string IMAPUtils::quoteString(const string& text) @@ -549,5 +550,6 @@ const string IMAPUtils::dateTime(const vmime::datetime& date) } +} // imap } // messaging } // vmime diff --git a/src/messaging/maildirFolder.cpp b/src/messaging/maildir/maildirFolder.cpp similarity index 99% rename from src/messaging/maildirFolder.cpp rename to src/messaging/maildir/maildirFolder.cpp index 85e041aa..0edb0f4c 100644 --- a/src/messaging/maildirFolder.cpp +++ b/src/messaging/maildir/maildirFolder.cpp @@ -17,11 +17,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/maildirFolder.hpp" +#include "vmime/messaging/maildir/maildirFolder.hpp" -#include "vmime/messaging/maildirStore.hpp" -#include "vmime/messaging/maildirMessage.hpp" -#include "vmime/messaging/maildirUtils.hpp" +#include "vmime/messaging/maildir/maildirStore.hpp" +#include "vmime/messaging/maildir/maildirMessage.hpp" +#include "vmime/messaging/maildir/maildirUtils.hpp" #include "vmime/utility/smartPtr.hpp" @@ -33,6 +33,7 @@ namespace vmime { namespace messaging { +namespace maildir { maildirFolder::maildirFolder(const folder::path& path, maildirStore* store) @@ -1344,5 +1345,6 @@ const utility::file::path maildirFolder::getMessageFSPath(const int number) } +} // maildir } // messaging } // vmime diff --git a/src/messaging/maildirMessage.cpp b/src/messaging/maildir/maildirMessage.cpp similarity index 98% rename from src/messaging/maildirMessage.cpp rename to src/messaging/maildir/maildirMessage.cpp index 0a4c27e8..9b728359 100644 --- a/src/messaging/maildirMessage.cpp +++ b/src/messaging/maildir/maildirMessage.cpp @@ -17,11 +17,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/maildirMessage.hpp" -#include "vmime/messaging/maildirFolder.hpp" -#include "vmime/messaging/maildirUtils.hpp" +#include "vmime/messaging/maildir/maildirMessage.hpp" +#include "vmime/messaging/maildir/maildirFolder.hpp" +#include "vmime/messaging/maildir/maildirUtils.hpp" -#include "vmime/messageParser.hpp" // to include "message.hpp" in root directory +#include "vmime/message.hpp" #include "vmime/exception.hpp" #include "vmime/platformDependant.hpp" @@ -29,6 +29,7 @@ namespace vmime { namespace messaging { +namespace maildir { // @@ -499,5 +500,6 @@ header& maildirMessage::getOrCreateHeader() } +} // maildir } // messaging } // vmime diff --git a/src/messaging/maildirStore.cpp b/src/messaging/maildir/maildirStore.cpp similarity index 97% rename from src/messaging/maildirStore.cpp rename to src/messaging/maildir/maildirStore.cpp index 7d8e493d..7188a281 100644 --- a/src/messaging/maildirStore.cpp +++ b/src/messaging/maildir/maildirStore.cpp @@ -17,9 +17,9 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/maildirStore.hpp" +#include "vmime/messaging/maildir/maildirStore.hpp" -#include "vmime/messaging/maildirFolder.hpp" +#include "vmime/messaging/maildir/maildirFolder.hpp" #include "vmime/utility/smartPtr.hpp" @@ -29,6 +29,7 @@ namespace vmime { namespace messaging { +namespace maildir { maildirStore::maildirStore(session* sess, authenticator* auth) @@ -228,5 +229,6 @@ const std::vector maildirStore::_infos::getAvailableProperties() const } +} // maildir } // messaging } // vmime diff --git a/src/messaging/maildirUtils.cpp b/src/messaging/maildir/maildirUtils.cpp similarity index 97% rename from src/messaging/maildirUtils.cpp rename to src/messaging/maildir/maildirUtils.cpp index 3479bdeb..4476b3dd 100644 --- a/src/messaging/maildirUtils.cpp +++ b/src/messaging/maildir/maildirUtils.cpp @@ -17,14 +17,15 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/maildirUtils.hpp" -#include "vmime/messaging/maildirStore.hpp" +#include "vmime/messaging/maildir/maildirUtils.hpp" +#include "vmime/messaging/maildir/maildirStore.hpp" #include "vmime/utility/random.hpp" namespace vmime { namespace messaging { +namespace maildir { const vmime::word maildirUtils::TMP_DIR("tmp", vmime::charset(vmime::charsets::US_ASCII)); // ensure reliable delivery (not to be listed) @@ -188,5 +189,6 @@ const bool maildirUtils::messageIdComparator::operator() } +} // maildir } // messaging } // vmime diff --git a/src/messaging/POP3Folder.cpp b/src/messaging/pop3/POP3Folder.cpp similarity index 99% rename from src/messaging/POP3Folder.cpp rename to src/messaging/pop3/POP3Folder.cpp index e0bac1a8..c70e2b5b 100644 --- a/src/messaging/POP3Folder.cpp +++ b/src/messaging/pop3/POP3Folder.cpp @@ -17,16 +17,17 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/POP3Folder.hpp" +#include "vmime/messaging/pop3/POP3Folder.hpp" -#include "vmime/messaging/POP3Store.hpp" -#include "vmime/messaging/POP3Message.hpp" +#include "vmime/messaging/pop3/POP3Store.hpp" +#include "vmime/messaging/pop3/POP3Message.hpp" #include "vmime/exception.hpp" namespace vmime { namespace messaging { +namespace pop3 { POP3Folder::POP3Folder(const folder::path& path, POP3Store* store) @@ -814,5 +815,6 @@ void POP3Folder::parseMultiListOrUidlResponse(const string& response, std::map < } +} // pop3 } // messaging } // vmime diff --git a/src/messaging/POP3Message.cpp b/src/messaging/pop3/POP3Message.cpp similarity index 96% rename from src/messaging/POP3Message.cpp rename to src/messaging/pop3/POP3Message.cpp index 3c84368c..01680d34 100644 --- a/src/messaging/POP3Message.cpp +++ b/src/messaging/pop3/POP3Message.cpp @@ -17,15 +17,16 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/POP3Message.hpp" -#include "vmime/messaging/POP3Folder.hpp" -#include "vmime/messaging/POP3Store.hpp" +#include "vmime/messaging/pop3/POP3Message.hpp" +#include "vmime/messaging/pop3/POP3Folder.hpp" +#include "vmime/messaging/pop3/POP3Store.hpp" #include namespace vmime { namespace messaging { +namespace pop3 { POP3Message::POP3Message(POP3Folder* folder, const int num) @@ -212,5 +213,6 @@ void POP3Message::setFlags(const int /* flags */, const int /* mode */) } +} // pop3 } // messaging } // vmime diff --git a/src/messaging/POP3Store.cpp b/src/messaging/pop3/POP3Store.cpp similarity index 99% rename from src/messaging/POP3Store.cpp rename to src/messaging/pop3/POP3Store.cpp index 3129f14a..d6ece2a0 100644 --- a/src/messaging/POP3Store.cpp +++ b/src/messaging/pop3/POP3Store.cpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/POP3Store.hpp" -#include "vmime/messaging/POP3Folder.hpp" +#include "vmime/messaging/pop3/POP3Store.hpp" +#include "vmime/messaging/pop3/POP3Folder.hpp" #include "vmime/exception.hpp" #include "vmime/platformDependant.hpp" @@ -30,6 +30,7 @@ namespace vmime { namespace messaging { +namespace pop3 { POP3Store::POP3Store(session* sess, authenticator* auth) @@ -624,5 +625,6 @@ const std::vector POP3Store::_infos::getAvailableProperties() const } +} // pop3 } // messaging } // vmime diff --git a/src/messaging/SMTPTransport.cpp b/src/messaging/smtp/SMTPTransport.cpp similarity index 99% rename from src/messaging/SMTPTransport.cpp rename to src/messaging/smtp/SMTPTransport.cpp index bd10fbe0..6e7ab240 100644 --- a/src/messaging/SMTPTransport.cpp +++ b/src/messaging/smtp/SMTPTransport.cpp @@ -17,7 +17,7 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include "vmime/messaging/SMTPTransport.hpp" +#include "vmime/messaging/smtp/SMTPTransport.hpp" #include "vmime/exception.hpp" #include "vmime/platformDependant.hpp" @@ -30,6 +30,7 @@ namespace vmime { namespace messaging { +namespace smtp { SMTPTransport::SMTPTransport(session* sess, authenticator* auth) @@ -587,5 +588,6 @@ const std::vector SMTPTransport::_infos::getAvailableProperties() const } +} // smtp } // messaging } // vmime diff --git a/vmime/messaging/IMAPConnection.hpp b/vmime/messaging/imap/IMAPConnection.hpp similarity index 90% rename from vmime/messaging/IMAPConnection.hpp rename to vmime/messaging/imap/IMAPConnection.hpp index b4710258..7fbba8c2 100644 --- a/vmime/messaging/IMAPConnection.hpp +++ b/vmime/messaging/imap/IMAPConnection.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_IMAPCONNECTION_HPP_INCLUDED -#define VMIME_MESSAGING_IMAPCONNECTION_HPP_INCLUDED +#ifndef VMIME_MESSAGING_IMAP_IMAPCONNECTION_HPP_INCLUDED +#define VMIME_MESSAGING_IMAP_IMAPCONNECTION_HPP_INCLUDED #include "vmime/config.hpp" @@ -27,11 +27,12 @@ #include "vmime/messaging/socket.hpp" #include "vmime/messaging/timeoutHandler.hpp" -#include "vmime/messaging/IMAPParser.hpp" +#include "vmime/messaging/imap/IMAPParser.hpp" namespace vmime { namespace messaging { +namespace imap { class IMAPTag; @@ -104,8 +105,9 @@ private: }; +} // imap } // messaging } // vmime -#endif // VMIME_MESSAGING_IMAPCONNECTION_HPP_INCLUDED +#endif // VMIME_MESSAGING_IMAP_IMAPCONNECTION_HPP_INCLUDED diff --git a/vmime/messaging/IMAPFolder.hpp b/vmime/messaging/imap/IMAPFolder.hpp similarity index 95% rename from vmime/messaging/IMAPFolder.hpp rename to vmime/messaging/imap/IMAPFolder.hpp index 6dfd398b..4df20e44 100644 --- a/vmime/messaging/IMAPFolder.hpp +++ b/vmime/messaging/imap/IMAPFolder.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_IMAPFOLDER_HPP_INCLUDED -#define VMIME_MESSAGING_IMAPFOLDER_HPP_INCLUDED +#ifndef VMIME_MESSAGING_IMAP_IMAPFOLDER_HPP_INCLUDED +#define VMIME_MESSAGING_IMAP_IMAPFOLDER_HPP_INCLUDED #include @@ -31,6 +31,7 @@ namespace vmime { namespace messaging { +namespace imap { class IMAPStore; @@ -148,8 +149,9 @@ private: }; +} // imap } // messaging } // vmime -#endif // VMIME_MESSAGING_IMAPFOLDER_HPP_INCLUDED +#endif // VMIME_MESSAGING_IMAP_IMAPFOLDER_HPP_INCLUDED diff --git a/vmime/messaging/IMAPMessage.hpp b/vmime/messaging/imap/IMAPMessage.hpp similarity index 92% rename from vmime/messaging/IMAPMessage.hpp rename to vmime/messaging/imap/IMAPMessage.hpp index 3145498e..b3c10562 100644 --- a/vmime/messaging/IMAPMessage.hpp +++ b/vmime/messaging/imap/IMAPMessage.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_IMAPMESSAGE_HPP_INCLUDED -#define VMIME_MESSAGING_IMAPMESSAGE_HPP_INCLUDED +#ifndef VMIME_MESSAGING_IMAP_IMAPMESSAGE_HPP_INCLUDED +#define VMIME_MESSAGING_IMAP_IMAPMESSAGE_HPP_INCLUDED #include "vmime/messaging/message.hpp" @@ -29,6 +29,7 @@ namespace vmime { namespace messaging { +namespace imap { /** IMAP message implementation. @@ -98,8 +99,9 @@ private: }; +} // imap } // messaging } // vmime -#endif // VMIME_MESSAGING_IMAPMESSAGE_HPP_INCLUDED +#endif // VMIME_MESSAGING_IMAP_IMAPMESSAGE_HPP_INCLUDED diff --git a/vmime/messaging/IMAPParser.hpp b/vmime/messaging/imap/IMAPParser.hpp similarity index 99% rename from vmime/messaging/IMAPParser.hpp rename to vmime/messaging/imap/IMAPParser.hpp index 352905d4..4a4c8f59 100644 --- a/vmime/messaging/IMAPParser.hpp +++ b/vmime/messaging/imap/IMAPParser.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_IMAPPARSER_HPP_INCLUDED -#define VMIME_MESSAGING_IMAPPARSER_HPP_INCLUDED +#ifndef VMIME_MESSAGING_IMAP_IMAPPARSER_HPP_INCLUDED +#define VMIME_MESSAGING_IMAP_IMAPPARSER_HPP_INCLUDED #include "vmime/base.hpp" @@ -38,7 +38,7 @@ #include "vmime/messaging/timeoutHandler.hpp" #include "vmime/messaging/socket.hpp" -#include "vmime/messaging/IMAPTag.hpp" +#include "vmime/messaging/imap/IMAPTag.hpp" #include #include @@ -54,6 +54,7 @@ namespace vmime { namespace messaging { +namespace imap { #if DEBUG_RESPONSE @@ -5070,8 +5071,9 @@ public: }; +} // imap } // messaging } // vmime -#endif // VMIME_MESSAGING_IMAPPARSER_HPP_INCLUDED +#endif // VMIME_MESSAGING_IMAP_IMAPPARSER_HPP_INCLUDED diff --git a/vmime/messaging/IMAPStore.hpp b/vmime/messaging/imap/IMAPStore.hpp similarity index 92% rename from vmime/messaging/IMAPStore.hpp rename to vmime/messaging/imap/IMAPStore.hpp index b5826820..97206f2e 100644 --- a/vmime/messaging/IMAPStore.hpp +++ b/vmime/messaging/imap/IMAPStore.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_IMAPSTORE_HPP_INCLUDED -#define VMIME_MESSAGING_IMAPSTORE_HPP_INCLUDED +#ifndef VMIME_MESSAGING_IMAP_IMAPSTORE_HPP_INCLUDED +#define VMIME_MESSAGING_IMAP_IMAPSTORE_HPP_INCLUDED #include "vmime/config.hpp" @@ -32,6 +32,7 @@ namespace vmime { namespace messaging { +namespace imap { class IMAPParser; @@ -110,8 +111,9 @@ private: }; +} // imap } // messaging } // vmime -#endif // VMIME_MESSAGING_IMAPSTORE_HPP_INCLUDED +#endif // VMIME_MESSAGING_IMAP_IMAPSTORE_HPP_INCLUDED diff --git a/vmime/messaging/IMAPTag.hpp b/vmime/messaging/imap/IMAPTag.hpp similarity index 87% rename from vmime/messaging/IMAPTag.hpp rename to vmime/messaging/imap/IMAPTag.hpp index 09e00e83..da9569ac 100644 --- a/vmime/messaging/IMAPTag.hpp +++ b/vmime/messaging/imap/IMAPTag.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_IMAPTAG_HPP_INCLUDED -#define VMIME_MESSAGING_IMAPTAG_HPP_INCLUDED +#ifndef VMIME_MESSAGING_IMAP_IMAPTAG_HPP_INCLUDED +#define VMIME_MESSAGING_IMAP_IMAPTAG_HPP_INCLUDED #include "vmime/types.hpp" @@ -26,6 +26,7 @@ namespace vmime { namespace messaging { +namespace imap { class IMAPTag @@ -57,8 +58,9 @@ private: }; +} // imap } // messaging } // vmime -#endif // VMIME_MESSAGING_IMAPTAG_HPP_INCLUDED +#endif // VMIME_MESSAGING_IMAP_IMAPTAG_HPP_INCLUDED diff --git a/vmime/messaging/IMAPUtils.hpp b/vmime/messaging/imap/IMAPUtils.hpp similarity index 89% rename from vmime/messaging/IMAPUtils.hpp rename to vmime/messaging/imap/IMAPUtils.hpp index f61c363b..5060c780 100644 --- a/vmime/messaging/IMAPUtils.hpp +++ b/vmime/messaging/imap/IMAPUtils.hpp @@ -17,21 +17,22 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_IMAPUTILS_HPP_INCLUDED -#define VMIME_MESSAGING_IMAPUTILS_HPP_INCLUDED +#ifndef VMIME_MESSAGING_IMAP_IMAPUTILS_HPP_INCLUDED +#define VMIME_MESSAGING_IMAP_IMAPUTILS_HPP_INCLUDED #include "vmime/types.hpp" #include "vmime/dateTime.hpp" #include "vmime/messaging/folder.hpp" -#include "vmime/messaging/IMAPParser.hpp" +#include "vmime/messaging/imap/IMAPParser.hpp" #include namespace vmime { namespace messaging { +namespace imap { class IMAPUtils @@ -59,8 +60,9 @@ public: }; +} // imap } // messaging } // vmime -#endif // VMIME_MESSAGING_IMAPUTILS_HPP_INCLUDED +#endif // VMIME_MESSAGING_IMAP_IMAPUTILS_HPP_INCLUDED diff --git a/vmime/messaging/maildirFolder.hpp b/vmime/messaging/maildir/maildirFolder.hpp similarity index 95% rename from vmime/messaging/maildirFolder.hpp rename to vmime/messaging/maildir/maildirFolder.hpp index cea2044e..0b880f15 100644 --- a/vmime/messaging/maildirFolder.hpp +++ b/vmime/messaging/maildir/maildirFolder.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_MAILDIRFOLDER_HPP_INCLUDED -#define VMIME_MESSAGING_MAILDIRFOLDER_HPP_INCLUDED +#ifndef VMIME_MESSAGING_MAILDIR_MAILDIRFOLDER_HPP_INCLUDED +#define VMIME_MESSAGING_MAILDIR_MAILDIRFOLDER_HPP_INCLUDED #include @@ -33,6 +33,7 @@ namespace vmime { namespace messaging { +namespace maildir { class maildirStore; @@ -167,8 +168,9 @@ private: }; +} // maildir } // messaging } // vmime -#endif // VMIME_MESSAGING_MAILDIRFOLDER_HPP_INCLUDED +#endif // VMIME_MESSAGING_MAILDIR_MAILDIRFOLDER_HPP_INCLUDED diff --git a/vmime/messaging/maildirMessage.hpp b/vmime/messaging/maildir/maildirMessage.hpp similarity index 91% rename from vmime/messaging/maildirMessage.hpp rename to vmime/messaging/maildir/maildirMessage.hpp index 63214284..ffbc1ca2 100644 --- a/vmime/messaging/maildirMessage.hpp +++ b/vmime/messaging/maildir/maildirMessage.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_MAILDIRMESSAGE_HPP_INCLUDED -#define VMIME_MESSAGING_MAILDIRMESSAGE_HPP_INCLUDED +#ifndef VMIME_MESSAGING_MAILDIR_MAILDIRMESSAGE_HPP_INCLUDED +#define VMIME_MESSAGING_MAILDIR_MAILDIRMESSAGE_HPP_INCLUDED #include "vmime/messaging/message.hpp" @@ -27,6 +27,7 @@ namespace vmime { namespace messaging { +namespace maildir { class maildirFolder; @@ -93,8 +94,9 @@ private: }; +} // maildir } // messaging } // vmime -#endif // VMIME_MESSAGING_MAILDIRMESSAGE_HPP_INCLUDED +#endif // VMIME_MESSAGING_MAILDIR_MAILDIRMESSAGE_HPP_INCLUDED diff --git a/vmime/messaging/maildirStore.hpp b/vmime/messaging/maildir/maildirStore.hpp similarity index 91% rename from vmime/messaging/maildirStore.hpp rename to vmime/messaging/maildir/maildirStore.hpp index cff31e3f..a5b0ec27 100644 --- a/vmime/messaging/maildirStore.hpp +++ b/vmime/messaging/maildir/maildirStore.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_MAILDIRSTORE_HPP_INCLUDED -#define VMIME_MESSAGING_MAILDIRSTORE_HPP_INCLUDED +#ifndef VMIME_MESSAGING_MAILDIR_MAILDIRSTORE_HPP_INCLUDED +#define VMIME_MESSAGING_MAILDIR_MAILDIRSTORE_HPP_INCLUDED #include "vmime/config.hpp" @@ -34,6 +34,7 @@ namespace vmime { namespace messaging { +namespace maildir { class maildirFolder; @@ -100,8 +101,9 @@ private: }; +} // maildir } // messaging } // vmime -#endif // VMIME_MESSAGING_MAILDIRSTORE_HPP_INCLUDED +#endif // VMIME_MESSAGING_MAILDIR_MAILDIRSTORE_HPP_INCLUDED diff --git a/vmime/messaging/maildirUtils.hpp b/vmime/messaging/maildir/maildirUtils.hpp similarity index 95% rename from vmime/messaging/maildirUtils.hpp rename to vmime/messaging/maildir/maildirUtils.hpp index 5bbe1fae..c35cc49f 100644 --- a/vmime/messaging/maildirUtils.hpp +++ b/vmime/messaging/maildir/maildirUtils.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_MAILDIRUTILS_HPP_INCLUDED -#define VMIME_MESSAGING_MAILDIRUTILS_HPP_INCLUDED +#ifndef VMIME_MESSAGING_MAILDIR_MAILDIRUTILS_HPP_INCLUDED +#define VMIME_MESSAGING_MAILDIR_MAILDIRUTILS_HPP_INCLUDED #include "vmime/utility/file.hpp" @@ -27,6 +27,7 @@ namespace vmime { namespace messaging { +namespace maildir { class maildirStore; @@ -142,8 +143,9 @@ private: }; +} // maildir } // messaging } // vmime -#endif // VMIME_MESSAGING_MAILDIRUTILS_HPP_INCLUDED +#endif // VMIME_MESSAGING_MAILDIR_MAILDIRUTILS_HPP_INCLUDED diff --git a/vmime/messaging/POP3Folder.hpp b/vmime/messaging/pop3/POP3Folder.hpp similarity index 95% rename from vmime/messaging/POP3Folder.hpp rename to vmime/messaging/pop3/POP3Folder.hpp index 2e5b88b9..3cf9855d 100644 --- a/vmime/messaging/POP3Folder.hpp +++ b/vmime/messaging/pop3/POP3Folder.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_POP3FOLDER_HPP_INCLUDED -#define VMIME_MESSAGING_POP3FOLDER_HPP_INCLUDED +#ifndef VMIME_MESSAGING_POP3_POP3FOLDER_HPP_INCLUDED +#define VMIME_MESSAGING_POP3_POP3FOLDER_HPP_INCLUDED #include @@ -32,6 +32,7 @@ namespace vmime { namespace messaging { +namespace pop3 { class POP3Store; @@ -138,8 +139,9 @@ private: }; +} // pop3 } // messaging } // vmime -#endif // VMIME_MESSAGING_POP3FOLDER_HPP_INCLUDED +#endif // VMIME_MESSAGING_POP3_POP3FOLDER_HPP_INCLUDED diff --git a/vmime/messaging/POP3Message.hpp b/vmime/messaging/pop3/POP3Message.hpp similarity index 91% rename from vmime/messaging/POP3Message.hpp rename to vmime/messaging/pop3/POP3Message.hpp index fbf94730..82b5b132 100644 --- a/vmime/messaging/POP3Message.hpp +++ b/vmime/messaging/pop3/POP3Message.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_POP3MESSAGE_HPP_INCLUDED -#define VMIME_MESSAGING_POP3MESSAGE_HPP_INCLUDED +#ifndef VMIME_MESSAGING_POP3_POP3MESSAGE_HPP_INCLUDED +#define VMIME_MESSAGING_POP3_POP3MESSAGE_HPP_INCLUDED #include "vmime/config.hpp" @@ -29,6 +29,7 @@ namespace vmime { namespace messaging { +namespace pop3 { /** POP3 message implementation. @@ -85,8 +86,9 @@ private: }; +} // pop3 } // messaging } // vmime -#endif // VMIME_MESSAGING_POP3MESSAGE_HPP_INCLUDED +#endif // VMIME_MESSAGING_POP3_POP3MESSAGE_HPP_INCLUDED diff --git a/vmime/messaging/POP3Store.hpp b/vmime/messaging/pop3/POP3Store.hpp similarity index 93% rename from vmime/messaging/POP3Store.hpp rename to vmime/messaging/pop3/POP3Store.hpp index dff97c04..598025ca 100644 --- a/vmime/messaging/POP3Store.hpp +++ b/vmime/messaging/pop3/POP3Store.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_POP3STORE_HPP_INCLUDED -#define VMIME_MESSAGING_POP3STORE_HPP_INCLUDED +#ifndef VMIME_MESSAGING_POP3_POP3STORE_HPP_INCLUDED +#define VMIME_MESSAGING_POP3_POP3STORE_HPP_INCLUDED #include "vmime/config.hpp" @@ -32,6 +32,7 @@ namespace vmime { namespace messaging { +namespace pop3 { /** POP3 store service. @@ -109,8 +110,9 @@ private: }; +} // pop3 } // messaging } // vmime -#endif // VMIME_MESSAGING_POP3STORE_HPP_INCLUDED +#endif // VMIME_MESSAGING_POP3_POP3STORE_HPP_INCLUDED diff --git a/vmime/messaging/SMTPTransport.hpp b/vmime/messaging/smtp/SMTPTransport.hpp similarity index 91% rename from vmime/messaging/SMTPTransport.hpp rename to vmime/messaging/smtp/SMTPTransport.hpp index 5bd01d05..6ca75a65 100644 --- a/vmime/messaging/SMTPTransport.hpp +++ b/vmime/messaging/smtp/SMTPTransport.hpp @@ -17,8 +17,8 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#ifndef VMIME_MESSAGING_SMTPTRANSPORT_HPP_INCLUDED -#define VMIME_MESSAGING_SMTPTRANSPORT_HPP_INCLUDED +#ifndef VMIME_MESSAGING_SMTP_SMTPTRANSPORT_HPP_INCLUDED +#define VMIME_MESSAGING_SMTP_SMTPTRANSPORT_HPP_INCLUDED #include "vmime/config.hpp" @@ -30,6 +30,7 @@ namespace vmime { namespace messaging { +namespace smtp { /** SMTP transport service. @@ -89,8 +90,9 @@ private: }; +} // smtp } // messaging } // vmime -#endif // VMIME_MESSAGING_SMTPTRANSPORT_HPP_INCLUDED +#endif // VMIME_MESSAGING_SMTP_SMTPTRANSPORT_HPP_INCLUDED