From f77bf5d8add60048f76e1242729a70bf36a48489 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Mon, 28 Aug 2017 00:05:54 +0200
Subject: [PATCH] [DEV] continue removing stl

---
 exml/Attribute.cpp              | 14 ++++-----
 exml/Attribute.hpp              | 10 +++---
 exml/AttributeList.cpp          | 14 ++++-----
 exml/AttributeList.hpp          | 10 +++---
 exml/Comment.cpp                |  2 +-
 exml/Comment.hpp                |  4 +--
 exml/Declaration.cpp            |  4 +--
 exml/Declaration.hpp            |  4 +--
 exml/Document.cpp               |  8 ++---
 exml/Document.hpp               | 10 +++---
 exml/Element.cpp                | 10 +++---
 exml/Element.hpp                | 12 +++----
 exml/FilePos.cpp                |  2 +-
 exml/FilePos.hpp                |  2 +-
 exml/Node.cpp                   |  8 ++---
 exml/Node.hpp                   |  6 ++--
 exml/Text.cpp                   |  2 +-
 exml/Text.hpp                   |  4 +--
 exml/details/iterator.hxx       | 16 +++++-----
 exml/internal/Attribute.cpp     | 14 ++++-----
 exml/internal/Attribute.hpp     | 16 +++++-----
 exml/internal/AttributeList.cpp | 22 ++++++-------
 exml/internal/AttributeList.hpp | 18 +++++------
 exml/internal/Comment.cpp       |  8 ++---
 exml/internal/Comment.hpp       | 10 +++---
 exml/internal/Declaration.cpp   | 12 +++----
 exml/internal/Declaration.hpp   | 12 +++----
 exml/internal/Document.cpp      | 24 +++++++-------
 exml/internal/Document.hpp      | 18 +++++------
 exml/internal/Element.cpp       | 56 ++++++++++++++++-----------------
 exml/internal/Element.hpp       | 22 ++++++-------
 exml/internal/Node.cpp          | 12 +++----
 exml/internal/Node.hpp          | 16 +++++-----
 exml/internal/Text.cpp          | 55 +++++++++++++-------------------
 exml/internal/Text.hpp          | 14 ++++-----
 exml/nodeType.cpp               |  2 +-
 exml/nodeType.hpp               |  4 +--
 sample/main.cpp                 |  2 +-
 sample/read.cpp                 | 16 +++++-----
 sample/write.cpp                |  2 +-
 test/exmlTestCommon.cpp         |  6 ++--
 test/exmlTestCommon.hpp         |  4 +--
 test/exmlTestParseElement.cpp   |  2 +-
 test/main.cpp                   |  2 +-
 44 files changed, 249 insertions(+), 262 deletions(-)

diff --git a/exml/Attribute.cpp b/exml/Attribute.cpp
index ede1ed8..8d415ed 100644
--- a/exml/Attribute.cpp
+++ b/exml/Attribute.cpp
@@ -29,7 +29,7 @@ exml::Attribute::Attribute(nullptr) :
 	
 }
 */
-exml::Attribute::Attribute(const std::string& _name, const std::string& _value) :
+exml::Attribute::Attribute(const etk::String& _name, const etk::String& _value) :
   exml::Node() {
 	m_data = exml::internal::Attribute::create(_name, _value);
 }
@@ -39,7 +39,7 @@ exml::Attribute& exml::Attribute::operator= (const exml::Attribute& _obj) {
 	return *this;
 }
 
