diff --git a/exml/Attribute.cpp b/exml/Attribute.cpp index f4694d3..24c19e8 100644 --- a/exml/Attribute.cpp +++ b/exml/Attribute.cpp @@ -20,7 +20,7 @@ exml::Attribute::Attribute(const etk::UString& _name, const etk::UString& _value } -bool exml::Attribute::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) +bool exml::Attribute::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) { EXML_VERBOSE("start parse : 'attribute'"); m_pos = _filePos; @@ -108,7 +108,7 @@ bool exml::Attribute::Parse(const etk::UString& _data, int32_t& _pos, bool _case return true; } -bool exml::Attribute::Generate(etk::UString& _data, int32_t _indent) const +bool exml::Attribute::IGenerate(etk::UString& _data, int32_t _indent) const { _data += " "; _data += m_name; diff --git a/exml/Attribute.h b/exml/Attribute.h index ce315be..022841a 100644 --- a/exml/Attribute.h +++ b/exml/Attribute.h @@ -46,8 +46,8 @@ namespace exml virtual const etk::UString& GetName(void) const { return m_name; }; public: // herited function: virtual nodeType_te GetType(void) const { return exml::typeAttribute; }; - virtual bool Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); - virtual bool Generate(etk::UString& _data, int32_t _indent) const; + virtual bool IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc); + virtual bool IGenerate(etk::UString& _data, int32_t _indent) const; virtual exml::Attribute* ToAttribute(void) { return this; }; virtual const exml::Attribute* ToAttribute(void) const { return this; }; virtual void Clear(void); diff --git a/exml/AttributeList.cpp b/exml/AttributeList.cpp index 70675ad..eda8f99 100644 --- a/exml/AttributeList.cpp +++ b/exml/AttributeList.cpp @@ -101,11 +101,11 @@ void exml::AttributeList::SetAttribute(const etk::UString& _name, const etk::USt m_listAttribute.PushBack(attr); } -bool exml::AttributeList::Generate(etk::UString& _data, int32_t _indent) const +bool exml::AttributeList::IGenerate(etk::UString& _data, int32_t _indent) const { for (int32_t iii=0; iiiGenerate(_data, _indent); + m_listAttribute[iii]->IGenerate(_data, _indent); } } return true; diff --git a/exml/AttributeList.h b/exml/AttributeList.h index 38b932b..4f3a988 100644 --- a/exml/AttributeList.h +++ b/exml/AttributeList.h @@ -70,7 +70,7 @@ namespace exml */ void SetAttribute(const etk::UString& _name, const etk::UString& _value); public: // herited function: - bool Generate(etk::UString& _data, int32_t _indent) const; + bool IGenerate(etk::UString& _data, int32_t _indent) const; virtual void Clear(void); }; }; diff --git a/exml/Comment.cpp b/exml/Comment.cpp index e82c593..bc29622 100644 --- a/exml/Comment.cpp +++ b/exml/Comment.cpp @@ -13,7 +13,7 @@ #undef __class__ #define __class__ "Comment" -bool exml::Comment::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) +bool exml::Comment::IParse(const etk::UString& _data, int32_t& _pos, bool _caseSensitive, exml::filePos& _filePos, exml::Document& _doc) { EXML_VERBOSE("start parse : 'comment'"); m_pos = _filePos; @@ -53,7 +53,7 @@ bool exml::Comment::Parse(const etk::UString& _data, int32_t& _pos, bool _caseSe return false; } -bool exml::Comment::Generate(etk::UString& _data, int32_t _indent) const +bool exml::Comment::IGenerate(etk::UString& _data, int32_t _indent) const { AddIndent(_data, _indent); _data += "