Removed wide-char support.
This commit is contained in:
parent
69421bbd6f
commit
1b19b40022
18
SConstruct
18
SConstruct
@ -529,14 +529,6 @@ opts.AddOptions(
|
|||||||
'Specifies the path to sendmail.',
|
'Specifies the path to sendmail.',
|
||||||
defaultSendmailPath
|
defaultSendmailPath
|
||||||
),
|
),
|
||||||
EnumOption(
|
|
||||||
'with_wide_char_support',
|
|
||||||
'Support for wide characters (rarely used, should be set to "no")',
|
|
||||||
'no',
|
|
||||||
allowed_values = ('yes', 'no'),
|
|
||||||
map = { },
|
|
||||||
ignorecase = 1
|
|
||||||
),
|
|
||||||
EnumOption(
|
EnumOption(
|
||||||
'byte_order',
|
'byte_order',
|
||||||
'Byte order (Big Endian or Little Endian)',
|
'Byte order (Big Endian or Little Endian)',
|
||||||
@ -802,12 +794,6 @@ config_hpp.write('\n')
|
|||||||
|
|
||||||
config_hpp.write('// Options\n')
|
config_hpp.write('// Options\n')
|
||||||
|
|
||||||
config_hpp.write('// -- Wide characters support\n')
|
|
||||||
if env['with_wide_char_support'] == 'yes':
|
|
||||||
config_hpp.write('#define VMIME_WIDE_CHAR_SUPPORT 1\n')
|
|
||||||
else:
|
|
||||||
config_hpp.write('#define VMIME_WIDE_CHAR_SUPPORT 0\n')
|
|
||||||
|
|
||||||
config_hpp.write('// -- File-system support\n')
|
config_hpp.write('// -- File-system support\n')
|
||||||
if env['with_filesystem'] == 'yes':
|
if env['with_filesystem'] == 'yes':
|
||||||
config_hpp.write('#define VMIME_HAVE_FILESYSTEM_FEATURES 1\n')
|
config_hpp.write('#define VMIME_HAVE_FILESYSTEM_FEATURES 1\n')
|
||||||
@ -1916,8 +1902,6 @@ typedef signed ${VMIME_TYPE_INT32} vmime_int32;
|
|||||||
typedef unsigned ${VMIME_TYPE_INT32} vmime_uint32;
|
typedef unsigned ${VMIME_TYPE_INT32} vmime_uint32;
|
||||||
|
|
||||||
// Options
|
// Options
|
||||||
// -- Wide characters support
|
|
||||||
#define VMIME_WIDE_CHAR_SUPPORT 0
|
|
||||||
// -- File-system support
|
// -- File-system support
|
||||||
#define VMIME_HAVE_FILESYSTEM_FEATURES 1
|
#define VMIME_HAVE_FILESYSTEM_FEATURES 1
|
||||||
// -- SASL support
|
// -- SASL support
|
||||||
@ -2261,8 +2245,6 @@ typedef unsigned int vmime_uint32;
|
|||||||
|
|
||||||
|
|
||||||
// Options
|
// Options
|
||||||
// -- Wide characters support
|
|
||||||
#define VMIME_WIDE_CHAR_SUPPORT 0
|
|
||||||
// -- File-system support
|
// -- File-system support
|
||||||
#define VMIME_HAVE_FILESYSTEM_FEATURES 1
|
#define VMIME_HAVE_FILESYSTEM_FEATURES 1
|
||||||
// -- SASL support
|
// -- SASL support
|
||||||
|
@ -55,12 +55,6 @@ namespace vmime
|
|||||||
*/
|
*/
|
||||||
const string NULL_STRING;
|
const string NULL_STRING;
|
||||||
|
|
||||||
#if VMIME_WIDE_CHAR_SUPPORT
|
|
||||||
/** "Null" (empty) wide-char string.
|
|
||||||
*/
|
|
||||||
const wstring NULL_WSTRING;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** "Null" (empty) text.
|
/** "Null" (empty) text.
|
||||||
*/
|
*/
|
||||||
const text NULL_TEXT;
|
const text NULL_TEXT;
|
||||||
|
15
src/text.cpp
15
src/text.cpp
@ -91,21 +91,6 @@ void text::generate(utility::outputStream& os, const string::size_type maxLineLe
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if VMIME_WIDE_CHAR_SUPPORT
|
|
||||||
|
|
||||||
const wstring text::getDecodedText() const
|
|
||||||
{
|
|
||||||
wstring out;
|
|
||||||
|
|
||||||
for (std::vector <ref <word> >::const_iterator i = m_words.begin() ; i != m_words.end() ; ++i)
|
|
||||||
out += (*i)->getDecodedText();
|
|
||||||
|
|
||||||
return (out);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
void text::copyFrom(const component& other)
|
void text::copyFrom(const component& other)
|
||||||
{
|
{
|
||||||
const text& t = dynamic_cast <const text&>(other);
|
const text& t = dynamic_cast <const text&>(other);
|
||||||
|
14
src/word.cpp
14
src/word.cpp
@ -621,20 +621,6 @@ void word::generate(utility::outputStream& os, const string::size_type maxLineLe
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#if VMIME_WIDE_CHAR_SUPPORT
|
|
||||||
|
|
||||||
const wstring word::getDecodedText() const
|
|
||||||
{
|
|
||||||
wstring out;
|
|
||||||
|
|
||||||
charset::decode(m_buffer, out, m_charset);
|
|
||||||
|
|
||||||
return (out);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
word& word::operator=(const word& w)
|
word& word::operator=(const word& w)
|
||||||
{
|
{
|
||||||
m_buffer = w.m_buffer;
|
m_buffer = w.m_buffer;
|
||||||
|
@ -48,9 +48,6 @@ namespace vmime
|
|||||||
|
|
||||||
// "Null" strings
|
// "Null" strings
|
||||||
extern const string NULL_STRING;
|
extern const string NULL_STRING;
|
||||||
#if VMIME_WIDE_CHAR_SUPPORT
|
|
||||||
extern const wstring NULL_WSTRING;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern const text NULL_TEXT;
|
extern const text NULL_TEXT;
|
||||||
extern const word NULL_WORD;
|
extern const word NULL_WORD;
|
||||||
|
@ -129,10 +129,6 @@ public:
|
|||||||
*/
|
*/
|
||||||
const std::vector <ref <word> > getWordList();
|
const std::vector <ref <word> > getWordList();
|
||||||
|
|
||||||
// Decoding
|
|
||||||
#if VMIME_WIDE_CHAR_SUPPORT
|
|
||||||
const wstring getDecodedText() const;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** Return the text converted into the specified charset.
|
/** Return the text converted into the specified charset.
|
||||||
* The encoded-words are decoded and then converted in the
|
* The encoded-words are decoded and then converted in the
|
||||||
|
@ -36,9 +36,6 @@
|
|||||||
namespace vmime
|
namespace vmime
|
||||||
{
|
{
|
||||||
typedef std::string string;
|
typedef std::string string;
|
||||||
#if VMIME_WIDE_CHAR_SUPPORT
|
|
||||||
typedef std::wstring wstring;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef unsigned short port_t;
|
typedef unsigned short port_t;
|
||||||
|
|
||||||
|
@ -91,10 +91,6 @@ public:
|
|||||||
bool operator==(const word& w) const;
|
bool operator==(const word& w) const;
|
||||||
bool operator!=(const word& w) const;
|
bool operator!=(const word& w) const;
|
||||||
|
|
||||||
#if VMIME_WIDE_CHAR_SUPPORT
|
|
||||||
const wstring getDecodedText() const;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** Return the contained text converted to the specified charset.
|
/** Return the contained text converted to the specified charset.
|
||||||
*
|
*
|
||||||
* @param dest output charset
|
* @param dest output charset
|
||||||
|
Loading…
Reference in New Issue
Block a user