-void exml::Attribute::setName(const std::string& _name){
+void exml::Attribute::setName(const etk::String& _name){
 	if (m_data == nullptr) {
 		EXML_DEBUG(" can not setName (nullptr) ...");
 		return;
@@ -47,9 +47,9 @@ void exml::Attribute::setName(const std::string& _name){
 	static_cast<exml::internal::Attribute*>(m_data.get())->setName(_name);
 }
 
-const std::string& exml::Attribute::getName() const {
+const etk::String& exml::Attribute::getName() const {
 	if (m_data == nullptr) {
-		static std::string errorValue = "";
+		static etk::String errorValue = "";
 		EXML_DEBUG(" can not setName (nullptr) ...");
 		return errorValue;
 	}
@@ -64,12 +64,12 @@ void exml::Attribute::clear() {
 	static_cast<exml::internal::Attribute*>(m_data.get())->clear();
 }
 
-std::pair<std::string, std::string> exml::Attribute::getPair() const {
+etk::Pair<etk::String, etk::String> exml::Attribute::getPair() const {
 	if (m_data == nullptr) {
 		EXML_DEBUG(" can not setName (nullptr) ...");
-		return std::pair<std::string, std::string>("","");
+		return etk::Pair<etk::String, etk::String>("","");
 	}
-	return std::pair<std::string, std::string>(static_cast<const exml::internal::Attribute*>(m_data.get())->getName(),
+	return etk::Pair<etk::String, etk::String>(static_cast<const exml::internal::Attribute*>(m_data.get())->getName(),
 	                                           static_cast<const exml::internal::Attribute*>(m_data.get())->getValue());
 }
 
diff --git a/exml/Attribute.hpp b/exml/Attribute.hpp
index 4debc16..56707a0 100644
--- a/exml/Attribute.hpp
+++ b/exml/Attribute.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	namespace internal {
@@ -38,7 +38,7 @@ namespace exml {
 			 * @param[in] _name Name of the attribute.
 			 * @param[in] _value Value of the attribute.
 			 */
-			Attribute(const std::string& _name="", const std::string& _value="");
+			Attribute(const etk::String& _name="", const etk::String& _value="");
 			/**
 			 * @brief Copy constructor
 			 * @param[in] _obj Object to copy
@@ -50,17 +50,17 @@ namespace exml {
 			 * @brief set the name of the attribute
 			 * @param[in] _name New name of the attribute
 			 */
-			virtual void setName(const std::string& _name);
+			virtual void setName(const etk::String& _name);
 			/**
 			 * @brief get the current name of the Attribute
 			 * @return String of the attribute
 			 */
-			virtual const std::string& getName() const;
+			virtual const etk::String& getName() const;
 			/**
 			 * @brief get attribute name and value
 			 * @return Name and value of the attribute
 			 */
-			std::pair<std::string, std::string> getPair() const;
+			etk::Pair<etk::String, etk::String> getPair() const;
 		public:
 			void clear() override;
 		friend class exml::AttributeListData;
diff --git a/exml/AttributeList.cpp b/exml/AttributeList.cpp
index 217d090..7344466 100644
--- a/exml/AttributeList.cpp
+++ b/exml/AttributeList.cpp
@@ -51,10 +51,10 @@ const exml::Attribute exml::AttributeListData::operator[] (int32_t _id) const {
 	return exml::Attribute(static_cast<exml::internal::AttributeList*>(m_data->m_data.get())->getAttr(_id));
 }
 
-std::pair<std::string, std::string> exml::AttributeListData::getPair(int32_t _id) const {
+etk::Pair<etk::String, etk::String> exml::AttributeListData::getPair(int32_t _id) const {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not getAttrPair (nullptr) ...");
-		return std::pair<std::string, std::string>("","");
+		return etk::Pair<etk::String, etk::String>("","");
 	}
 	return static_cast<exml::internal::AttributeList*>(m_data->m_data.get())->getAttrPair(_id);
 }
@@ -67,16 +67,16 @@ void exml::AttributeListData::add(exml::Attribute _attr) {
 	static_cast<exml::internal::AttributeList*>(m_data->m_data.get())->appendAttribute(_attr.getInternalAttribute());
 }
 
-const std::string& exml::AttributeListData::operator[](const std::string& _name) const {
+const etk::String& exml::AttributeListData::operator[](const etk::String& _name) const {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not getAttribute (nullptr) ...");
-		static std::string errorValue("");
+		static etk::String errorValue("");
 		return errorValue;
 	}
 	return static_cast<exml::internal::AttributeList*>(m_data->m_data.get())->getAttribute(_name);
 }
 
-bool exml::AttributeListData::exist(const std::string& _name) const {
+bool exml::AttributeListData::exist(const etk::String& _name) const {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not getAttribute (nullptr) ...");
 		return false;
@@ -84,7 +84,7 @@ bool exml::AttributeListData::exist(const std::string& _name) const {
 	return static_cast<exml::internal::AttributeList*>(m_data->m_data.get())->existAttribute(_name);
 }
 
-bool exml::AttributeListData::remove(const std::string& _name) {
+bool exml::AttributeListData::remove(const etk::String& _name) {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not removeAttribute (nullptr) ...");
 		return false;
@@ -92,7 +92,7 @@ bool exml::AttributeListData::remove(const std::string& _name) {
 	return static_cast<exml::internal::AttributeList*>(m_data->m_data.get())->removeAttribute(_name);
 }
 
-void exml::AttributeListData::set(const std::string& _name, const std::string& _value) {
+void exml::AttributeListData::set(const etk::String& _name, const etk::String& _value) {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not setAttribute (nullptr) ...");
 		return;
diff --git a/exml/AttributeList.hpp b/exml/AttributeList.hpp
index 2a0a6bb..d1a1e2a 100644
--- a/exml/AttributeList.hpp
+++ b/exml/AttributeList.hpp
@@ -40,7 +40,7 @@ namespace exml {
 			 * @return true The attribute has been removed
 			 * @return false An error occured.
 			 */
-			bool remove(const std::string& _name);
+			bool remove(const etk::String& _name);
 			/**
 			 * @brief get attribute whith his ID
 			 * @param[in] _id Identifier of the attribute 0<= _id < sizeAttribute()
@@ -58,25 +58,25 @@ namespace exml {
 			 * @param[in] _id Identifier of the attribute 0<= _id < sizeAttribute()
 			 * @return Name and value of the attribute
 			 */
-			std::pair<std::string, std::string> getPair(int32_t _id) const;
+			etk::Pair<etk::String, etk::String> getPair(int32_t _id) const;
 			/**
 			 * @brief get the attribute value with searching in the List with his name
 			 * @param[in] _name Attribute Name.
 			 * @return Value of the attribute or no data in the string
 			 */
-			const std::string& operator[](const std::string& _name) const;
+			const etk::String& operator[](const etk::String& _name) const;
 			/**
 			 * @brief check if an attribute exist or not with his name.
 			 * @param[in] _name Attribute Name.
 			 * @return true if the attribute exist or False
 			 */
-			bool exist(const std::string& _name) const;
+			bool exist(const etk::String& _name) const;
 			/**
 			 * @brief Set A new attribute or replace data of the previous one
 			 * @param[in] _name Name of the attribute
 			 * @param[in] _value Value of the attribute
 			 */
-			void set(const std::string& _name, const std::string& _value);
+			void set(const etk::String& _name, const etk::String& _value);
 		public:
 			using iterator = exml::iterator<exml::AttributeListData, exml::Attribute>; //!< Specify iterator of the element methode
 			/**
diff --git a/exml/Comment.cpp b/exml/Comment.cpp
index 885632c..ea2595d 100644
--- a/exml/Comment.cpp
+++ b/exml/Comment.cpp
@@ -24,7 +24,7 @@ exml::Comment::Comment(const exml::Comment& _obj) :
 	
 }
 
-exml::Comment::Comment(const std::string& _value) :
+exml::Comment::Comment(const etk::String& _value) :
   exml::Node() {
 	m_data = exml::internal::Comment::create(_value);
 }
diff --git a/exml/Comment.hpp b/exml/Comment.hpp
index 49fd146..adbe8dc 100644
--- a/exml/Comment.hpp
+++ b/exml/Comment.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	/**
@@ -28,7 +28,7 @@ namespace exml {
 			 * @brief Constructor
 			 * @param[in] _value comment value
 			 */
-			Comment(const std::string& _value="");
+			Comment(const etk::String& _value="");
 			/**
 			 * @brief Copy constructor
 			 * @param[in] _obj Object to copy
diff --git a/exml/Declaration.cpp b/exml/Declaration.cpp
index 2c58a33..72ec36b 100644
--- a/exml/Declaration.cpp
+++ b/exml/Declaration.cpp
@@ -24,7 +24,7 @@ exml::Declaration::Declaration(const exml::Declaration& _obj) :
 	
 }
 
-exml::Declaration::Declaration(const std::string& _name) :
+exml::Declaration::Declaration(const etk::String& _name) :
   exml::AttributeList() {
 	m_data = exml::internal::Declaration::create();
 }
@@ -54,7 +54,7 @@ exml::DeclarationXML::DeclarationXML(const exml::DeclarationXML& _obj) :
 	
 }
 
-exml::DeclarationXML::DeclarationXML(const std::string& _version, const std::string& _format, bool _standalone) :
+exml::DeclarationXML::DeclarationXML(const etk::String& _version, const etk::String& _format, bool _standalone) :
   exml::Declaration() {
 	m_data = exml::internal::DeclarationXML::create(_version, _format, _standalone);
 }
diff --git a/exml/Declaration.hpp b/exml/Declaration.hpp
index cff7969..6925385 100644
--- a/exml/Declaration.hpp
+++ b/exml/Declaration.hpp
@@ -28,7 +28,7 @@ namespace exml {
 			 * @brief Constructor
 			 * @param[in] _name name of the declaration (xml, xml:xxxx ...)
 			 */
-			Declaration(const std::string& _name="");
+			Declaration(const etk::String& _name="");
 			/**
 			 * @brief Copy constructor
 			 * @param[in] _obj Object to copy
@@ -57,7 +57,7 @@ namespace exml {
 			 * @param[in] _format charset of the XML
 			 * @param[in] _standalone this document is standalone
 			 */
-			DeclarationXML(const std::string& _version="0.0", const std::string& _format = "UTF-8", bool _standalone = true);
+			DeclarationXML(const etk::String& _version="0.0", const etk::String& _format = "UTF-8", bool _standalone = true);
 			/**
 			 * @brief Copy constructor
 			 * @param[in] _obj Object to copy
diff --git a/exml/Document.cpp b/exml/Document.cpp
index 38d0fbc..ac59866 100644
--- a/exml/Document.cpp
+++ b/exml/Document.cpp
@@ -34,7 +34,7 @@ exml::Document& exml::Document::operator= (const exml::Document& _obj) {
 	return *this;
 }
 
-bool exml::Document::parse(const std::string& _data) {
+bool exml::Document::parse(const etk::String& _data) {
 	if (m_data == nullptr) {
 		EXML_DEBUG("Can not parse (nullptr) ...");
 		return false;
@@ -42,7 +42,7 @@ bool exml::Document::parse(const std::string& _data) {
 	return static_cast<exml::internal::Document*>(m_data.get())->parse(_data);
 }
 
-bool exml::Document::generate(std::string& _data) {
+bool exml::Document::generate(etk::String& _data) {
 	if (m_data == nullptr) {
 		EXML_DEBUG("Can not generate (nullptr) ...");
 		return false;
@@ -50,7 +50,7 @@ bool exml::Document::generate(std::string& _data) {
 	return static_cast<exml::internal::Document*>(m_data.get())->generate(_data);
 }
 
-bool exml::Document::load(const std::string& _file) {
+bool exml::Document::load(const etk::String& _file) {
 	if (m_data == nullptr) {
 		EXML_DEBUG("Can not load (nullptr) ...");
 		return false;
@@ -58,7 +58,7 @@ bool exml::Document::load(const std::string& _file) {
 	return static_cast<exml::internal::Document*>(m_data.get())->load(_file);
 }
 
-bool exml::Document::store(const std::string& _file) {
+bool exml::Document::store(const etk::String& _file) {
 	if (m_data == nullptr) {
 		EXML_DEBUG("Can not store (nullptr) ...");
 		return false;
diff --git a/exml/Document.hpp b/exml/Document.hpp
index 05aceef..fb6fdb7 100644
--- a/exml/Document.hpp
+++ b/exml/Document.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/Element.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	/**
@@ -51,28 +51,28 @@ namespace exml {
 			 * @return false : An error occured
 			 * @return true : Parsing is OK
 			 */
-			bool parse(const std::string& _data);
+			bool parse(const etk::String& _data);
 			/**
 			 * @brief generate a string that contain the created XML
 			 * @param[out] _data Data where the xml is stored
 			 * @return false : An error occured
 			 * @return true : Parsing is OK
 			 */
-			bool generate(std::string& _data);
+			bool generate(etk::String& _data);
 			/**
 			 * @brief Load the file that might contain the xml
 			 * @param[in] _file Filename of the xml (compatible with etk FSNode naming)
 			 * @return false : An error occured
 			 * @return true : Parsing is OK
 			 */
-			bool load(const std::string& _file);
+			bool load(const etk::String& _file);
 			/**
 			 * @brief Store the Xml in the file
 			 * @param[in] _file Filename of the xml (compatible with etk FSNode naming)
 			 * @return false : An error occured
 			 * @return true : Parsing is OK
 			 */
-			bool store(const std::string& _file);
+			bool store(const etk::String& _file);
 			/**
 			 * @brief Display the Document on console
 			 */
diff --git a/exml/Element.cpp b/exml/Element.cpp
index 0343e97..b22fc34 100644
--- a/exml/Element.cpp
+++ b/exml/Element.cpp
@@ -28,7 +28,7 @@ exml::Element::Element(const exml::Element& _obj) :
 	
 }
 
-exml::Element::Element(const std::string& _data) :
+exml::Element::Element(const etk::String& _data) :
   exml::AttributeList(),
   nodes(this) {
 	m_data = exml::internal::Element::create(_data);
@@ -92,7 +92,7 @@ const exml::Node exml::ElementData::operator[](int32_t _id) const {
 	return exml::Node(static_cast<const exml::internal::Element*>(m_data->m_data.get())->getNode(_id));
 }
 
-exml::Element exml::ElementData::operator[](const std::string& _name) {
+exml::Element exml::ElementData::operator[](const etk::String& _name) {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not get type ...");
 		return exml::Element();
@@ -100,7 +100,7 @@ exml::Element exml::ElementData::operator[](const std::string& _name) {
 	return exml::Element(static_cast<exml::internal::Element*>(m_data->m_data.get())->getNamed(_name));
 }
 
-const exml::Element exml::ElementData::operator[] (const std::string& _name) const {
+const exml::Element exml::ElementData::operator[] (const etk::String& _name) const {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not get type ...");
 		return exml::Element();
@@ -116,7 +116,7 @@ void exml::ElementData::add(const exml::Node& _node) {
 	static_cast<exml::internal::Element*>(m_data->m_data.get())->append(_node.m_data);
 }
 
-void exml::ElementData::remove(const std::string& _nodeName) {
+void exml::ElementData::remove(const etk::String& _nodeName) {
 	if (m_data->m_data == nullptr) {
 		EXML_DEBUG(" can not APPEND on null element ...");
 		return;
@@ -124,7 +124,7 @@ void exml::ElementData::remove(const std::string& _nodeName) {
 	static_cast<exml::internal::Element*>(m_data->m_data.get())->remove(_nodeName);
 }
 
-std::string exml::Element::getText() const {
+etk::String exml::Element::getText() const {
 	if (m_data == nullptr) {
 		EXML_DEBUG(" can not APPEND on null element ...");
 		return "";
diff --git a/exml/Element.hpp b/exml/Element.hpp
index 3db0cda..f0dbec9 100644
--- a/exml/Element.hpp
+++ b/exml/Element.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 #include <exml/AttributeList.hpp>
 #include <exml/iterator.hpp>
 
@@ -41,7 +41,7 @@ namespace exml {
 			 * @brief Remove a node with his name.
 			 * @param[in] _nodeName Name of the node.
 			 */
-			void remove(const std::string& _nodeName);
+			void remove(const etk::String& _nodeName);
 			/**
 			 * @brief get the type of the element id.
 			 * @param[in] _id Id of the element.
@@ -65,13 +65,13 @@ namespace exml {
 			 * @param[in] _name Name of the element that is requested
 			 * @return Pointer on the element or NULL.
 			 */
-			exml::Element operator[] (const std::string& _name);
+			exml::Element operator[] (const etk::String& _name);
 			/**
 			 * @brief get an element with his name (work only with exml::Element)
 			 * @param[in] _name Name of the element that is requested
 			 * @return Pointer on the element or NULL.
 			 */
-			const exml::Element operator[] (const std::string& _name) const;
+			const exml::Element operator[] (const etk::String& _name) const;
 		public:
 			using iterator = exml::iterator<exml::ElementData, exml::Node>; //!< Specify iterator of the element methode
 			/**
@@ -116,7 +116,7 @@ namespace exml {
 			 * @brief Constructor
 			 * @param[in] _value Element name;
 			 */
-			Element(const std::string& _value="");
+			Element(const etk::String& _value="");
 			/**
 			 * @brief Copy constructor
 			 * @param[in] _obj Object to copy
@@ -127,7 +127,7 @@ namespace exml {
 			 * @brief get the internal data of the element (if the element has some sub node thay are converted in xml string  == > like this it is not needed to use <![CDATA[...]]>
 			 * @return the curent data string. if Only one text node, then we get the parssed data (no &amp; ...) if more than one node, then we transform &,",',<,> in xml normal text...
 			 */
-			std::string getText() const;
+			etk::String getText() const;
 		public:
 			void clear() override;
 	};
diff --git a/exml/FilePos.cpp b/exml/FilePos.cpp
index cf59e77..a7e5517 100644
--- a/exml/FilePos.cpp
+++ b/exml/FilePos.cpp
@@ -82,7 +82,7 @@ size_t exml::FilePos::getLine() const {
 	return m_line;
 }
 
-std::ostream& exml::operator <<(std::ostream& _os, const exml::FilePos& _obj) {
+etk::Stream& exml::operator <<(etk::Stream& _os, const exml::FilePos& _obj) {
 	_os << "(l=";
 	_os << _obj.getLine();
 	_os << ",c=";
diff --git a/exml/FilePos.hpp b/exml/FilePos.hpp
index 478f8cf..86ffb37 100644
--- a/exml/FilePos.hpp
+++ b/exml/FilePos.hpp
@@ -87,7 +87,7 @@ namespace exml {
 			size_t getLine() const;
 	};
 	//! @not-in-doc
-	std::ostream& operator <<(std::ostream& _os, const FilePos& _obj);
+	etk::Stream& operator <<(etk::Stream& _os, const FilePos& _obj);
 	
 }
 
diff --git a/exml/Node.cpp b/exml/Node.cpp
index a6cb4ab..9b8d5de 100644
--- a/exml/Node.cpp
+++ b/exml/Node.cpp
@@ -14,7 +14,7 @@
 #include <exml/Element.hpp>
 #include <exml/Text.hpp>
 
-std::ostream& exml::operator <<(std::ostream& _os, const exml::Node& _obj) {
+etk::Stream& exml::operator <<(etk::Stream& _os, const exml::Node& _obj) {
 	_os << "{";
 	_os << "Node XML: " << _obj.getType();
 	if (_obj.isElement() == true) {
@@ -49,7 +49,7 @@ exml::FilePos exml::Node::getPos() const {
 	return m_data->getPos();
 }
 
-void exml::Node::setValue(std::string _value) {
+void exml::Node::setValue(etk::String _value) {
 	if (m_data == nullptr) {
 		EXML_ERROR(" can not set value: '" << _value << "'");
 		return;
@@ -57,9 +57,9 @@ void exml::Node::setValue(std::string _value) {
 	m_data->setValue(_value);
 }
 
-const std::string& exml::Node::getValue() const {
+const etk::String& exml::Node::getValue() const {
 	if (m_data == nullptr) {
-		static std::string errorString = "";
+		static etk::String errorString = "";
 		EXML_DEBUG(" can not get value ...");
 		return errorString;
 	}
diff --git a/exml/Node.hpp b/exml/Node.hpp
index 84a61b6..75311ef 100644
--- a/exml/Node.hpp
+++ b/exml/Node.hpp
@@ -64,12 +64,12 @@ namespace exml {
 			 * @brief set the value of the node.
 			 * @param[in] _value New value of the node.
 			 */
-			virtual void setValue(std::string _value);
+			virtual void setValue(etk::String _value);
 			/**
 			 * @brief get the current element Value.
 			 * @return the reference of the string value.
 			 */
-			const std::string& getValue() const;
+			const etk::String& getValue() const;
 			/**
 			 * @brief get the node type.
 			 * @return the type of the Node.
@@ -171,5 +171,5 @@ namespace exml {
 			virtual void clear();
 	};
 	//! @not_in_doc
-	std::ostream& operator <<(std::ostream& _os, const exml::Node& _obj);
+	etk::Stream& operator <<(etk::Stream& _os, const exml::Node& _obj);
 }
diff --git a/exml/Text.cpp b/exml/Text.cpp
index 99aee23..3bea660 100644
--- a/exml/Text.cpp
+++ b/exml/Text.cpp
@@ -25,7 +25,7 @@ exml::Text::Text(const exml::Text& _obj) :
 	
 }
 
-exml::Text::Text(const std::string& _data) :
+exml::Text::Text(const etk::String& _data) :
   exml::Node() {
 	m_data = exml::internal::Text::create(_data);
 }
diff --git a/exml/Text.hpp b/exml/Text.hpp
index ebbaa5b..8a4c47a 100644
--- a/exml/Text.hpp
+++ b/exml/Text.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	/**
@@ -28,7 +28,7 @@ namespace exml {
 			 * @brief Constructor
 			 * @param[in] _data String data of the current Text
 			 */
-			Text(const std::string& _data="");
+			Text(const etk::String& _data="");
 			/**
 			 * @brief Copy constructor
 			 * @param[in] _obj Object to copy
diff --git a/exml/details/iterator.hxx b/exml/details/iterator.hxx
index da77676..aba20a3 100644
--- a/exml/details/iterator.hxx
+++ b/exml/details/iterator.hxx
@@ -11,28 +11,28 @@ template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>::iterator(EXML_BASE_T& _obj, size_t _pos) :
   m_data(_obj),
   m_id(_pos) {
-	m_id = std::avg(size_t(0), m_id, m_data.size());
+	m_id = etk::avg(size_t(0), m_id, m_data.size());
 }
 
 template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>::iterator(const EXML_BASE_T& _obj, size_t _pos) :
   m_data(const_cast<EXML_BASE_T&>(_obj)),
   m_id(_pos) {
-	m_id = std::avg(size_t(0), m_id, m_data.size());
+	m_id = etk::avg(size_t(0), m_id, m_data.size());
 }
 
 template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>::iterator(const exml::iterator<EXML_BASE_T,EXML_RETURN_T>& _obj) :
   m_data(_obj.m_data),
   m_id(_obj.m_id) {
-	m_id = std::avg(size_t(0), m_id, m_data.size());
+	m_id = etk::avg(size_t(0), m_id, m_data.size());
 }
 
 template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>& exml::iterator<EXML_BASE_T,EXML_RETURN_T>::operator= (const exml::iterator<EXML_BASE_T,EXML_RETURN_T>& _obj) {
 	m_data = _obj.m_data;
 	m_id = _obj.m_id;
-	m_id = std::avg(size_t(0), m_id, m_data.size());
+	m_id = etk::avg(size_t(0), m_id, m_data.size());
 	return *this;
 }
 
@@ -40,7 +40,7 @@ template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>& exml::iterator<EXML_BASE_T,EXML_RETURN_T>::operator+= (int32_t _val) {
 	int64_t val = m_id;
 	val += _val;
-	m_id = std::avg(int64_t(0), val, int64_t(m_data.size()));
+	m_id = etk::avg(int64_t(0), val, int64_t(m_data.size()));
 	return *this;
 }
 
@@ -55,7 +55,7 @@ template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>& exml::iterator<EXML_BASE_T,EXML_RETURN_T>::operator-= (int32_t _val) {
 	int64_t val = m_id;
 	val -= _val;
-	m_id = std::avg(int64_t(0), val, int64_t(m_data.size()));
+	m_id = etk::avg(int64_t(0), val, int64_t(m_data.size()));
 	return *this;
 }
 
@@ -70,7 +70,7 @@ template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>& exml::iterator<EXML_BASE_T,EXML_RETURN_T>::operator++() {
 	int64_t val = m_id;
 	++val;
-	m_id = std::avg(int64_t(0), val, int64_t(m_data.size()));
+	m_id = etk::avg(int64_t(0), val, int64_t(m_data.size()));
 	return *this;
 }
 
@@ -85,7 +85,7 @@ template<class EXML_BASE_T, class EXML_RETURN_T>
 exml::iterator<EXML_BASE_T,EXML_RETURN_T>& exml::iterator<EXML_BASE_T,EXML_RETURN_T>::operator--() {
 	int64_t val = m_id;
 	--val;
-	m_id = std::avg(int64_t(0), val, int64_t(m_data.size()));
+	m_id = etk::avg(int64_t(0), val, int64_t(m_data.size()));
 	return *this;
 }
 
diff --git a/exml/internal/Attribute.cpp b/exml/internal/Attribute.cpp
index 11ec7a3..0cf7450 100644
--- a/exml/internal/Attribute.cpp
+++ b/exml/internal/Attribute.cpp
@@ -8,17 +8,17 @@
 #include <exml/debug.hpp>
 #include <exml/internal/Document.hpp>
 
-ememory::SharedPtr<exml::internal::Attribute> exml::internal::Attribute::create(const std::string& _name, const std::string& _value) {
+ememory::SharedPtr<exml::internal::Attribute> exml::internal::Attribute::create(const etk::String& _name, const etk::String& _value) {
 	return ememory::SharedPtr<exml::internal::Attribute>(new exml::internal::Attribute(_name, _value));
 }
 
-exml::internal::Attribute::Attribute(const std::string& _name, const std::string& _value) :
+exml::internal::Attribute::Attribute(const etk::String& _name, const etk::String& _value) :
   exml::internal::Node(_value),
   m_name(_name) {
 	
 }
 
-bool exml::internal::Attribute::iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) {
+bool exml::internal::Attribute::iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) {
 	EXML_VERBOSE("start parse : 'attribute'");
 	m_pos = _filePos;
 	// search end of the comment :
@@ -34,7 +34,7 @@ bool exml::internal::Attribute::iParse(const std::string& _data, int32_t& _pos,
 			break;
 		}
 	}
-	m_name = std::string(_data, _pos, lastElementName+1-(_pos));
+	m_name = etk::String(_data, _pos, lastElementName+1-(_pos));
 	if (_caseSensitive == true) {
 		m_name = etk::tolower(m_name);
 	}
@@ -83,7 +83,7 @@ bool exml::internal::Attribute::iParse(const std::string& _data, int32_t& _pos,
 				break;
 			}
 		}
-		m_value = std::string(_data, lastElementName+white+2, lastAttributePos-(lastElementName+white+2));
+		m_value = etk::String(_data, lastElementName+white+2, lastAttributePos-(lastElementName+white+2));
 		
 		EXML_PARSE_ATTRIBUTE(m_pos << " attribute : " << m_name << "=\"" << m_value << "\"");
 		
@@ -103,7 +103,7 @@ bool exml::internal::Attribute::iParse(const std::string& _data, int32_t& _pos,
 			break;
 		}
 	}
-	m_value = std::string(_data, lastElementName+white+3, lastAttributePos-(lastElementName+white+3));
+	m_value = etk::String(_data, lastElementName+white+3, lastAttributePos-(lastElementName+white+3));
 	
 	EXML_PARSE_ATTRIBUTE(m_pos << " attribute : " << m_name << "=\"" << m_value << "\"");
 	
@@ -111,7 +111,7 @@ bool exml::internal::Attribute::iParse(const std::string& _data, int32_t& _pos,
 	return true;
 }
 
-bool exml::internal::Attribute::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::Attribute::iGenerate(etk::String& _data, int32_t _indent) const {
 	_data += " ";
 	_data += m_name;
 	_data += "=\"";
diff --git a/exml/internal/Attribute.hpp b/exml/internal/Attribute.hpp
index 6e905db..4bf7cbc 100644
--- a/exml/internal/Attribute.hpp
+++ b/exml/internal/Attribute.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/internal/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	namespace internal {
@@ -20,7 +20,7 @@ namespace exml {
 				 * @param[in] _name Name of the attribute.
 				 * @param[in] _value Value of the attribute.
 				 */
-				Attribute(const std::string& _name="", const std::string& _value="");
+				Attribute(const etk::String& _name="", const etk::String& _value="");
 			public:
 				/**
 				 * @brief defined factory
@@ -28,30 +28,30 @@ namespace exml {
 				 * @param[in] _value Value of the attribute
 				 * @return Shared pointer on the Attribute element
 				 */
-				static ememory::SharedPtr<Attribute> create(const std::string& _name="", const std::string& _value="");
+				static ememory::SharedPtr<Attribute> create(const etk::String& _name="", const etk::String& _value="");
 			protected:
-				std::string m_name; //!< Name of the attribute
+				etk::String m_name; //!< Name of the attribute
 			public:
 				/**
 				 * @brief set the name of the attribute
 				 * @param[in] _name New name of the attribute
 				 */
-				virtual void setName(const std::string& _name) {
+				virtual void setName(const etk::String& _name) {
 					m_name = _name;
 				};
 				/**
 				 * @brief get the current name of the Attribute
 				 * @return String of the attribute
 				 */
-				virtual const std::string& getName() const {
+				virtual const etk::String& getName() const {
 					return m_name;
 				};
 			public:
 				enum nodeType getType() const override {
 					return exml::nodeType::attribute;
 				};
-				bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
+				bool iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
 				ememory::SharedPtr<exml::internal::Attribute> toAttribute() override {
 					return ememory::staticPointerCast<exml::internal::Attribute>(sharedFromThis());
 				};
diff --git a/exml/internal/AttributeList.cpp b/exml/internal/AttributeList.cpp
index 2c4ed18..55bd137 100644
--- a/exml/internal/AttributeList.cpp
+++ b/exml/internal/AttributeList.cpp
@@ -23,12 +23,12 @@ ememory::SharedPtr<const exml::internal::Attribute> exml::internal::AttributeLis
 	return m_listAttribute[_id];
 }
 
-std::pair<std::string, std::string> exml::internal::AttributeList::getAttrPair(int32_t _id) const {
+etk::Pair<etk::String, etk::String> exml::internal::AttributeList::getAttrPair(int32_t _id) const {
 	ememory::SharedPtr<const exml::internal::Attribute> att = getAttr(_id);
 	if (att == nullptr) {
-		return std::make_pair<std::string, std::string>("","");
+		return etk::makePair<etk::String, etk::String>("","");
 	}
-	return std::make_pair(att->getName(),att->getValue());
+	return etk::makePair(att->getName(),att->getValue());
 }
 
 
@@ -43,11 +43,11 @@ void exml::internal::AttributeList::appendAttribute(const ememory::SharedPtr<exm
 			return;
 		}
 	}
-	m_listAttribute.push_back(_attr);
+	m_listAttribute.pushBack(_attr);
 }
 
-const std::string& exml::internal::AttributeList::getAttribute(const std::string& _name) const {
-	static const std::string errorReturn("");
+const etk::String& exml::internal::AttributeList::getAttribute(const etk::String& _name) const {
+	static const etk::String errorReturn("");
 	if (_name.size() == 0) {
 		return errorReturn;
 	}
@@ -61,7 +61,7 @@ const std::string& exml::internal::AttributeList::getAttribute(const std::string
 }
 
 
-bool exml::internal::AttributeList::existAttribute(const std::string& _name) const {
+bool exml::internal::AttributeList::existAttribute(const etk::String& _name) const {
 	if (_name.size() == 0) {
 		return false;
 	}
@@ -74,7 +74,7 @@ bool exml::internal::AttributeList::existAttribute(const std::string& _name) con
 	return false;
 }
 
-bool exml::internal::AttributeList::removeAttribute(const std::string& _name) {
+bool exml::internal::AttributeList::removeAttribute(const etk::String& _name) {
 	if (_name.size() == 0) {
 		return false;
 	}
@@ -93,7 +93,7 @@ bool exml::internal::AttributeList::removeAttribute(const std::string& _name) {
 	return false;
 }
 
-void exml::internal::AttributeList::setAttribute(const std::string& _name, const std::string& _value) {
+void exml::internal::AttributeList::setAttribute(const etk::String& _name, const etk::String& _value) {
 	// check if attribute already det :
 	for (size_t iii=0; iii<m_listAttribute.size(); ++iii) {
 		if(    m_listAttribute[iii] != nullptr
@@ -107,10 +107,10 @@ void exml::internal::AttributeList::setAttribute(const std::string& _name, const
 	if (attr == nullptr) {
 		EXML_ERROR("memory allocation error...");
 	}
-	m_listAttribute.push_back(attr);
+	m_listAttribute.pushBack(attr);
 }
 
-bool exml::internal::AttributeList::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::AttributeList::iGenerate(etk::String& _data, int32_t _indent) const {
 	for (size_t iii=0; iii<m_listAttribute.size(); iii++) {
 		if (m_listAttribute[iii] != nullptr) {
 			m_listAttribute[iii]->iGenerate(_data, _indent);
diff --git a/exml/internal/AttributeList.hpp b/exml/internal/AttributeList.hpp
index 5b84fef..735aacd 100644
--- a/exml/internal/AttributeList.hpp
+++ b/exml/internal/AttributeList.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/internal/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 #include <exml/internal/Attribute.hpp>
 #include <utility>
 
@@ -21,12 +21,12 @@ namespace exml {
 				 * @brief Constructor
 				 * @param[in] _value Node value;
 				 */
-				AttributeList(const std::string& _value="") :
+				AttributeList(const etk::String& _value="") :
 				  exml::internal::Node(_value) {
 					
 				};
 			protected:
-				std::vector<ememory::SharedPtr<exml::internal::Attribute>> m_listAttribute; //!< list of all attribute
+				etk::Vector<ememory::SharedPtr<exml::internal::Attribute>> m_listAttribute; //!< list of all attribute
 			public:
 				/**
 				 * @brief get the number of attribute in the Node
@@ -57,34 +57,34 @@ namespace exml {
 				 * @param[in] _id Identifier of the attribute 0<= _id < sizeAttribute()
 				 * @return Name and value of the attribute
 				 */
-				std::pair<std::string, std::string> getAttrPair(int32_t _id) const;
+				etk::Pair<etk::String, etk::String> getAttrPair(int32_t _id) const;
 				/**
 				 * @brief get the attribute value with searching in the List with his name
 				 * @param[in] _name Attribute Name.
 				 * @return Value of the attribute or no data in the string
 				 */
-				const std::string& getAttribute(const std::string& _name) const;
+				const etk::String& getAttribute(const etk::String& _name) const;
 				/**
 				 * @brief check if an attribute exist or not with his name.
 				 * @param[in] _name Attribute Name.
 				 * @return true if the attribute exist or False
 				 */
-				bool existAttribute(const std::string& _name) const;
+				bool existAttribute(const etk::String& _name) const;
 				/**
 				 * @brief Set A new attribute or replace data of the previous one
 				 * @param[in] _name Name of the attribute
 				 * @param[in] _value Value of the attribute
 				 */
-				void setAttribute(const std::string& _name, const std::string& _value);
+				void setAttribute(const etk::String& _name, const etk::String& _value);
 				/**
 				 * @brief Remove an attribute form the list
 				 * @param[in] _name Name of the attribute
 				 * @return true The attribute has been removed
 				 * @return false An error occured.
 				 */
-				bool removeAttribute(const std::string& _name);
+				bool removeAttribute(const etk::String& _name);
 			public:
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
 				void clear() override;
 		};
 	}
diff --git a/exml/internal/Comment.cpp b/exml/internal/Comment.cpp
index 9620b9a..152a334 100644
--- a/exml/internal/Comment.cpp
+++ b/exml/internal/Comment.cpp
@@ -18,11 +18,11 @@ static bool isWhiteChar(char32_t _val) {
 	return false;
 }
 
-ememory::SharedPtr<exml::internal::Comment> exml::internal::Comment::create(const std::string& _value) {
+ememory::SharedPtr<exml::internal::Comment> exml::internal::Comment::create(const etk::String& _value) {
 	return ememory::SharedPtr<exml::internal::Comment>(new exml::internal::Comment(_value));
 }
 
-bool exml::internal::Comment::iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) {
+bool exml::internal::Comment::iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) {
 	EXML_VERBOSE("start parse : 'comment'");
 	m_pos = _filePos;
 	exml::FilePos tmpPos;
@@ -50,7 +50,7 @@ bool exml::internal::Comment::iParse(const std::string& _data, int32_t& _pos, bo
 				}
 			}
 			// find end of value:
-			m_value = std::string(_data, _pos+white, newEnd-(_pos+white));
+			m_value = etk::String(_data, _pos+white, newEnd-(_pos+white));
 			EXML_VERBOSE(" find comment '" << m_value << "'");
 			_pos = iii+2;
 			return true;
@@ -61,7 +61,7 @@ bool exml::internal::Comment::iParse(const std::string& _data, int32_t& _pos, bo
 	return false;
 }
 
-bool exml::internal::Comment::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::Comment::iGenerate(etk::String& _data, int32_t _indent) const {
 	addIndent(_data, _indent);
 	_data += "<!--";
 	_data += m_value;
diff --git a/exml/internal/Comment.hpp b/exml/internal/Comment.hpp
index 3ab619a..946632d 100644
--- a/exml/internal/Comment.hpp
+++ b/exml/internal/Comment.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/internal/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	namespace internal {
@@ -20,12 +20,12 @@ namespace exml {
 				 * @return Shared pointer on the Comment element
 				 * @param[in] _value comment value
 				 */
-				static ememory::SharedPtr<exml::internal::Comment> create(const std::string& _value="");
+				static ememory::SharedPtr<exml::internal::Comment> create(const etk::String& _value="");
 				/**
 				 * @brief Constructor
 				 * @param[in] _value comment value
 				 */
-				Comment(const std::string& _value) :
+				Comment(const etk::String& _value) :
 				  exml::internal::Node(_value) {
 					
 				}
@@ -33,8 +33,8 @@ namespace exml {
 				enum nodeType getType() const override {
 					return nodeType::comment;
 				}
-				bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
+				bool iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
 				ememory::SharedPtr<exml::internal::Comment> toComment() override {
 					return ememory::staticPointerCast<exml::internal::Comment>(sharedFromThis());
 				}
diff --git a/exml/internal/Declaration.cpp b/exml/internal/Declaration.cpp
index a3bd7e0..b44ac6f 100644
--- a/exml/internal/Declaration.cpp
+++ b/exml/internal/Declaration.cpp
@@ -15,15 +15,15 @@
 	<?xml version="1.0" encoding="UTF-8" ?>
 */
 
-ememory::SharedPtr<exml::internal::Declaration> exml::internal::Declaration::create(const std::string& _name) {
+ememory::SharedPtr<exml::internal::Declaration> exml::internal::Declaration::create(const etk::String& _name) {
 	return ememory::SharedPtr<exml::internal::Declaration>(new exml::internal::Declaration(_name));
 }
 
-ememory::SharedPtr<exml::internal::DeclarationXML> exml::internal::DeclarationXML::create(const std::string& _version, const std::string& _format, bool _standalone) {
+ememory::SharedPtr<exml::internal::DeclarationXML> exml::internal::DeclarationXML::create(const etk::String& _version, const etk::String& _format, bool _standalone) {
 	return ememory::SharedPtr<exml::internal::DeclarationXML>(new exml::internal::DeclarationXML(_version, _format, _standalone));
 }
 
-exml::internal::DeclarationXML::DeclarationXML(const std::string& _version, const std::string& _format, bool _standalone) :
+exml::internal::DeclarationXML::DeclarationXML(const etk::String& _version, const etk::String& _format, bool _standalone) :
   exml::internal::Declaration("xml") {
 	if (_version.size()!=0) {
 		setAttribute("version", _version);
@@ -41,7 +41,7 @@ exml::internal::DeclarationXML::DeclarationXML(const std::string& _version, cons
 	}
 }
 
-bool exml::internal::Declaration::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::Declaration::iGenerate(etk::String& _data, int32_t _indent) const {
 	addIndent(_data, _indent);
 	_data += "<?";
 	_data += m_value;
@@ -50,7 +50,7 @@ bool exml::internal::Declaration::iGenerate(std::string& _data, int32_t _indent)
 	return true;
 }
 
-bool exml::internal::Declaration::iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) {
+bool exml::internal::Declaration::iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) {
 	EXML_VERBOSE("start parse : 'declaration' : '" << m_value << "'");
 	m_pos = _filePos;
 	// search end of the comment :
@@ -86,7 +86,7 @@ bool exml::internal::Declaration::iParse(const std::string& _data, int32_t& _pos
 				return false;
 			}
 			iii = _pos;
-			m_listAttribute.push_back(attribute);
+			m_listAttribute.pushBack(attribute);
 			continue;
 		}
 	}
diff --git a/exml/internal/Declaration.hpp b/exml/internal/Declaration.hpp
index 5d95168..0bbabd6 100644
--- a/exml/internal/Declaration.hpp
+++ b/exml/internal/Declaration.hpp
@@ -18,7 +18,7 @@ namespace exml {
 				 * @brief Constructor
 				 * @param[in] _name name of the declaration (xml, xml:xxxx ...)
 				 */
-				Declaration(const std::string& _name="") :
+				Declaration(const etk::String& _name="") :
 				  exml::internal::AttributeList(_name) {
 					
 				};
@@ -28,13 +28,13 @@ namespace exml {
 				 * @param[in] _name name of the declaration (xml, xml:xxxx ...)
 				 * @return a structure declaration
 				 */
-				static ememory::SharedPtr<Declaration> create(const std::string& _name="");
+				static ememory::SharedPtr<Declaration> create(const etk::String& _name="");
 			public:
 				enum nodeType getType() const override{
 					return nodeType::declaration;
 				};
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
-				bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
+				bool iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
 				ememory::SharedPtr<exml::internal::Declaration> toDeclaration() override {
 					return ememory::staticPointerCast<exml::internal::Declaration>(sharedFromThis());
 				};
@@ -53,7 +53,7 @@ namespace exml {
 				 * @param[in] _format charset of the XML
 				 * @param[in] _standalone this document is standalone
 				 */
-				DeclarationXML(const std::string& _version, const std::string& _format = "UTF-8", bool _standalone = true);
+				DeclarationXML(const etk::String& _version, const etk::String& _format = "UTF-8", bool _standalone = true);
 			public:
 				/**
 				 * @brief Factory to create XML declaration
@@ -62,7 +62,7 @@ namespace exml {
 				 * @param[in] _standalone this document is standalone
 				 * @return a structure declaration
 				 */
-				static ememory::SharedPtr<DeclarationXML> create(const std::string& _version, const std::string& _format = "UTF-8", bool _standalone = true);
+				static ememory::SharedPtr<DeclarationXML> create(const etk::String& _version, const etk::String& _format = "UTF-8", bool _standalone = true);
 		};
 	}
 }
diff --git a/exml/internal/Document.cpp b/exml/internal/Document.cpp
index 437b57f..93b0665 100644
--- a/exml/internal/Document.cpp
+++ b/exml/internal/Document.cpp
@@ -22,7 +22,7 @@ exml::internal::Document::Document() :
 }
 
 
-bool exml::internal::Document::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::Document::iGenerate(etk::String& _data, int32_t _indent) const {
 	for (size_t iii=0; iii<m_listSub.size(); iii++) {
 		if (m_listSub[iii] != nullptr) {
 			m_listSub[iii]->iGenerate(_data, _indent);
@@ -31,7 +31,7 @@ bool exml::internal::Document::iGenerate(std::string& _data, int32_t _indent) co
 	return true;
 }
 
-bool exml::internal::Document::parse(const std::string& _data) {
+bool exml::internal::Document::parse(const etk::String& _data) {
 	EXML_VERBOSE("Start parsing document (type: string) size=" << _data.size());
 	clear();
 	// came from char  == > force in utf8 ...
@@ -41,12 +41,12 @@ bool exml::internal::Document::parse(const std::string& _data) {
 	return subParse(_data, parsePos, m_caseSensitive, filePos, *this, true);
 }
 
-bool exml::internal::Document::generate(std::string& _data) {
+bool exml::internal::Document::generate(etk::String& _data) {
 	_data = "";
 	return iGenerate(_data,0);
 }
 
-bool exml::internal::Document::load(const std::string& _file) {
+bool exml::internal::Document::load(const etk::String& _file) {
 	// Start loading the XML : 
 	EXML_VERBOSE("open file (xml) \"" << _file << "\"");
 	clear();
@@ -65,7 +65,7 @@ bool exml::internal::Document::load(const std::string& _file) {
 		return false;
 	}
 	// allocate data
-	std::vector<char> fileBuffer;
+	etk::Vector<char> fileBuffer;
 	fileBuffer.resize(fileSize+5, 0);
 	// load data from the file :
 	tmpFile.fileRead(&fileBuffer[0], 1, fileSize);
@@ -73,15 +73,15 @@ bool exml::internal::Document::load(const std::string& _file) {
 	tmpFile.fileClose();
 	
 	// convert in UTF8 :
-	std::string tmpDataUnicode(&fileBuffer[0]);
+	etk::String tmpDataUnicode(&fileBuffer[0]);
 	// parse the data :
 	bool ret = parse(tmpDataUnicode);
 	//Display();
 	return ret;
 }
 
-bool exml::internal::Document::store(const std::string& _file) {
-	std::string createData;
+bool exml::internal::Document::store(const etk::String& _file) {
+	etk::String createData;
 	if (generate(createData) == false) {
 		EXML_ERROR("Error while creating the XML : " << _file);
 		return false;
@@ -101,13 +101,13 @@ bool exml::internal::Document::store(const std::string& _file) {
 }
 
 void exml::internal::Document::display() {
-	std::string tmpp;
+	etk::String tmpp;
 	iGenerate(tmpp, 0);
 	EXML_INFO("Generated XML : \n" << tmpp);
 }
 
-std::string createPosPointer(const std::string& _line, int32_t _pos) {
-	std::string out;
+etk::String createPosPointer(const etk::String& _line, int32_t _pos) {
+	etk::String out;
 	size_t iii;
 	for (iii=0; (int64_t)iii<_pos && iii<_line.size(); iii++) {
 		if (_line[iii] == '\t') {
@@ -144,7 +144,7 @@ void exml::internal::Document::displayError() {
 	#endif
 }
 
-void exml::internal::Document::createError(const std::string& _data, int32_t _pos, const exml::FilePos& _filePos, const std::string& _comment) {
+void exml::internal::Document::createError(const etk::String& _data, int32_t _pos, const exml::FilePos& _filePos, const etk::String& _comment) {
 	m_comment = _comment;
 	m_Line = etk::extract_line(_data, _pos);
 	m_filePos = _filePos;
diff --git a/exml/internal/Document.hpp b/exml/internal/Document.hpp
index 750889c..c663f39 100644
--- a/exml/internal/Document.hpp
+++ b/exml/internal/Document.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/internal/Element.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	namespace internal {
@@ -49,36 +49,36 @@ namespace exml {
 				 * @return false : An error occured
 				 * @return true : Parsing is OK
 				 */
-				bool parse(const std::string& _data);
+				bool parse(const etk::String& _data);
 				/**
 				 * @brief generate a string that contain the created XML
 				 * @param[out] _data Data where the xml is stored
 				 * @return false : An error occured
 				 * @return true : Parsing is OK
 				 */
-				bool generate(std::string& _data);
+				bool generate(etk::String& _data);
 				/**
 				 * @brief Load the file that might contain the xml
 				 * @param[in] _file Filename of the xml (compatible with etk FSNode naming)
 				 * @return false : An error occured
 				 * @return true : Parsing is OK
 				 */
-				bool load(const std::string& _file);
+				bool load(const etk::String& _file);
 				/**
 				 * @brief Store the Xml in the file
 				 * @param[in] _file Filename of the xml (compatible with etk FSNode naming)
 				 * @return false : An error occured
 				 * @return true : Parsing is OK
 				 */
-				bool store(const std::string& _file);
+				bool store(const etk::String& _file);
 				/**
 				 * @brief Display the Document on console
 				 */
 				void display();
 			private:
 				bool m_writeErrorWhenDetexted; //!< Request print error in parsing just when detected
-				std::string m_comment; //!< Comment on the error
-				std::string m_Line; //!< Parse line error (copy)
+				etk::String m_comment; //!< Comment on the error
+				etk::String m_Line; //!< Parse line error (copy)
 				exml::FilePos m_filePos; //!< position of the error
 			public:
 				/**
@@ -103,12 +103,12 @@ namespace exml {
 				 * @param[in] _filePos human position of the error
 				 * @param[in] _comment Error string to display
 				 */
-				void createError(const std::string& _data, int32_t _pos, const exml::FilePos& _filePos, const std::string& _comment);
+				void createError(const etk::String& _data, int32_t _pos, const exml::FilePos& _filePos, const etk::String& _comment);
 			public:
 				enum nodeType getType() const override {
 					return nodeType::document;
 				}
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
 				ememory::SharedPtr<exml::internal::Document> toDocument() override {
 					return ememory::staticPointerCast<exml::internal::Document>(sharedFromThis());
 				}
diff --git a/exml/internal/Element.cpp b/exml/internal/Element.cpp
index c020693..cb28ca6 100644
--- a/exml/internal/Element.cpp
+++ b/exml/internal/Element.cpp
@@ -22,7 +22,7 @@ static bool isWhiteChar(char32_t _val) {
 	return false;
 }
 
-ememory::SharedPtr<exml::internal::Element> exml::internal::Element::create(const std::string& _value) {
+ememory::SharedPtr<exml::internal::Element> exml::internal::Element::create(const etk::String& _value) {
 	return ememory::SharedPtr<exml::internal::Element>(new exml::internal::Element(_value));
 }
 
@@ -67,7 +67,7 @@ const ememory::SharedPtr<exml::internal::Element> exml::internal::Element::getEl
 	return tmpp->toElement();
 }
 
-ememory::SharedPtr<exml::internal::Element> exml::internal::Element::getNamed(const std::string& _name) {
+ememory::SharedPtr<exml::internal::Element> exml::internal::Element::getNamed(const etk::String& _name) {
 	if (_name.size() == 0) {
 		return nullptr;
 	}
@@ -84,7 +84,7 @@ ememory::SharedPtr<exml::internal::Element> exml::internal::Element::getNamed(co
 	return nullptr;
 }
 
-const ememory::SharedPtr<exml::internal::Element> exml::internal::Element::getNamed(const std::string& _name) const {
+const ememory::SharedPtr<exml::internal::Element> exml::internal::Element::getNamed(const etk::String& _name) const {
 	if (_name.size() == 0) {
 		return nullptr;
 	}
@@ -116,10 +116,10 @@ void exml::internal::Element::append(const ememory::SharedPtr<exml::internal::No
 			return;
 		}
 	}
-	m_listSub.push_back(_node);
+	m_listSub.pushBack(_node);
 }
 
-void exml::internal::Element::remove(const std::string& _nodeName) {
+void exml::internal::Element::remove(const etk::String& _nodeName) {
 	if (_nodeName == "") {
 		return;
 	}
@@ -135,8 +135,8 @@ void exml::internal::Element::remove(const std::string& _nodeName) {
 	}
 }
 
-std::string exml::internal::Element::getText() const {
-	std::string res;
+etk::String exml::internal::Element::getText() const {
+	etk::String res;
 	if (m_listSub.size() == 1) {
 		if (m_listSub[0]->getType() == nodeType::text) {
 			res = m_listSub[0]->getValue();
@@ -153,7 +153,7 @@ std::string exml::internal::Element::getText() const {
 	return res;
 }
 
-bool exml::internal::Element::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::Element::iGenerate(etk::String& _data, int32_t _indent) const {
 	addIndent(_data, _indent);
 	_data += "<";
 	_data += m_value;
@@ -187,7 +187,7 @@ bool exml::internal::Element::iGenerate(std::string& _data, int32_t _indent) con
 }
 
 
-bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc, bool _mainNode) {
+bool exml::internal::Element::subParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc, bool _mainNode) {
 	EXML_PARSE_ELEMENT(" start subParse ... " << _pos << " " << _filePos);
 	for (size_t iii=_pos; iii<_data.size(); iii++) {
 		_filePos.check(_data[iii]);
@@ -230,7 +230,7 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 					}
 					tmpPos.check(_data[jjj]);
 				}
-				std::string tmpname = std::string(_data, iii+white+2, endPosName+1-(iii+white+2));
+				etk::String tmpname = etk::String(_data, iii+white+2, endPosName+1-(iii+white+2));
 				if (_caseSensitive == true) {
 					tmpname = etk::tolower(tmpname);
 				}
@@ -246,7 +246,7 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 					return false;
 				}
 				iii = _pos;
-				m_listSub.push_back(declaration);
+				m_listSub.pushBack(declaration);
 				continue;
 			}
 			if(_data[iii+white+1] == '!') {
@@ -263,7 +263,7 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 						return false;
 					}
 					if(_data[iii+white+3] != '-') {
-						CREATE_ERROR(_doc, _data, _pos, _filePos, std::string("Element parse with '<!-") + _data[iii+3] + "' chars  == > invalide XML");
+						CREATE_ERROR(_doc, _data, _pos, _filePos, etk::String("Element parse with '<!-") + _data[iii+3] + "' chars  == > invalide XML");
 						return false;
 					}
 					++tmpPos;
@@ -279,7 +279,7 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 						return false;
 					}
 					iii = _pos;
-					m_listSub.push_back(comment);
+					m_listSub.pushBack(comment);
 				} else if (_data[iii+white+2] == '[') {
 					++tmpPos;
 					if (iii+white+8>=_data.size()) {
@@ -292,7 +292,7 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 					    || _data[iii+white+6] != 'T'
 					    || _data[iii+white+7] != 'A'
 					    || _data[iii+white+8] != '[') {
-						CREATE_ERROR(_doc, _data, _pos, _filePos, std::string("Element parse with '<![") + _data[iii+white+3] + _data[iii+white+4] + _data[iii+white+5] + _data[iii+white+6] + _data[iii+white+7] + _data[iii+white+8] + "' chars  == > invalide XML");
+						CREATE_ERROR(_doc, _data, _pos, _filePos, etk::String("Element parse with '<![") + _data[iii+white+3] + _data[iii+white+4] + _data[iii+white+5] + _data[iii+white+6] + _data[iii+white+7] + _data[iii+white+8] + "' chars  == > invalide XML");
 						return false;
 					}
 					tmpPos+=6;
@@ -308,9 +308,9 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 						return false;
 					}
 					iii = _pos;
-					m_listSub.push_back(text);
+					m_listSub.pushBack(text);
 				} else {
-					CREATE_ERROR(_doc, _data, _pos, _filePos, std::string("End file with '<!") + _data[iii+white+2] + "' chars  == > invalide XML");
+					CREATE_ERROR(_doc, _data, _pos, _filePos, etk::String("End file with '<!") + _data[iii+white+2] + "' chars  == > invalide XML");
 					return false;
 				}
 				continue;
@@ -329,7 +329,7 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 					}
 					tmpPos.check(_data[jjj]);
 				}
-				std::string tmpname = std::string(_data, iii+white+2, endPosName+1-(iii+white+2));
+				etk::String tmpname = etk::String(_data, iii+white+2, endPosName+1-(iii+white+2));
 				if (_caseSensitive == true) {
 					tmpname = etk::tolower(tmpname);
 				}
@@ -351,12 +351,12 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 						           && _data[jjj] != ' '
 						           && _data[jjj] != '\t') {
 							_filePos += tmpPos;
-							CREATE_ERROR(_doc, _data, jjj, _filePos, std::string("End node error : have data inside end node other than [ \\n\\t\\r] ") + m_value + "'");
+							CREATE_ERROR(_doc, _data, jjj, _filePos, etk::String("End node error : have data inside end node other than [ \\n\\t\\r] ") + m_value + "'");
 							return false;
 						}
 					}
 				} else {
-					CREATE_ERROR(_doc, _data, _pos, _filePos, std::string("End node error : '") + tmpname + "' != '" + m_value + "'");
+					CREATE_ERROR(_doc, _data, _pos, _filePos, etk::String("End node error : '") + tmpname + "' != '" + m_value + "'");
 					return false;
 				}
 			}
@@ -380,7 +380,7 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 					}
 					tmpPos.check(_data[jjj]);
 				}
-				std::string tmpname = std::string(_data, iii+white+1, endPosName+1-(iii+white+1));
+				etk::String tmpname = etk::String(_data, iii+white+1, endPosName+1-(iii+white+1));
 				if (_caseSensitive == true) {
 					etk::tolower(tmpname);
 				}
@@ -397,12 +397,12 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 					return false;
 				}
 				iii = _pos;
-				m_listSub.push_back(element);
+				m_listSub.pushBack(element);
 				continue;
 			}
 			_filePos+=tmpPos;
 			// here we have an error : 
-			CREATE_ERROR(_doc, _data, _pos, _filePos, std::string("Find an ununderstanding element : '") + _data[iii+white+1] + "'");
+			CREATE_ERROR(_doc, _data, _pos, _filePos, etk::String("Find an ununderstanding element : '") + _data[iii+white+1] + "'");
 			return false;
 		} else {
 			if (_data[iii] == '>') {
@@ -428,18 +428,18 @@ bool exml::internal::Element::subParse(const std::string& _data, int32_t& _pos,
 					return false;
 				}
 				iii = _pos;
-				m_listSub.push_back(text);
+				m_listSub.pushBack(text);
 			}
 		}
 	}
 	if (_mainNode == true) {
 		return true;
 	}
-	CREATE_ERROR(_doc, _data, _pos, _filePos, std::string("Did not find end of the exml::internal::Element : '") + m_value + "'");
+	CREATE_ERROR(_doc, _data, _pos, _filePos, etk::String("Did not find end of the exml::internal::Element : '") + m_value + "'");
 	return false;
 }
 
-bool exml::internal::Element::iParse(const std::string& _data,
+bool exml::internal::Element::iParse(const etk::String& _data,
                                      int32_t& _pos,
                                      bool _caseSensitive,
                                      exml::FilePos& _filePos,
@@ -485,15 +485,15 @@ bool exml::internal::Element::iParse(const std::string& _data,
 				return false;
 			}
 			iii = _pos;
-			m_listAttribute.push_back(attribute);
+			m_listAttribute.pushBack(attribute);
 			continue;
 		}
 		if (isWhiteChar(_data[iii]) == false) {
-			CREATE_ERROR(_doc, _data, iii, _filePos, std::string("Find an unknow element : '") + _data[iii] + "'");
+			CREATE_ERROR(_doc, _data, iii, _filePos, etk::String("Find an unknow element : '") + _data[iii] + "'");
 			return false;
 		}
 	}
-	CREATE_ERROR(_doc, _data, _pos, _filePos, std::string("Unexpecting end of parsing exml::internal::Element : '") + m_value + "'  == > check if the '/>' is set or the end of element");
+	CREATE_ERROR(_doc, _data, _pos, _filePos, etk::String("Unexpecting end of parsing exml::internal::Element : '") + m_value + "'  == > check if the '/>' is set or the end of element");
 	return false;
 }
 
diff --git a/exml/internal/Element.hpp b/exml/internal/Element.hpp
index 61024d7..ef78cd4 100644
--- a/exml/internal/Element.hpp
+++ b/exml/internal/Element.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/internal/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 #include <exml/internal/AttributeList.hpp>
 
 namespace exml {
@@ -24,7 +24,7 @@ namespace exml {
 				 * @brief Constructor
 				 * @param[in] _value Element name;
 				 */
-				Element(const std::string& _value) :
+				Element(const etk::String& _value) :
 				  exml::internal::AttributeList(_value) {
 					
 				};
@@ -34,9 +34,9 @@ namespace exml {
 				 * @param[in] _value Name of the node.
 				 * @return Shared pointer on the Element
 				 */
-				static ememory::SharedPtr<Element> create(const std::string& _value="");
+				static ememory::SharedPtr<Element> create(const etk::String& _value="");
 			protected:
-				std::vector<ememory::SharedPtr<exml::internal::Node>> m_listSub; //!< List of subNodes
+				etk::Vector<ememory::SharedPtr<exml::internal::Node>> m_listSub; //!< List of subNodes
 			public:
 				/**
 				 * @brief get the number of sub element in the node (can be exml::internal::Comment ; exml::internal::Element ; exml::internal::Text :exml::internal::Declaration).
@@ -54,7 +54,7 @@ namespace exml {
 				 * @brief Remove all element with this name
 				 * @param[in] _nodeName Name of nodes to remove.
 				 */
-				void remove(const std::string& _nodeName);
+				void remove(const etk::String& _nodeName);
 				/**
 				 * @brief get the type of the element id.
 				 * @param[in] _id Id of the element.
@@ -90,18 +90,18 @@ namespace exml {
 				 * @param[in] _name Name of the element that is requested
 				 * @return Pointer on the element or NULL.
 				 */
-				ememory::SharedPtr<Element> getNamed(const std::string& _name);
+				ememory::SharedPtr<Element> getNamed(const etk::String& _name);
 				/**
 				 * @brief get an element with his name (work only with exml::internal::Element)
 				 * @param[in] _name Name of the element that is requested
 				 * @return Pointer on the element or NULL.
 				 */
-				const ememory::SharedPtr<Element> getNamed(const std::string& _name) const;
+				const ememory::SharedPtr<Element> getNamed(const etk::String& _name) const;
 				/**
 				 * @brief get the internal data of the element (if the element has some sub node thay are converted in xml string  == > like this it is not needed to use <![CDATA[...]]>
 				 * @return the curent data string. if Only one text node, then we get the parssed data (no &amp; ...) if more than one node, then we transform &,",',<,> in xml normal text...
 				 */
-				std::string getText() const;
+				etk::String getText() const;
 			protected:
 				/**
 				 * @brief Parse sub node string
@@ -114,7 +114,7 @@ namespace exml {
 				 * @return true parsing is done OK
 				 * @return false An error appear in the parsing
 				 */
-				bool subParse(const std::string& _data,
+				bool subParse(const etk::String& _data,
 				              int32_t& _pos,
 				              bool _caseSensitive,
 				              exml::FilePos& _filePos,
@@ -124,8 +124,8 @@ namespace exml {
 				enum nodeType getType() const override {
 					return nodeType::element;
 				}
-				bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
+				bool iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
 				ememory::SharedPtr<exml::internal::Element> toElement() override;
 				const ememory::SharedPtr<exml::internal::Element> toElement() const override;
 				void clear() override;
diff --git a/exml/internal/Node.cpp b/exml/internal/Node.cpp
index 62c44fb..b0f7b1c 100644
--- a/exml/internal/Node.cpp
+++ b/exml/internal/Node.cpp
@@ -23,14 +23,14 @@ static bool isWhiteChar(char32_t _val) {
 	return false;
 }
 
-exml::internal::Node::Node(const std::string& _value) :
+exml::internal::Node::Node(const etk::String& _value) :
     m_pos(0,0),
     m_value(_value) {
 	// nothing to do.
 }
 
 
-void exml::internal::Node::addIndent(std::string& _data, int32_t _indent) const {
+void exml::internal::Node::addIndent(etk::String& _data, int32_t _indent) const {
 	for (int32_t iii=0; iii<_indent; iii++) {
 		_data += "\t";
 	}
@@ -93,7 +93,7 @@ bool exml::internal::Node::checkAvaillable(char32_t _val, bool _firstChar) const
 }
 
 
-int32_t exml::internal::Node::countWhiteChar(const std::string& _data, int32_t _pos, exml::FilePos& _filePos) const {
+int32_t exml::internal::Node::countWhiteChar(const etk::String& _data, int32_t _pos, exml::FilePos& _filePos) const {
 	_filePos.clear();
 	int32_t white=0;
 	for (size_t iii=_pos; iii<_data.size(); iii++) {
@@ -108,7 +108,7 @@ int32_t exml::internal::Node::countWhiteChar(const std::string& _data, int32_t _
 	return white;
 }
 
-bool exml::internal::Node::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::Node::iGenerate(etk::String& _data, int32_t _indent) const {
 	return true;
 }
 
@@ -121,11 +121,11 @@ void exml::internal::Node::clear() {
 	m_pos.clear();
 }
 
-void exml::internal::Node::setValue(std::string _value) {
+void exml::internal::Node::setValue(etk::String _value) {
 	m_value = _value;
 }
 
-const std::string& exml::internal::Node::getValue() const {
+const etk::String& exml::internal::Node::getValue() const {
 	return m_value;
 }
 
diff --git a/exml/internal/Node.hpp b/exml/internal/Node.hpp
index 7ed5211..02a90a8 100644
--- a/exml/internal/Node.hpp
+++ b/exml/internal/Node.hpp
@@ -53,7 +53,7 @@ namespace exml {
 				 * @brief basic element of a xml structure
 				 * @param[in] _value value of the node
 				 */
-				Node(const std::string& _value);
+				Node(const etk::String& _value);
 			public:
 				/**
 				 * @brief Virtualize destructor
@@ -69,14 +69,14 @@ namespace exml {
 				 * @param[in,out] _doc Base document reference
 				 * @return false if an error occured.
 				 */
-				virtual bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) = 0;
+				virtual bool iParse(const etk::String& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) = 0;
 				/**
 				 * @brief generate a string with the tree of the xml
 				 * @param[in,out] _data string where to add the elements
 				 * @param[in] _indent current indentation of the file
 				 * @return false if an error occured.
 				 */
-				virtual bool iGenerate(std::string& _data, int32_t _indent) const;
+				virtual bool iGenerate(etk::String& _data, int32_t _indent) const;
 			protected:
 				exml::FilePos m_pos; //!< position in the readed file  == > not correct when the file is generated
 			public:
@@ -86,18 +86,18 @@ namespace exml {
 				 */
 				const exml::FilePos& getPos() const;
 			protected:
-				std::string m_value; //!< value of the node (for element this is the name, for text it is the inside text ...)
+				etk::String m_value; //!< value of the node (for element this is the name, for text it is the inside text ...)
 			public:
 				/**
 				 * @brief set the value of the node.
 				 * @param[in] _value New value of the node.
 				 */
-				virtual void setValue(std::string _value);
+				virtual void setValue(etk::String _value);
 				/**
 				 * @brief get the current element Value.
 				 * @return the reference of the string value.
 				 */
-				virtual const std::string& getValue() const;
+				virtual const etk::String& getValue() const;
 			public:
 				/**
 				 * @brief get the node type.
@@ -110,7 +110,7 @@ namespace exml {
 				 * @param[in,out] _data String where the indentation is done.
 				 * @param[in] _indent Number of tab to add at the string.
 				 */
-				void addIndent(std::string& _data, int32_t _indent) const;
+				void addIndent(etk::String& _data, int32_t _indent) const;
 				/**
 				 * @brief Display the cuurent element that is curently parse.
 				 * @param[in] _val Char that is parsed.
@@ -132,7 +132,7 @@ namespace exml {
 				 * @param[out] _filePos new poistion of te file to add.
 				 * @return number of white element.
 				 */
-				int32_t countWhiteChar(const std::string& _data, int32_t _pos, exml::FilePos& _filePos) const;
+				int32_t countWhiteChar(const etk::String& _data, int32_t _pos, exml::FilePos& _filePos) const;
 			public:
 				/**
 				 * @brief Cast the element in a Document if it is possible.
diff --git a/exml/internal/Text.cpp b/exml/internal/Text.cpp
index c1011b6..ccf4218 100644
--- a/exml/internal/Text.cpp
+++ b/exml/internal/Text.cpp
@@ -7,7 +7,6 @@
 #include <exml/internal/Text.hpp>
 #include <exml/debug.hpp>
 #include <exml/internal/Document.hpp>
-#include <regex>
 
 // transform the Text with :
 //     "&lt;"   == "<"
@@ -15,35 +14,23 @@
 //     "&amp;"  == "&"
 //     "&apos;" == "'"
 //     "&quot;" == """
-static std::string replaceSpecialChar(const std::string& _inval) {
-	std::string out;
-	static std::regex regexLT("&lt;");
-	static std::regex regexGT("&gt;");
-	static std::regex regexAPOS("&apos;");
-	static std::regex regexQUOT("&quot;");
-	static std::regex regexAMP("&amp;");
-	
-	out = std::regex_replace(_inval, regexLT, std::string("<"));
-	out = std::regex_replace(out, regexGT, std::string(">"));
-	out = std::regex_replace(out, regexAPOS, std::string("'"));
-	out = std::regex_replace(out, regexQUOT, std::string("\""));
-	out = std::regex_replace(out, regexAMP, std::string("&"));
+static etk::String replaceSpecialChar(const etk::String& _inval) {
+	etk::String out = _inval;
+	out.replace("&lt;", "<");
+	out.replace("&gt;", ">");
+	out.replace("&apos;", "'");
+	out.replace("&quot;", "\"");
+	out.replace("&amp;", "&");
 	//EXML_ERROR("INNN '"<< _inval << "' => '" << out << "'");
 	return out;
 }
-static std::string replaceSpecialCharOut(const std::string& _inval) {
-	std::string out;
-	static std::regex regexLT("<");
-	static std::regex regexGT(">;");
-	static std::regex regexAMP("&");
-	static std::regex regexAPOS("'");
-	static std::regex regexQUOT("\"");
-	
-	out = std::regex_replace(_inval, regexAMP, std::string("&amp;"));
-	out = std::regex_replace(out, regexQUOT, std::string("&quot;"));
-	out = std::regex_replace(out, regexAPOS, std::string("&apos;"));
-	out = std::regex_replace(out, regexGT, std::string("&gt;"));
-	out = std::regex_replace(out, regexLT, std::string("&lt;"));
+static etk::String replaceSpecialCharOut(const etk::String& _inval) {
+	etk::String out = _inval;
+	out.replace("<", "&lt;");
+	out.replace(">", "&gt;");
+	out.replace("'", "&apos;");
+	out.replace("\"", "&quot;");
+	out.replace("&", "&amp;");
 	//EXML_ERROR("OUTTT '"<< _inval << "' => '" << out << "'");
 	return out;
 }
@@ -58,11 +45,11 @@ static bool isWhiteChar(char32_t _val) {
 	return false;
 }
 
-ememory::SharedPtr<exml::internal::Text> exml::internal::Text::create(const std::string& _data) {
+ememory::SharedPtr<exml::internal::Text> exml::internal::Text::create(const etk::String& _data) {
 	return ememory::SharedPtr<exml::internal::Text>(new exml::internal::Text(_data));
 }
 
-bool exml::internal::Text::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::Text::iGenerate(etk::String& _data, int32_t _indent) const {
 	_data += replaceSpecialCharOut(m_value);
 	return true;
 }
@@ -77,7 +64,7 @@ int32_t exml::internal::Text::countLines() const {
 	return count;
 }
 
-bool exml::internal::Text::iParse(const std::string& _data,
+bool exml::internal::Text::iParse(const etk::String& _data,
                                   int32_t& _pos,
                                   bool _caseSensitive,
                                   exml::FilePos& _filePos,
@@ -104,7 +91,7 @@ bool exml::internal::Text::iParse(const std::string& _data,
 				}
 			}
 			// find end of value:
-			m_value = std::string(_data, _pos, newEnd-(_pos));
+			m_value = etk::String(_data, _pos, newEnd-(_pos));
 			EXML_VERBOSE(" find text '" << m_value << "'");
 			_pos = iii-1;
 			m_value = replaceSpecialChar(m_value);
@@ -121,12 +108,12 @@ ememory::SharedPtr<exml::internal::TextCDATA> exml::internal::TextCDATA::create(
 	return ememory::SharedPtr<exml::internal::TextCDATA>(new exml::internal::TextCDATA());
 }
 
-bool exml::internal::TextCDATA::iGenerate(std::string& _data, int32_t _indent) const {
+bool exml::internal::TextCDATA::iGenerate(etk::String& _data, int32_t _indent) const {
 	_data += "<![CDATA[" + m_value +"]]>";
 	return true;
 }
 
-bool exml::internal::TextCDATA::iParse(const std::string& _data,
+bool exml::internal::TextCDATA::iParse(const etk::String& _data,
                                        int32_t& _pos,
                                        bool _caseSensitive,
                                        exml::FilePos& _filePos,
@@ -146,7 +133,7 @@ bool exml::internal::TextCDATA::iParse(const std::string& _data,
 		    && _data[iii+2] == '>') {
 			// find end of value:
 			_filePos += 2;
-			m_value = std::string(_data, _pos, iii-(_pos));
+			m_value = etk::String(_data, _pos, iii-(_pos));
 			EXML_VERBOSE(" find text CDATA '" << m_value << "'");
 			_pos = iii+2;
 			return true;
diff --git a/exml/internal/Text.hpp b/exml/internal/Text.hpp
index e821c63..bc80ccc 100644
--- a/exml/internal/Text.hpp
+++ b/exml/internal/Text.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <exml/internal/Node.hpp>
-#include <vector>
+#include <etk/Vector.hpp>
 
 namespace exml {
 	namespace internal {
@@ -23,14 +23,14 @@ namespace exml {
 				 * @brief Constructor
 				 * @param[in] _data String data of the current Text
 				 */
-				Text(const std::string& _data) : exml::internal::Node(_data) { };
+				Text(const etk::String& _data) : exml::internal::Node(_data) { };
 			public:
 				/**
 				 * @brief defined factory
 				 * @param[in] _data Data in the Text area
 				 * @return Shared pointer on the Text element
 				 */
-				static ememory::SharedPtr<exml::internal::Text> create(const std::string& _data="");
+				static ememory::SharedPtr<exml::internal::Text> create(const etk::String& _data="");
 				/**
 				 * @brief count the number of line in the current text
 				 * @return The number of lines
@@ -40,12 +40,12 @@ namespace exml {
 				enum nodeType getType() const override{
 					return nodeType::text;
 				};
-				bool iParse(const std::string& _data,
+				bool iParse(const etk::String& _data,
 				            int32_t& _pos,
 				            bool _caseSensitive,
 				            exml::FilePos& _filePos,
 				            exml::internal::Document& _doc) override;
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
 				ememory::SharedPtr<exml::internal::Text> toText() override {
 					return ememory::staticPointerCast<exml::internal::Text>(sharedFromThis());
 				};
@@ -69,12 +69,12 @@ namespace exml {
 				 */
 				static ememory::SharedPtr<TextCDATA> create();
 			public:
-				bool iParse(const std::string& _data,
+				bool iParse(const etk::String& _data,
 				            int32_t& _pos,
 				            bool _caseSensitive,
 				            exml::FilePos& _filePos,
 				            exml::internal::Document& _doc) override;
-				bool iGenerate(std::string& _data, int32_t _indent) const override;
+				bool iGenerate(etk::String& _data, int32_t _indent) const override;
 		};
 	}
 }
diff --git a/exml/nodeType.cpp b/exml/nodeType.cpp
index f7ddb65..ae93d3f 100644
--- a/exml/nodeType.cpp
+++ b/exml/nodeType.cpp
@@ -9,7 +9,7 @@
 
 
 
-std::ostream& exml::operator <<(std::ostream& _os, enum exml::nodeType _obj) {
+etk::Stream& exml::operator <<(etk::Stream& _os, enum exml::nodeType _obj) {
 	switch (_obj) {
 		case nodeType::unknow:
 			_os << "exml::nodeType::unknow";
diff --git a/exml/nodeType.hpp b/exml/nodeType.hpp
index 377e103..1d62f87 100644
--- a/exml/nodeType.hpp
+++ b/exml/nodeType.hpp
@@ -5,7 +5,7 @@
  */
 #pragma once
 
-#include <ostream>
+#include <etk/Stream.hpp>
 
 /**
  * @brief exml namespace containing all function for XML interpretor
@@ -25,6 +25,6 @@ namespace exml {
 		text, //!< &lt;XXX&gt; InsideText &lt;/XXX&gt;
 	};
 	//! @not_in_doc
-	std::ostream& operator <<(std::ostream& _os, enum nodeType _obj);
+	etk::Stream& operator <<(etk::Stream& _os, enum nodeType _obj);
 }
 
diff --git a/sample/main.cpp b/sample/main.cpp
index da3857e..a256f8f 100644
--- a/sample/main.cpp
+++ b/sample/main.cpp
@@ -13,7 +13,7 @@ int main(int argc, const char *argv[]) {
 	// the only one init for etk:
 	etk::init(argc, argv);
 	for (int32_t iii=0; iii<argc ; ++iii) {
-		std::string data = argv[iii];
+		etk::String data = argv[iii];
 		if (    data == "-h"
 		     || data == "--help") {
 			TEST_PRINT("Help : ");
diff --git a/sample/read.cpp b/sample/read.cpp
index d03d79c..97662ae 100644
--- a/sample/read.cpp
+++ b/sample/read.cpp
@@ -28,7 +28,7 @@ static void readFromString1() {
 	exml::Document doc;
 	TEST_INFO("parse");
 	//! [exml_sample_read_stream1]
-	std::string stream = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"true\"?>"
+	etk::String stream = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"true\"?>"
 	                     "<!-- my comment -->"
 	                     "<exml attributeExample=\"my data attribute\">coucou</exml>";
 	bool retParse = doc.parse(stream);
@@ -42,7 +42,7 @@ static void readFromString2() {
 	exml::Document doc;
 	TEST_INFO("parse");
 	//! [exml_sample_read_stream2]
-	std::string stream = "<?xml version='1.0' encoding='UTF-8' standalone='true'?>"
+	etk::String stream = "<?xml version='1.0' encoding='UTF-8' standalone='true'?>"
 	                     "<!-- my comment -->"
 	                     "<exml attributeExample='my data attribute'>coucou</exml>";
 	bool retParse = doc.parse(stream);
@@ -90,7 +90,7 @@ static void readFull() {
 	TEST_INFO("		list of attribute:");
 	//! [exml_sample_read_folow_attributes]
 	for (const auto itElem: element.attributes) {
-		std::string value = itElem.getValue();
+		etk::String value = itElem.getValue();
 		TEST_INFO("			'" << value << "'");
 	}
 	TEST_INFO("		list of attribute in C:");
@@ -98,12 +98,12 @@ static void readFull() {
 	//! [exml_sample_read_folow_attributes_c]
 	for (size_t iii=0; iii<element.attributes.size(); ++iii) {
 		const exml::Attribute attr = element.attributes[iii];
-		std::string value = attr.getValue();
+		etk::String value = attr.getValue();
 		TEST_INFO("			'" << value << "'");
 	}
 	//! [exml_sample_read_folow_attributes_c]
 	//! [exml_sample_read_get_direct_attribute]
-	std::string attributeValue = element.attributes["attributeExample"];
+	etk::String attributeValue = element.attributes["attributeExample"];
 	TEST_INFO("		direct get: '" << attributeValue << "'");
 	//! [exml_sample_read_get_direct_attribute]
 	TEST_INFO("		list of sub-node:");
@@ -111,7 +111,7 @@ static void readFull() {
 	for (const auto itElem: element.nodes) {
 		if (itElem.isElement() == true) {
 			// get the <XXXX ... name
-			std::string value = itElem.toElement().getValue();
+			etk::String value = itElem.toElement().getValue();
 			TEST_INFO("			'" << value << "'");
 		} else {
 			// simple debug for other type:
@@ -125,7 +125,7 @@ static void readFull() {
 		const exml::Node node = element.nodes[iii];
 		if (node.isElement() == true) {
 			// get the <XXXX ... name
-			std::string value = node.toElement().getValue();
+			etk::String value = node.toElement().getValue();
 			TEST_INFO("			'" << value << "'");
 		} else {
 			// simple debug for other type:
@@ -134,7 +134,7 @@ static void readFull() {
 	}
 	//! [exml_sample_read_folow_nodes_c]
 	//! [exml_sample_read_get_all_under_string]
-	std::string internalData = element.getText();
+	etk::String internalData = element.getText();
 	//! [exml_sample_read_get_all_under_string]
 	
 }
diff --git a/sample/write.cpp b/sample/write.cpp
index 8bcda43..0ca54db 100644
--- a/sample/write.cpp
+++ b/sample/write.cpp
@@ -33,7 +33,7 @@ static void writeToString() {
 	doc.nodes.add(exml::Comment("basic comment"));
 	TEST_INFO("generate");
 	//! [exml_sample_write_stream]
-	std::string streamOut;
+	etk::String streamOut;
 	bool retGenerate = doc.generate(streamOut);
 	//! [exml_sample_write_stream]
 	TEST_INFO("parse ret = " << retGenerate);
diff --git a/test/exmlTestCommon.cpp b/test/exmlTestCommon.cpp
index 3c0b639..f6c4f62 100644
--- a/test/exmlTestCommon.cpp
+++ b/test/exmlTestCommon.cpp
@@ -10,8 +10,8 @@
 #include <gtest/gtest.h>
 
 // _errorPos : -1 : no error , 1 : parsing error, 2 generation error, 3 comparaison error ????
-void exmlLocalTest(const std::string& _ref,
-                   const std::string& _input,
+void exmlLocalTest(const etk::String& _ref,
+                   const etk::String& _input,
                    int32_t _errorPos,
                    bool _caseInSensitive=false) {
 	exml::Document doc;
@@ -24,7 +24,7 @@ void exmlLocalTest(const std::string& _ref,
 	} else {
 		EXPECT_EQ(retParse, true);
 	}
-	std::string out("");
+	etk::String out("");
 	bool retGenerate = doc.generate(out);
 	if (_errorPos == 2) {
 		EXPECT_EQ(retGenerate, false);
diff --git a/test/exmlTestCommon.hpp b/test/exmlTestCommon.hpp
index 3ed54af..95124ea 100644
--- a/test/exmlTestCommon.hpp
+++ b/test/exmlTestCommon.hpp
@@ -8,8 +8,8 @@
 #include <etk/types.hpp>
 
 // _errorPos : -1 : no error , 1 : parsing error, 2 generation error, 3 comparaison error ????
-void exmlLocalTest(const std::string& _ref,
-                   const std::string& _input,
+void exmlLocalTest(const etk::String& _ref,
+                   const etk::String& _input,
                    int32_t _errorPos,
                    bool _caseInSensitive=false);
 
diff --git a/test/exmlTestParseElement.cpp b/test/exmlTestParseElement.cpp
index 033a372..00607bf 100644
--- a/test/exmlTestParseElement.cpp
+++ b/test/exmlTestParseElement.cpp
@@ -8,7 +8,7 @@
 #include <gtest/gtest.h>
 
 
-static std::string refOutputElement("<exemple/>\n");
+static etk::String refOutputElement("<exemple/>\n");
 
 TEST(TestParseElement, testBase) {
 	exmlLocalTest(refOutputElement, "<exemple/>\n", -1);
diff --git a/test/main.cpp b/test/main.cpp
index 829959f..01af8b2 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -15,7 +15,7 @@ int main(int argc, const char *argv[]) {
 	// the only one init for etk:
 	etk::init(argc, argv);
 	for (int32_t iii=0; iii<argc ; ++iii) {
-		std::string data = argv[iii];
+		etk::String data = argv[iii];
 		if (    data == "-h"
 		     || data == "--help") {
 			TEST_PRINT("Help : ");