aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/base.cpp10
-rw-r--r--src/encoding.cpp7
-rw-r--r--src/net/smtp/SMTPTransport.cpp1
-rw-r--r--src/security/sasl/SASLContext.cpp9
-rw-r--r--src/streamContentHandler.cpp8
-rw-r--r--src/stringContentHandler.cpp8
-rw-r--r--src/utility/encoder/b64Encoder.cpp (renamed from src/encoderB64.cpp)21
-rw-r--r--src/utility/encoder/binaryEncoder.cpp (renamed from src/encoder7bit.cpp)11
-rw-r--r--src/utility/encoder/defaultEncoder.cpp (renamed from src/encoderDefault.cpp)15
-rw-r--r--src/utility/encoder/eightBitEncoder.cpp (renamed from src/encoder8bit.cpp)11
-rw-r--r--src/utility/encoder/encoder.cpp (renamed from src/encoder.cpp)9
-rw-r--r--src/utility/encoder/encoderFactory.cpp (renamed from src/encoderFactory.cpp)33
-rw-r--r--src/utility/encoder/qpEncoder.cpp (renamed from src/encoderQP.cpp)21
-rw-r--r--src/utility/encoder/sevenBitEncoder.cpp (renamed from src/encoderBinary.cpp)11
-rw-r--r--src/utility/encoder/uuEncoder.cpp (renamed from src/encoderUUE.cpp)17
-rw-r--r--src/word.cpp12
-rw-r--r--src/wordEncoder.cpp9
17 files changed, 122 insertions, 91 deletions
diff --git a/src/base.cpp b/src/base.cpp
index afba23d9..71c63cdc 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -26,9 +26,9 @@
#include "vmime/charset.hpp"
#include "vmime/base.hpp"
-#include "vmime/encoder.hpp"
-#include "vmime/encoderB64.hpp"
-#include "vmime/encoderQP.hpp"
+#include "vmime/utility/encoder/encoder.hpp"
+#include "vmime/utility/encoder/b64Encoder.hpp"
+#include "vmime/utility/encoder/qpEncoder.hpp"
#include "vmime/text.hpp"
@@ -37,7 +37,7 @@
#include "vmime/utility/stringUtils.hpp"
// For initializing
-#include "vmime/encoderFactory.hpp"
+#include "vmime/utility/encoder/encoderFactory.hpp"
#include "vmime/headerFieldFactory.hpp"
#include "vmime/textPartFactory.hpp"
#include "vmime/options.hpp"
@@ -140,7 +140,7 @@ public:
{
options::getInstance();
- encoderFactory::getInstance();
+ utility::encoder::encoderFactory::getInstance();
headerFieldFactory::getInstance();
textPartFactory::getInstance();
diff --git a/src/encoding.cpp b/src/encoding.cpp
index 202dfe90..a45573de 100644
--- a/src/encoding.cpp
+++ b/src/encoding.cpp
@@ -22,9 +22,10 @@
//
#include "vmime/encoding.hpp"
-#include "vmime/encoderFactory.hpp"
#include "vmime/contentHandler.hpp"
+#include "vmime/utility/encoder/encoderFactory.hpp"
+
#include <algorithm>
@@ -77,9 +78,9 @@ void encoding::generate(utility::outputStream& os, const string::size_type /* ma
}
-ref <encoder> encoding::getEncoder() const
+ref <utility::encoder::encoder> encoding::getEncoder() const
{
- return (encoderFactory::getInstance()->create(generate()));
+ return (utility::encoder::encoderFactory::getInstance()->create(generate()));
}
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index 0a2e5b9f..3ce8d217 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -26,7 +26,6 @@
#include "vmime/exception.hpp"
#include "vmime/platform.hpp"
-#include "vmime/encoderB64.hpp"
#include "vmime/mailboxList.hpp"
#include "vmime/utility/filteredStream.hpp"
diff --git a/src/security/sasl/SASLContext.cpp b/src/security/sasl/SASLContext.cpp
index 6de2f25c..fca95c72 100644
--- a/src/security/sasl/SASLContext.cpp
+++ b/src/security/sasl/SASLContext.cpp
@@ -29,7 +29,8 @@
#include "vmime/security/sasl/SASLMechanism.hpp"
#include "vmime/base.hpp"
-#include "vmime/encoderFactory.hpp"
+
+#include "vmime/utility/encoder/encoderFactory.hpp"
#include "vmime/utility/stream.hpp"
@@ -103,7 +104,8 @@ void SASLContext::decodeB64(const string& input, byte_t** output, int* outputLen
utility::inputStreamStringAdapter is(input);
utility::outputStreamStringAdapter os(res);
- ref <encoder> dec = encoderFactory::getInstance()->create("base64");
+ ref <utility::encoder::encoder> dec =
+ utility::encoder::encoderFactory::getInstance()->create("base64");
dec->decode(is, os);
@@ -123,7 +125,8 @@ const string SASLContext::encodeB64(const byte_t* input, const int inputLen)
utility::inputStreamByteBufferAdapter is(input, inputLen);
utility::outputStreamStringAdapter os(res);
- ref <encoder> enc = encoderFactory::getInstance()->create("base64");
+ ref <utility::encoder::encoder> enc =
+ utility::encoder::encoderFactory::getInstance()->create("base64");
enc->encode(is, os);
diff --git a/src/streamContentHandler.cpp b/src/streamContentHandler.cpp
index 386b0e17..b5f02bf0 100644
--- a/src/streamContentHandler.cpp
+++ b/src/streamContentHandler.cpp
@@ -94,8 +94,8 @@ void streamContentHandler::generate(utility::outputStream& os, const vmime::enco
// buffer, and then re-encode to output stream...
if (m_encoding != enc)
{
- ref <encoder> theDecoder = m_encoding.getEncoder();
- ref <encoder> theEncoder = enc.getEncoder();
+ ref <utility::encoder::encoder> theDecoder = m_encoding.getEncoder();
+ ref <utility::encoder::encoder> theEncoder = enc.getEncoder();
theEncoder->getProperties()["maxlinelength"] = maxLineLength;
@@ -122,7 +122,7 @@ void streamContentHandler::generate(utility::outputStream& os, const vmime::enco
// Need to encode data before
else
{
- ref <encoder> theEncoder = enc.getEncoder();
+ ref <utility::encoder::encoder> theEncoder = enc.getEncoder();
theEncoder->getProperties()["maxlinelength"] = maxLineLength;
m_stream->reset(); // may not work...
@@ -151,7 +151,7 @@ void streamContentHandler::extract(utility::outputStream& os,
// Need to decode data
else
{
- ref <encoder> theDecoder = m_encoding.getEncoder();
+ ref <utility::encoder::encoder> theDecoder = m_encoding.getEncoder();
m_stream->reset(); // may not work...
diff --git a/src/stringContentHandler.cpp b/src/stringContentHandler.cpp
index 6dd2719b..84cada5f 100644
--- a/src/stringContentHandler.cpp
+++ b/src/stringContentHandler.cpp
@@ -114,8 +114,8 @@ void stringContentHandler::generate(utility::outputStream& os,
// buffer, and then re-encode to output stream...
if (m_encoding != enc)
{
- ref <encoder> theDecoder = m_encoding.getEncoder();
- ref <encoder> theEncoder = enc.getEncoder();
+ ref <utility::encoder::encoder> theDecoder = m_encoding.getEncoder();
+ ref <utility::encoder::encoder> theEncoder = enc.getEncoder();
theEncoder->getProperties()["maxlinelength"] = maxLineLength;
@@ -140,7 +140,7 @@ void stringContentHandler::generate(utility::outputStream& os,
// Need to encode data before
else
{
- ref <encoder> theEncoder = enc.getEncoder();
+ ref <utility::encoder::encoder> theEncoder = enc.getEncoder();
theEncoder->getProperties()["maxlinelength"] = maxLineLength;
utility::inputStreamStringProxyAdapter in(m_string);
@@ -161,7 +161,7 @@ void stringContentHandler::extract(utility::outputStream& os,
// Need to decode data
else
{
- ref <encoder> theDecoder = m_encoding.getEncoder();
+ ref <utility::encoder::encoder> theDecoder = m_encoding.getEncoder();
utility::inputStreamStringProxyAdapter in(m_string);
utility::progressListenerSizeAdapter plsa(progress, getLength());
diff --git a/src/encoderB64.cpp b/src/utility/encoder/b64Encoder.cpp
index 2c16ee75..c4ba2b39 100644
--- a/src/encoderB64.cpp
+++ b/src/utility/encoder/b64Encoder.cpp
@@ -21,20 +21,21 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoderB64.hpp"
+#include "vmime/utility/encoder/b64Encoder.hpp"
#include "vmime/parserHelpers.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
-encoderB64::encoderB64()
+b64Encoder::b64Encoder()
{
}
-const std::vector <string> encoderB64::getAvailableProperties() const
+const std::vector <string> b64Encoder::getAvailableProperties() const
{
std::vector <string> list(encoder::getAvailableProperties());
@@ -45,10 +46,10 @@ const std::vector <string> encoderB64::getAvailableProperties() const
// 7-bits alphabet used to encode binary data
-const unsigned char encoderB64::sm_alphabet[] =
+const unsigned char b64Encoder::sm_alphabet[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-const unsigned char encoderB64::sm_decodeMap[256] =
+const unsigned char b64Encoder::sm_decodeMap[256] =
{
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, // 0x00 - 0x0f
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, // 0x10 - 0x1f
@@ -74,7 +75,7 @@ const unsigned char encoderB64::sm_decodeMap[256] =
-utility::stream::size_type encoderB64::encode(utility::inputStream& in,
+utility::stream::size_type b64Encoder::encode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -189,7 +190,7 @@ utility::stream::size_type encoderB64::encode(utility::inputStream& in,
}
-utility::stream::size_type encoderB64::decode(utility::inputStream& in,
+utility::stream::size_type b64Encoder::decode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -302,4 +303,6 @@ utility::stream::size_type encoderB64::decode(utility::inputStream& in,
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoder7bit.cpp b/src/utility/encoder/binaryEncoder.cpp
index 4a60950f..2bc77d27 100644
--- a/src/encoder7bit.cpp
+++ b/src/utility/encoder/binaryEncoder.cpp
@@ -21,16 +21,19 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoder7bit.hpp"
+#include "vmime/utility/encoder/binaryEncoder.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
-encoder7bit::encoder7bit()
+binaryEncoder::binaryEncoder()
{
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoderDefault.cpp b/src/utility/encoder/defaultEncoder.cpp
index 1f2ba859..db833c85 100644
--- a/src/encoderDefault.cpp
+++ b/src/utility/encoder/defaultEncoder.cpp
@@ -21,19 +21,20 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoderDefault.hpp"
+#include "vmime/utility/encoder/defaultEncoder.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
-encoderDefault::encoderDefault()
+defaultEncoder::defaultEncoder()
{
}
-utility::stream::size_type encoderDefault::encode(utility::inputStream& in,
+utility::stream::size_type defaultEncoder::encode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -50,7 +51,7 @@ utility::stream::size_type encoderDefault::encode(utility::inputStream& in,
}
-utility::stream::size_type encoderDefault::decode(utility::inputStream& in,
+utility::stream::size_type defaultEncoder::decode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -67,4 +68,6 @@ utility::stream::size_type encoderDefault::decode(utility::inputStream& in,
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoder8bit.cpp b/src/utility/encoder/eightBitEncoder.cpp
index c85a3804..88f07bc4 100644
--- a/src/encoder8bit.cpp
+++ b/src/utility/encoder/eightBitEncoder.cpp
@@ -21,16 +21,19 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoder8bit.hpp"
+#include "vmime/utility/encoder/eightBitEncoder.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
-encoder8bit::encoder8bit()
+eightBitEncoder::eightBitEncoder()
{
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoder.cpp b/src/utility/encoder/encoder.cpp
index 38c7764a..893ed4fc 100644
--- a/src/encoder.cpp
+++ b/src/utility/encoder/encoder.cpp
@@ -21,12 +21,13 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoder.hpp"
+#include "vmime/utility/encoder/encoder.hpp"
#include "vmime/exception.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
encoder::encoder()
@@ -70,4 +71,6 @@ const std::vector <string> encoder::getAvailableProperties() const
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoderFactory.cpp b/src/utility/encoder/encoderFactory.cpp
index 605286be..9d7c1070 100644
--- a/src/encoderFactory.cpp
+++ b/src/utility/encoder/encoderFactory.cpp
@@ -21,30 +21,31 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoderFactory.hpp"
+#include "vmime/utility/encoder/encoderFactory.hpp"
#include "vmime/exception.hpp"
-#include "vmime/encoderB64.hpp"
-#include "vmime/encoderQP.hpp"
-#include "vmime/encoderUUE.hpp"
-#include "vmime/encoderBinary.hpp"
-#include "vmime/encoder7bit.hpp"
-#include "vmime/encoder8bit.hpp"
+#include "vmime/utility/encoder/b64Encoder.hpp"
+#include "vmime/utility/encoder/qpEncoder.hpp"
+#include "vmime/utility/encoder/uuEncoder.hpp"
+#include "vmime/utility/encoder/binaryEncoder.hpp"
+#include "vmime/utility/encoder/sevenBitEncoder.hpp"
+#include "vmime/utility/encoder/eightBitEncoder.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
encoderFactory::encoderFactory()
{
// Register some default encoders
- registerName <encoderB64>("base64");
- registerName <encoderQP>("quoted-printable");
- registerName <encoderUUE>("uuencode");
- registerName <encoder7bit>("7bit");
- registerName <encoder8bit>("8bit");
- registerName <encoderBinary>("binary");
+ registerName <b64Encoder>("base64");
+ registerName <qpEncoder>("quoted-printable");
+ registerName <uuEncoder>("uuencode");
+ registerName <sevenBitEncoder>("7bit");
+ registerName <eightBitEncoder>("8bit");
+ registerName <binaryEncoder>("binary");
}
@@ -107,4 +108,6 @@ const std::vector <ref <const encoderFactory::registeredEncoder> > encoderFactor
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoderQP.cpp b/src/utility/encoder/qpEncoder.cpp
index 95ca331c..737d488a 100644
--- a/src/encoderQP.cpp
+++ b/src/utility/encoder/qpEncoder.cpp
@@ -21,20 +21,21 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoderQP.hpp"
+#include "vmime/utility/encoder/qpEncoder.hpp"
#include "vmime/parserHelpers.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
-encoderQP::encoderQP()
+qpEncoder::qpEncoder()
{
}
-const std::vector <string> encoderQP::getAvailableProperties() const
+const std::vector <string> qpEncoder::getAvailableProperties() const
{
std::vector <string> list(encoder::getAvailableProperties());
@@ -51,10 +52,10 @@ const std::vector <string> encoderQP::getAvailableProperties() const
// Encoding table
-const unsigned char encoderQP::sm_hexDigits[] = "0123456789ABCDEF";
+const unsigned char qpEncoder::sm_hexDigits[] = "0123456789ABCDEF";
// Decoding table
-const unsigned char encoderQP::sm_hexDecodeTable[256] =
+const unsigned char qpEncoder::sm_hexDecodeTable[256] =
{
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -89,7 +90,7 @@ const unsigned char encoderQP::sm_hexDecodeTable[256] =
#endif // VMIME_BUILDING_DOC
-utility::stream::size_type encoderQP::encode(utility::inputStream& in,
+utility::stream::size_type qpEncoder::encode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -305,7 +306,7 @@ utility::stream::size_type encoderQP::encode(utility::inputStream& in,
}
-utility::stream::size_type encoderQP::decode(utility::inputStream& in,
+utility::stream::size_type qpEncoder::decode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -466,4 +467,6 @@ utility::stream::size_type encoderQP::decode(utility::inputStream& in,
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoderBinary.cpp b/src/utility/encoder/sevenBitEncoder.cpp
index dd77b072..812afa90 100644
--- a/src/encoderBinary.cpp
+++ b/src/utility/encoder/sevenBitEncoder.cpp
@@ -21,16 +21,19 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoderBinary.hpp"
+#include "vmime/utility/encoder/sevenBitEncoder.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
-encoderBinary::encoderBinary()
+sevenBitEncoder::sevenBitEncoder()
{
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/encoderUUE.cpp b/src/utility/encoder/uuEncoder.cpp
index ed54ffa7..0e72599b 100644
--- a/src/encoderUUE.cpp
+++ b/src/utility/encoder/uuEncoder.cpp
@@ -21,15 +21,16 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/encoderUUE.hpp"
+#include "vmime/utility/encoder/uuEncoder.hpp"
#include "vmime/parserHelpers.hpp"
-namespace vmime
-{
+namespace vmime {
+namespace utility {
+namespace encoder {
-encoderUUE::encoderUUE()
+uuEncoder::uuEncoder()
{
getProperties()["mode"] = 644;
getProperties()["filename"] = "no_name";
@@ -37,7 +38,7 @@ encoderUUE::encoderUUE()
}
-const std::vector <string> encoderUUE::getAvailableProperties() const
+const std::vector <string> uuEncoder::getAvailableProperties() const
{
std::vector <string> list(encoder::getAvailableProperties());
@@ -63,7 +64,7 @@ static inline unsigned char UUDECODE(const unsigned char c)
}
-utility::stream::size_type encoderUUE::encode(utility::inputStream& in,
+utility::stream::size_type uuEncoder::encode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -142,7 +143,7 @@ utility::stream::size_type encoderUUE::encode(utility::inputStream& in,
}
-utility::stream::size_type encoderUUE::decode(utility::inputStream& in,
+utility::stream::size_type uuEncoder::decode(utility::inputStream& in,
utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -325,4 +326,6 @@ utility::stream::size_type encoderUUE::decode(utility::inputStream& in,
}
+} // encoder
+} // utility
} // vmime
diff --git a/src/word.cpp b/src/word.cpp
index b129965d..95adc5c6 100644
--- a/src/word.cpp
+++ b/src/word.cpp
@@ -28,9 +28,9 @@
#include "vmime/utility/smartPtr.hpp"
#include "vmime/parserHelpers.hpp"
-#include "vmime/encoder.hpp"
-#include "vmime/encoderB64.hpp"
-#include "vmime/encoderQP.hpp"
+#include "vmime/utility/encoder/encoder.hpp"
+#include "vmime/utility/encoder/b64Encoder.hpp"
+#include "vmime/utility/encoder/qpEncoder.hpp"
#include "vmime/wordEncoder.hpp"
@@ -267,17 +267,17 @@ void word::parse(const string& buffer, const string::size_type position,
const string::const_iterator dataEnd = p;
p += 2; // skip '?='
- encoder* theEncoder = NULL;
+ utility::encoder::encoder* theEncoder = NULL;
// Base-64 encoding
if (*encPos == 'B' || *encPos == 'b')
{
- theEncoder = new encoderB64;
+ theEncoder = new utility::encoder::b64Encoder();
}
// Quoted-Printable encoding
else if (*encPos == 'Q' || *encPos == 'q')
{
- theEncoder = new encoderQP;
+ theEncoder = new utility::encoder::qpEncoder();
theEncoder->getProperties()["rfc2047"] = true;
}
diff --git a/src/wordEncoder.cpp b/src/wordEncoder.cpp
index 9888c169..ab7c004c 100644
--- a/src/wordEncoder.cpp
+++ b/src/wordEncoder.cpp
@@ -25,8 +25,9 @@
#include "vmime/exception.hpp"
#include "vmime/charsetConverter.hpp"
-#include "vmime/encoderB64.hpp"
-#include "vmime/encoderQP.hpp"
+
+#include "vmime/utility/encoder/b64Encoder.hpp"
+#include "vmime/utility/encoder/qpEncoder.hpp"
#include "vmime/utility/stringUtils.hpp"
@@ -62,11 +63,11 @@ wordEncoder::wordEncoder(const string& buffer, const charset& charset, const Enc
if (m_encoding == ENCODING_B64)
{
- m_encoder = vmime::create <encoderB64>();
+ m_encoder = vmime::create <utility::encoder::b64Encoder>();
}
else // ENCODING_QP
{
- m_encoder = vmime::create <encoderQP>();
+ m_encoder = vmime::create <utility::encoder::qpEncoder>();
m_encoder->getProperties()["rfc2047"] = true;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 02:03:39 +0000