From 4aada212ac0bc99dc5bae8d2e78072a059e3193f Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Thu, 7 Sep 2017 23:38:26 +0200
Subject: [PATCH] [DEV] remove STL

---
 ewol/context/Context.cpp | 2 +-
 ewol/object/Object.hpp   | 2 +-
 ewol/resource/Image.cpp  | 2 +-
 ewol/widget/Manager.cpp  | 2 +-
 ewol/widget/Manager.hpp  | 8 ++++----
 lutin_ewol-test.py       | 2 +-
 test/main.cpp            | 2 +-
 test/testApplication.cpp | 2 +-
 test/testWindows.cpp     | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ewol/context/Context.cpp b/ewol/context/Context.cpp
index b9c62de8..d2c4a410 100644
--- a/ewol/context/Context.cpp
+++ b/ewol/context/Context.cpp
@@ -12,7 +12,7 @@
 #include <etk/tool.hpp>
 #include <etk/os/FSNode.hpp>
 #include <ethread/tools.hpp>
-#include <mutex>
+#include <ethread/Mutex.hpp>
 
 #include <ewol/ewol.hpp>
 #include <ewol/debug.hpp>
diff --git a/ewol/object/Object.hpp b/ewol/object/Object.hpp
index 68bf8bb2..6c741c11 100644
--- a/ewol/object/Object.hpp
+++ b/ewol/object/Object.hpp
@@ -8,7 +8,7 @@
 #include <etk/types.hpp>
 #include <etk/Vector.hpp>
 #include <exml/exml.hpp>
-#include <mutex>
+#include <ethread/Mutex.hpp>
 #include <ememory/memory.hpp>
 #include <unordered_map>
 
diff --git a/ewol/resource/Image.cpp b/ewol/resource/Image.cpp
index 2316e0bb..405ccc7f 100644
--- a/ewol/resource/Image.cpp
+++ b/ewol/resource/Image.cpp
@@ -10,7 +10,7 @@
 #include <gale/resource/Manager.hpp>
 #include <ewol/resource/Image.hpp>
 #include <ewol/resource/Texture.hpp>
-#include <thread>
+#include <ethread/Thread.hpp>
 
 const ivec2 ewol::resource::TextureFile::sizeAuto(-1,-1);
 const ivec2 ewol::resource::TextureFile::sizeDefault(0,0);
diff --git a/ewol/widget/Manager.cpp b/ewol/widget/Manager.cpp
index ec7f996f..6b9a5cfa 100644
--- a/ewol/widget/Manager.cpp
+++ b/ewol/widget/Manager.cpp
@@ -143,7 +143,7 @@ ewol::WidgetShared ewol::widget::Manager::focusGet() {
 	return m_focusWidgetCurrent.lock();
 }
 
-void ewol::widget::Manager::setCallbackonRedrawNeeded(const std::function<void()>& _func) {
+void ewol::widget::Manager::setCallbackonRedrawNeeded(const etk::Function<void()>& _func) {
 	m_funcRedrawNeeded = _func;
 }
 
diff --git a/ewol/widget/Manager.hpp b/ewol/widget/Manager.hpp
index 03351a46..b2ab7255 100644
--- a/ewol/widget/Manager.hpp
+++ b/ewol/widget/Manager.hpp
@@ -47,8 +47,8 @@ namespace ewol {
 			// --  Factory area
 			// ---------------------------------------------
 			public:
-				using widgetCreatorFunction = std::function<ewol::WidgetShared()>; //!< funtion factory basic definition
-				using widgetCreatorFunctionXml = std::function<ewol::WidgetShared(const exml::Element& _node)>; //!< funtion factory basic definition
+				using widgetCreatorFunction = etk::Function<ewol::WidgetShared()>; //!< funtion factory basic definition
+				using widgetCreatorFunctionXml = etk::Function<ewol::WidgetShared(const exml::Element& _node)>; //!< funtion factory basic definition
 			private:
 				std::unordered_map<etk::String, widgetCreatorFunction> m_creatorList; //!< List of factory of a widget
 				std::unordered_map<etk::String, widgetCreatorFunctionXml> m_creatorListXml; //!< List of factory of a widget
@@ -91,7 +91,7 @@ namespace ewol {
 			private:
 				bool m_haveRedraw; //!< something request a redraw
 			private:
-				std::function<void()> m_funcRedrawNeeded;
+				etk::Function<void()> m_funcRedrawNeeded;
 			public:
 				/**
 				 * @brief Mark the display to redraw
@@ -108,7 +108,7 @@ namespace ewol {
 				 * @brief Set a callback when we need redraw the display (need by MacOs)
 				 * @param[in] _func function to call
 				 */
-				void setCallbackonRedrawNeeded(const std::function<void()>& _func);
+				void setCallbackonRedrawNeeded(const etk::Function<void()>& _func);
 			
 		};
 	};
diff --git a/lutin_ewol-test.py b/lutin_ewol-test.py
index 57425bed..f14d7603 100644
--- a/lutin_ewol-test.py
+++ b/lutin_ewol-test.py
@@ -31,7 +31,7 @@ def configure(target, my_module):
 	    ])
 	my_module.add_depend([
 	    'ewol',
-	    'gtest',
+	    'etest',
 	    'test-debug'
 	    ])
 	return True
diff --git a/test/main.cpp b/test/main.cpp
index a1b705e6..3c1d681e 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -17,7 +17,7 @@
 #include <etk/String.hpp>
 
 #define NAME "Empty"
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 
 int main(int argc, const char *argv[]) {
 	// init Google test :
diff --git a/test/testApplication.cpp b/test/testApplication.cpp
index 7a7dac1b..8ff268bf 100644
--- a/test/testApplication.cpp
+++ b/test/testApplication.cpp
@@ -6,7 +6,7 @@
 
 #include <test-debug/debug.hpp>
 #include <ewol/context/Context.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 #define NAME "Application"
 
 TEST(TestEwolApplication, Creation) {
diff --git a/test/testWindows.cpp b/test/testWindows.cpp
index 04075fef..8d49ab50 100644
--- a/test/testWindows.cpp
+++ b/test/testWindows.cpp
@@ -6,7 +6,7 @@
 
 #include <test-debug/debug.hpp>
 #include <ewol/widget/Windows.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 #define NAME "Windows"
 
 namespace appl {