From aeaa1da161f79d328f05c5a40708a9e61ca45c46 Mon Sep 17 00:00:00 2001 From: "arseny.kapoulkine" Date: Sun, 27 Jun 2010 20:05:06 +0000 Subject: Renamed encoding_t to xml_encoding, renamed xpath_type_t to xpath_value_type git-svn-id: http://pugixml.googlecode.com/svn/trunk@544 99668b35-9821-0410-8761-19e4c4f06640 --- src/pugixml.hpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/pugixml.hpp') diff --git a/src/pugixml.hpp b/src/pugixml.hpp index 579e5b4..b9b4808 100644 --- a/src/pugixml.hpp +++ b/src/pugixml.hpp @@ -271,7 +271,7 @@ namespace pugi * which means that document encoding is auto-detected from BOM and necessary encoding conversions are * applied. You can override this mode by using any of the specific encodings. */ - enum encoding_t + enum xml_encoding { encoding_auto, //!< Auto-detect input encoding using BOM or < / >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, encoding_t encoding = encoding_auto, unsigned int depth = 0) const; + void print(std::basic_ostream >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const; /** * Print subtree to stream @@ -1810,7 +1810,7 @@ namespace pugi ptrdiff_t offset; /// Source document encoding - encoding_t encoding; + xml_encoding encoding; /// Cast to bool operator operator bool() const @@ -1839,7 +1839,7 @@ namespace pugi void create(); void destroy(); - xml_parse_result load_buffer_impl(void* contents, size_t size, unsigned int options, encoding_t encoding, bool is_mutable, bool own); + xml_parse_result load_buffer_impl(void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own); public: /** @@ -1862,7 +1862,7 @@ namespace pugi * \param encoding - source data encoding * \return parsing result */ - xml_parse_result load(std::basic_istream >& stream, unsigned int options = parse_default, encoding_t encoding = encoding_auto); + xml_parse_result load(std::basic_istream >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); /** * Load document from stream. @@ -1919,7 +1919,7 @@ namespace pugi * \param encoding - source data encoding * \return parsing result */ - xml_parse_result load_file(const char* path, unsigned int options = parse_default, encoding_t encoding = encoding_auto); + xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); /** * Load document from buffer @@ -1930,7 +1930,7 @@ namespace pugi * \param encoding - source data encoding * \return parsing result */ - xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, encoding_t encoding = encoding_auto); + xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); /** * Load document from buffer in-situ. @@ -1943,7 +1943,7 @@ namespace pugi * \param encoding - source data encoding * \return parsing result */ - xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, encoding_t encoding = encoding_auto); + xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); /** * Load document from buffer in-situ (gains buffer ownership). @@ -1957,7 +1957,7 @@ namespace pugi * \param encoding - source data encoding * \return parsing result */ - xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, encoding_t encoding = encoding_auto); + xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto); /** * Save XML to writer @@ -1967,7 +1967,7 @@ namespace pugi * \param flags - formatting flags * \param encoding - encoding used for writing */ - void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, encoding_t encoding = encoding_auto) const; + void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const; #ifndef PUGIXML_NO_STL /** @@ -1978,7 +1978,7 @@ namespace pugi * \param flags - formatting flags * \param encoding - encoding used for writing */ - void save(std::basic_ostream >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, encoding_t encoding = encoding_auto) const; + void save(std::basic_ostream >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const; /** * Save XML to stream @@ -1999,7 +1999,7 @@ namespace pugi * \param encoding - encoding used for writing * \return success flag */ - bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, encoding_t encoding = encoding_auto) const; + bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const; /** * Compute document order for the whole tree -- cgit v1.2.3