diff options
Diffstat (limited to '')
| -rw-r--r-- | vmime/charset.hpp | 27 | ||||
| -rw-r--r-- | vmime/charsetConverter.hpp | 90 | ||||
| -rw-r--r-- | vmime/exception.hpp | 2 |
3 files changed, 95 insertions, 24 deletions
diff --git a/vmime/charset.hpp b/vmime/charset.hpp index 95d03041..eec071d5 100644 --- a/vmime/charset.hpp +++ b/vmime/charset.hpp @@ -68,26 +68,6 @@ public: */ static const charset getLocaleCharset(); -#if VMIME_WIDE_CHAR_SUPPORT - /** Convert a string buffer in the specified charset to a wide-char - * string buffer. - * - * @param in input buffer - * @param out output buffer - * @param ch input charset - */ - static void decode(const string& in, wstring& out, const charset& ch); - - /** Convert a wide-char string buffer to a string buffer in the - * specified charset. - * - * @param in input buffer - * @param out output buffer - * @param ch output charset - */ - static void encode(const wstring& in, string& out, const charset& ch); -#endif - /** Convert a string buffer from one charset to another * charset (in-memory conversion) * @@ -98,6 +78,8 @@ public: * @param out output buffer * @param source input charset * @param dest output charset + * @throws exceptions::charset_conv_error if an error occured during + * the conversion */ static void convert(const string& in, string& out, const charset& source, const charset& dest); @@ -108,6 +90,8 @@ public: * @param out output stream to write the converted data * @param source input charset * @param dest output charset + * @throws exceptions::charset_conv_error if an error occured during + * the conversion */ static void convert(utility::inputStream& in, utility::outputStream& out, const charset& source, const charset& dest); @@ -118,9 +102,6 @@ private: string m_name; - template <class STRINGF, class STRINGT> - static void iconvert(const STRINGF& in, STRINGT& out, const charset& from, const charset& to); - public: using component::parse; diff --git a/vmime/charsetConverter.hpp b/vmime/charsetConverter.hpp new file mode 100644 index 00000000..aa1ac4f5 --- /dev/null +++ b/vmime/charsetConverter.hpp @@ -0,0 +1,90 @@ +// +// VMime library (http://www.vmime.org) +// Copyright (C) 2002-2005 Vincent Richard <[email protected]> +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of +// the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +// +// Linking this library statically or dynamically with other modules is making +// a combined work based on this library. Thus, the terms and conditions of +// the GNU General Public License cover the whole combination. +// + +#ifndef VMIME_CHARSETCONVERTER_HPP_INCLUDED +#define VMIME_CHARSETCONVERTER_HPP_INCLUDED + + +#include "vmime/base.hpp" +#include "vmime/component.hpp" + +#include "vmime/charset.hpp" + + +namespace vmime +{ + + +/** Convert between charsets. + */ + +class charsetConverter : public object +{ +public: + + /** Construct and initialize a charset converter. + * + * @param source input charset + * @param dest output charset + */ + charsetConverter(const charset& source, const charset& dest); + + ~charsetConverter(); + + /** Convert a string buffer from one charset to another + * charset (in-memory conversion) + * + * \deprecated Use the new convert() method, which takes + * an outputStream parameter. + * + * @param in input buffer + * @param out output buffer + * @throws exceptions::charset_conv_error if an error occured during + * the conversion + */ + void convert(const string& in, string& out); + + /** Convert the contents of an input stream in a specified charset + * to another charset and write the result to an output stream. + * + * @param in input stream to read data from + * @param out output stream to write the converted data + * @throws exceptions::charset_conv_error if an error occured during + * the conversion + */ + void convert(utility::inputStream& in, utility::outputStream& out); + +private: + + void* m_desc; + + charset m_source; + charset m_dest; +}; + + +} // vmime + + +#endif // VMIME_CHARSETCONVERTER_HPP_INCLUDED + diff --git a/vmime/exception.hpp b/vmime/exception.hpp index d686ab1f..451fcfc8 100644 --- a/vmime/exception.hpp +++ b/vmime/exception.hpp @@ -112,7 +112,7 @@ class charset_conv_error : public vmime::exception { public: - charset_conv_error(const exception& other = NO_EXCEPTION); + charset_conv_error(const string& what = "", const exception& other = NO_EXCEPTION); ~charset_conv_error() throw(); exception* clone() const; |