aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/messaging/builtinServices.inl16
-rw-r--r--src/messaging/imap/IMAPConnection.cpp (renamed from src/messaging/IMAPConnection.cpp)10
-rw-r--r--src/messaging/imap/IMAPFolder.cpp (renamed from src/messaging/IMAPFolder.cpp)14
-rw-r--r--src/messaging/imap/IMAPMessage.cpp (renamed from src/messaging/IMAPMessage.cpp)14
-rw-r--r--src/messaging/imap/IMAPStore.cpp (renamed from src/messaging/IMAPStore.cpp)8
-rw-r--r--src/messaging/imap/IMAPTag.cpp (renamed from src/messaging/IMAPTag.cpp)4
-rw-r--r--src/messaging/imap/IMAPUtils.cpp (renamed from src/messaging/IMAPUtils.cpp)4
-rw-r--r--src/messaging/maildir/maildirFolder.cpp (renamed from src/messaging/maildirFolder.cpp)10
-rw-r--r--src/messaging/maildir/maildirMessage.cpp (renamed from src/messaging/maildirMessage.cpp)10
-rw-r--r--src/messaging/maildir/maildirStore.cpp (renamed from src/messaging/maildirStore.cpp)6
-rw-r--r--src/messaging/maildir/maildirUtils.cpp (renamed from src/messaging/maildirUtils.cpp)6
-rw-r--r--src/messaging/pop3/POP3Folder.cpp (renamed from src/messaging/POP3Folder.cpp)8
-rw-r--r--src/messaging/pop3/POP3Message.cpp (renamed from src/messaging/POP3Message.cpp)8
-rw-r--r--src/messaging/pop3/POP3Store.cpp (renamed from src/messaging/POP3Store.cpp)6
-rw-r--r--src/messaging/smtp/SMTPTransport.cpp (renamed from src/messaging/SMTPTransport.cpp)4
15 files changed, 78 insertions, 50 deletions
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
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
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
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 <sstream>
#include <iterator>
@@ -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
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 <string> IMAPStore::_infos::getAvailableProperties() const
}
+} // imap
} // messaging
} // vmime
diff --git a/src/messaging/IMAPTag.cpp b/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
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 <sstream>
@@ -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
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
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
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 <string> maildirStore::_infos::getAvailableProperties() const
}
+} // maildir
} // messaging
} // vmime
diff --git a/src/messaging/maildirUtils.cpp b/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
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
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 <sstream>
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
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 <string> POP3Store::_infos::getAvailableProperties() const
}
+} // pop3
} // messaging
} // vmime
diff --git a/src/messaging/SMTPTransport.cpp b/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 <string> SMTPTransport::_infos::getAvailableProperties() const
}
+} // smtp
} // messaging
} // vmime