[DEV] remove STL
This commit is contained in:
parent
5d31353f69
commit
4aada212ac
@ -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>
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
|
||||
};
|
||||
};
|
||||
|
@ -31,7 +31,7 @@ def configure(target, my_module):
|
||||
])
|
||||
my_module.add_depend([
|
||||
'ewol',
|
||||
'gtest',
|
||||
'etest',
|
||||
'test-debug'
|
||||
])
|
||||
return True
|
||||
|
@ -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 :
|
||||
|
@ -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) {
|
||||
|
@ -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 {
|
||||
|
Loading…
x
Reference in New Issue
Block a user