atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] remove STL

Browse Source
This commit is contained in:
Edouard DUPIN 2017-09-07 23:38:26 +02:00
parent 5d31353f69
commit 4aada212ac
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ewol/context/Context.cpp
View File

@ -12,7 +12,7 @@
#include <etk/tool.hpp> #include <etk/tool.hpp>
#include <etk/os/FSNode.hpp> #include <etk/os/FSNode.hpp>
#include <ethread/tools.hpp> #include <ethread/tools.hpp>
#include <mutex> #include <ethread/Mutex.hpp>
#include <ewol/ewol.hpp> #include <ewol/ewol.hpp>
#include <ewol/debug.hpp> #include <ewol/debug.hpp>

2
ewol/object/Object.hpp
View File

@ -8,7 +8,7 @@
#include <etk/types.hpp> #include <etk/types.hpp>
#include <etk/Vector.hpp> #include <etk/Vector.hpp>
#include <exml/exml.hpp> #include <exml/exml.hpp>
#include <mutex> #include <ethread/Mutex.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include <unordered_map> #include <unordered_map>

2
ewol/resource/Image.cpp
View File

@ -10,7 +10,7 @@
#include <gale/resource/Manager.hpp> #include <gale/resource/Manager.hpp>
#include <ewol/resource/Image.hpp> #include <ewol/resource/Image.hpp>
#include <ewol/resource/Texture.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::sizeAuto(-1,-1);
const ivec2 ewol::resource::TextureFile::sizeDefault(0,0); const ivec2 ewol::resource::TextureFile::sizeDefault(0,0);

2
ewol/widget/Manager.cpp
View File

@ -143,7 +143,7 @@ ewol::WidgetShared ewol::widget::Manager::focusGet() {
return m_focusWidgetCurrent.lock(); 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; m_funcRedrawNeeded = _func;
} }

8
ewol/widget/Manager.hpp
View File

@ -47,8 +47,8 @@ namespace ewol {
// -- Factory area // -- Factory area
// --------------------------------------------- // ---------------------------------------------
public: public:
using widgetCreatorFunction = std::function<ewol::WidgetShared()>; //!< funtion factory basic definition using widgetCreatorFunction = etk::Function<ewol::WidgetShared()>; //!< funtion factory basic definition
using widgetCreatorFunctionXml = std::function<ewol::WidgetShared(const exml::Element& _node)>; //!< funtion factory basic definition using widgetCreatorFunctionXml = etk::Function<ewol::WidgetShared(const exml::Element& _node)>; //!< funtion factory basic definition
private: private:
std::unordered_map<etk::String, widgetCreatorFunction> m_creatorList; //!< List of factory of a widget 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 std::unordered_map<etk::String, widgetCreatorFunctionXml> m_creatorListXml; //!< List of factory of a widget
@ -91,7 +91,7 @@ namespace ewol {
private: private:
bool m_haveRedraw; //!< something request a redraw bool m_haveRedraw; //!< something request a redraw
private: private:
std::function<void()> m_funcRedrawNeeded; etk::Function<void()> m_funcRedrawNeeded;
public: public:
/** /**
* @brief Mark the display to redraw * @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) * @brief Set a callback when we need redraw the display (need by MacOs)
* @param[in] _func function to call * @param[in] _func function to call
*/ */
void setCallbackonRedrawNeeded(const std::function<void()>& _func); void setCallbackonRedrawNeeded(const etk::Function<void()>& _func);
}; };
}; };

2
lutin_ewol-test.py
View File

@ -31,7 +31,7 @@ def configure(target, my_module):
]) ])
my_module.add_depend([ my_module.add_depend([
'ewol', 'ewol',
'gtest', 'etest',
'test-debug' 'test-debug'
]) ])
return True return True

2
test/main.cpp
View File

@ -17,7 +17,7 @@
#include <etk/String.hpp> #include <etk/String.hpp>
#define NAME "Empty" #define NAME "Empty"
#include <gtest/gtest.h> #include <etest/etest.hpp>
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
// init Google test : // init Google test :

2
test/testApplication.cpp
View File

@ -6,7 +6,7 @@
#include <test-debug/debug.hpp> #include <test-debug/debug.hpp>
#include <ewol/context/Context.hpp> #include <ewol/context/Context.hpp>
#include <gtest/gtest.h> #include <etest/etest.hpp>
#define NAME "Application" #define NAME "Application"
TEST(TestEwolApplication, Creation) { TEST(TestEwolApplication, Creation) {

2
test/testWindows.cpp
View File

@ -6,7 +6,7 @@
#include <test-debug/debug.hpp> #include <test-debug/debug.hpp>
#include <ewol/widget/Windows.hpp> #include <ewol/widget/Windows.hpp>
#include <gtest/gtest.h> #include <etest/etest.hpp>
#define NAME "Windows" #define NAME "Windows"
namespace appl { namespace appl {