From 0f84790c851ed772fbc10ad4c8831d2bf9955c42 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Thu, 14 Sep 2017 00:59:21 +0200
Subject: [PATCH] [DEV] continue removing STL

---
 eproperty/List.hpp          | 3 +--
 eproperty/Property.hpp      | 4 ++--
 eproperty/PropertyType.hpp  | 2 +-
 eproperty/Range.hpp         | 1 -
 eproperty/details/Range.hxx | 2 +-
 eproperty/details/Value.hxx | 2 +-
 test/main.cpp               | 3 +--
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/eproperty/List.hpp b/eproperty/List.hpp
index 365dc86..04d82e8 100644
--- a/eproperty/List.hpp
+++ b/eproperty/List.hpp
@@ -9,7 +9,6 @@
 
 #include <eproperty/PropertyType.hpp>
 #include <etk/Map.hpp>
-#include <typeinfo>
 
 namespace eproperty {
 	/**
@@ -60,7 +59,7 @@ namespace eproperty {
 					it->second = _value;
 					return;
 				}
-				m_list.insert(etk::makePair(_name, _value));
+				m_list.add(_name, _value);
 			}
 			/**
 			 * @brief Remove a value of the element availlable
diff --git a/eproperty/Property.hpp b/eproperty/Property.hpp
index 2f8bc5b..156adee 100644
--- a/eproperty/Property.hpp
+++ b/eproperty/Property.hpp
@@ -9,8 +9,8 @@
 
 #include <eproperty/Interface.hpp>
 #include <etk/String.hpp>
-#include <typeinfo>
-#include <functional>
+#include <etk/typeTrait.hpp>
+#include <etk/Function.hpp>
 
 /**
  * @brief eproperty global interface for all property implementation
diff --git a/eproperty/PropertyType.hpp b/eproperty/PropertyType.hpp
index f990010..4462b20 100644
--- a/eproperty/PropertyType.hpp
+++ b/eproperty/PropertyType.hpp
@@ -58,7 +58,7 @@ namespace eproperty {
 				return "eproperty::Value";
 			}
 			etk::String getType() const override {
-				return typeid(TYPE).name();
+				return "?TODO?";// TODO: typeid(TYPE).name();
 			}
 			etk::String getString() const override {
 				return getValueSpecific(m_value);
diff --git a/eproperty/Range.hpp b/eproperty/Range.hpp
index cb899df..97145f1 100644
--- a/eproperty/Range.hpp
+++ b/eproperty/Range.hpp
@@ -9,7 +9,6 @@
 
 #include <eproperty/Interface.hpp>
 #include <eproperty/Value.hpp>
-#include <typeinfo>
 
 namespace eproperty {
 	/**
diff --git a/eproperty/details/Range.hxx b/eproperty/details/Range.hxx
index 66d829b..38dd73d 100644
--- a/eproperty/details/Range.hxx
+++ b/eproperty/details/Range.hxx
@@ -30,7 +30,7 @@ etk::String eproperty::Range<TYPE>::getPropertyType() const {
 template<class TYPE>
 void eproperty::Range<TYPE>::setString(const etk::String& _newVal) {
 	TYPE val;
-	// when you want to set an element in parameter you will implement the function template std::from_string
+	// when you want to set an element in parameter you will implement the function template etk::from_string
 	etk::from_string(val, _newVal);
 	set(val);
 }
diff --git a/eproperty/details/Value.hxx b/eproperty/details/Value.hxx
index 7356152..c740610 100644
--- a/eproperty/details/Value.hxx
+++ b/eproperty/details/Value.hxx
@@ -23,7 +23,7 @@ etk::String eproperty::Value<TYPE>::getValueSpecific(const TYPE& _valueRequested
 
 template<class TYPE>
 void eproperty::Value<TYPE>::setString(const etk::String& _newVal) {
-	// when you want to set an element in parameter you will implement the function template std::from_string
+	// when you want to set an element in parameter you will implement the function template etk::from_string
 	etk::from_string(eproperty::PropertyType<TYPE>::m_value, _newVal);
 	// TODO : Do it better ...
 	eproperty::PropertyType<TYPE>::notifyChange();
diff --git a/test/main.cpp b/test/main.cpp
index 2adbb87..74c98fe 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -13,8 +13,7 @@
 #include <etest/etest.hpp>
 
 int main(int _argc, const char *_argv[]) {
-	::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));
-	etk::init(_argc, _argv);
+	etest::init(_argc, _argv);
 	for (int32_t iii=0; iii<_argc ; ++iii) {
 		etk::String data = _argv[iii];
 		if (    data == "-h"