diff --git a/build b/build index 1a424abd..47c17627 160000 --- a/build +++ b/build @@ -1 +1 @@ -Subproject commit 1a424abd21d9262b1cfc911fcc830d003bf6078b +Subproject commit 47c1762724759b107ea98eb6cf86c10c65d7ae79 diff --git a/external/agg b/external/agg index ee8d4844..5f266836 160000 --- a/external/agg +++ b/external/agg @@ -1 +1 @@ -Subproject commit ee8d48447080a6594f490f77390fae9ece5c606c +Subproject commit 5f26683625412f2ec0aad32adf6a85abb8312684 diff --git a/external/egami b/external/egami index 59738fd5..1ab4e02e 160000 --- a/external/egami +++ b/external/egami @@ -1 +1 @@ -Subproject commit 59738fd521534c9f71146513905b42ad56407fed +Subproject commit 1ab4e02e492599ec77c3452cfe6a2e97188a40c8 diff --git a/external/ege b/external/ege index a52c92e9..1d10f953 160000 --- a/external/ege +++ b/external/ege @@ -1 +1 @@ -Subproject commit a52c92e96fec84f7b2681e59ba13676c331ad7b1 +Subproject commit 1d10f953326d14ff134be6c37a447d0f8a2e0c83 diff --git a/external/ejson b/external/ejson index a94a1c6e..43ddd254 160000 --- a/external/ejson +++ b/external/ejson @@ -1 +1 @@ -Subproject commit a94a1c6e600fcbbfe706cda6cc7e4e2c939c8f09 +Subproject commit 43ddd2549c0638d3463be37d8f0c651437de7d7b diff --git a/external/esvg b/external/esvg index 7e28d6b2..32b1966f 160000 --- a/external/esvg +++ b/external/esvg @@ -1 +1 @@ -Subproject commit 7e28d6b250292b3773d2aff2ce066ee6298bf19d +Subproject commit 32b1966f8d42e374eaa8f2d5d9cae5d4f5d1db8b diff --git a/external/etk b/external/etk index 51606313..b83c99e3 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 51606313ab962db03eb0642be06e52ef70e6e6d8 +Subproject commit b83c99e37152351adfd259d54281391256b6baf9 diff --git a/external/exml b/external/exml index c9f7abcd..23258089 160000 --- a/external/exml +++ b/external/exml @@ -1 +1 @@ -Subproject commit c9f7abcd96f2decebe4968fe10071c6e861a4d85 +Subproject commit 23258089971f05411b725a24a8806dcd51e86754 diff --git a/sources/ewol/Material.h b/sources/ewol/Material.h index 09e4f4a0..2c16b0a2 100644 --- a/sources/ewol/Material.h +++ b/sources/ewol/Material.h @@ -36,7 +36,7 @@ namespace ewol { float m_shininess; ewol::TextureFile* m_texture0; public: - etk::Vector m_listIndexFaces; + std::vector m_listIndexFaces; public: Material(void); ~Material(void); diff --git a/sources/ewol/commandLine.cpp b/sources/ewol/commandLine.cpp index def38b98..f353d692 100644 --- a/sources/ewol/commandLine.cpp +++ b/sources/ewol/commandLine.cpp @@ -8,12 +8,12 @@ #include #include -#include +#include void ewol::CommandLine::parse(int32_t _argc, const char* _argv[]) { for( int32_t i=1 ; i<_argc; i++) { EWOL_INFO("commandLine : \"" << _argv[i] << "\"" ); - m_listArgs.pushBack(_argv[i]); + m_listArgs.push_back(_argv[i]); } } @@ -32,7 +32,7 @@ const etk::UString& ewol::CommandLine::get(int32_t _id) { } void ewol::CommandLine::add(const etk::UString& _newElement) { - m_listArgs.pushBack(_newElement); + m_listArgs.push_back(_newElement); } void ewol::CommandLine::remove(esize_t _id) { diff --git a/sources/ewol/commandLine.h b/sources/ewol/commandLine.h index afaf2714..2f030f71 100644 --- a/sources/ewol/commandLine.h +++ b/sources/ewol/commandLine.h @@ -15,7 +15,7 @@ namespace ewol { class CommandLine { private: - etk::Vector m_listArgs; //!< list of all argument parsed + std::vector m_listArgs; //!< list of all argument parsed public: /** * @brief Parse the command line parameters diff --git a/sources/ewol/compositing/Area.cpp b/sources/ewol/compositing/Area.cpp index 877730d1..73044c4e 100644 --- a/sources/ewol/compositing/Area.cpp +++ b/sources/ewol/compositing/Area.cpp @@ -92,41 +92,41 @@ void ewol::Area::print(const ivec2& _size) { vec2 tex(0,1); point.setX(m_position.x()); point.setY(m_position.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(1,1); point.setX(m_position.x() + _size.x()); point.setY(m_position.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(1,0); point.setX(m_position.x() + _size.x()); point.setY(m_position.y() + _size.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(0,0); point.setX(m_position.x()); point.setY(m_position.y() + _size.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(0,1); point.setX(m_position.x()); point.setY(m_position.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); } diff --git a/sources/ewol/compositing/Area.h b/sources/ewol/compositing/Area.h index e2401630..1f89e5c2 100644 --- a/sources/ewol/compositing/Area.h +++ b/sources/ewol/compositing/Area.h @@ -29,9 +29,9 @@ namespace ewol int32_t m_GLtexID; //!< openGL id on the element (texture ID) private: ewol::Texture* m_resource; //!< texture resources - etk::Vector m_coord; //!< internal coord of the object - etk::Vector m_coordTex; //!< internal texture coordinate for every point - etk::Vector > m_coordColor; //!< internal color of the different point + std::vector m_coord; //!< internal coord of the object + std::vector m_coordTex; //!< internal texture coordinate for every point + std::vector > m_coordColor; //!< internal color of the different point private: /** * @brief load the openGL program and get all the ID needed diff --git a/sources/ewol/compositing/Drawing.cpp b/sources/ewol/compositing/Drawing.cpp index d925e153..30eed6c6 100644 --- a/sources/ewol/compositing/Drawing.cpp +++ b/sources/ewol/compositing/Drawing.cpp @@ -12,21 +12,21 @@ #if 0 -static void generatePolyGone(etk::Vector & input, etk::Vector & output ) +static void generatePolyGone(std::vector & input, std::vector & output ) { if (input.size()<3) { return; } // TODO : Regenerate a linear poligone generation for (int32_t iii=1; iii " << output.size() ); } -static void SutherlandHodgman(etk::Vector & input, etk::Vector & output, float sx, float sy, float ex, float ey) +static void SutherlandHodgman(std::vector & input, std::vector & output, float sx, float sy, float ex, float ey) { // with Sutherland-Hodgman-Algorithm if (input.size() <0) { @@ -51,7 +51,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.y - (aaa*lastElement.x); destPoint.y = aaa*sx + bbb; destPoint.x = sx; - output.pushBack(destPoint); + output.push_back(destPoint); } else { //EWOL_DEBUG("element OUT == > OUT "); } @@ -59,7 +59,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o } else { if(true == inside) { //EWOL_DEBUG("element IN == > IN "); - output.pushBack(input[iii]); + output.push_back(input[iii]); } else { //EWOL_DEBUG("element OUT == > IN "); //new point intersection ... @@ -68,8 +68,8 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.y - (aaa*lastElement.x); destPoint.y = aaa*sx + bbb; destPoint.x = sx; - output.pushBack(destPoint); - output.pushBack(input[iii]); + output.push_back(destPoint); + output.push_back(input[iii]); } inside = true; } @@ -96,7 +96,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.x - (aaa*lastElement.y); destPoint.y = sy; destPoint.x = sy*aaa + bbb; - output.pushBack(destPoint); + output.push_back(destPoint); } else { //EWOL_DEBUG("element OUT == > OUT "); } @@ -104,7 +104,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o } else { if(true == inside) { //EWOL_DEBUG("element IN == > IN "); - output.pushBack(input[iii]); + output.push_back(input[iii]); } else { //EWOL_DEBUG("element OUT == > IN "); //new point intersection ... @@ -113,8 +113,8 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.x - (aaa*lastElement.y); destPoint.y = sy; destPoint.x = sy*aaa + bbb; - output.pushBack(destPoint); - output.pushBack(input[iii]); + output.push_back(destPoint); + output.push_back(input[iii]); } inside = true; } @@ -141,7 +141,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.y - (aaa*lastElement.x); destPoint.y = aaa*ex + bbb; destPoint.x = ex; - output.pushBack(destPoint); + output.push_back(destPoint); } else { //EWOL_DEBUG("element OUT == > OUT "); } @@ -149,7 +149,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o } else { if(true == inside) { //EWOL_DEBUG("element IN == > IN "); - output.pushBack(input[iii]); + output.push_back(input[iii]); } else { //EWOL_DEBUG("element OUT == > IN "); //new point intersection ... @@ -158,8 +158,8 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.y - (aaa*lastElement.x); destPoint.y = aaa*ex + bbb; destPoint.x = ex; - output.pushBack(destPoint); - output.pushBack(input[iii]); + output.push_back(destPoint); + output.push_back(input[iii]); } inside = true; } @@ -185,7 +185,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.x - (aaa*lastElement.y); destPoint.y = ey; destPoint.x = ey*aaa + bbb; - output.pushBack(destPoint); + output.push_back(destPoint); } else { //EWOL_DEBUG("element OUT == > OUT "); } @@ -193,7 +193,7 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o } else { if(true == inside) { //EWOL_DEBUG("element IN == > IN "); - output.pushBack(input[iii]); + output.push_back(input[iii]); } else { //EWOL_DEBUG("element OUT == > IN "); //new point intersection ... @@ -202,8 +202,8 @@ static void SutherlandHodgman(etk::Vector & input, etk::Vector & o float bbb = lastElement.x - (aaa*lastElement.y); destPoint.y = ey; destPoint.x = ey*aaa + bbb; - output.pushBack(destPoint); - output.pushBack(input[iii]); + output.push_back(destPoint); + output.push_back(input[iii]); } inside = true; } @@ -244,12 +244,12 @@ ewol::Drawing::~Drawing(void) { void ewol::Drawing::generateTriangle(void) { m_triElement = 0; - m_coord.pushBack(m_triangle[0]); - m_coordColor.pushBack(m_tricolor[0]); - m_coord.pushBack(m_triangle[1]); - m_coordColor.pushBack(m_tricolor[1]); - m_coord.pushBack(m_triangle[2]); - m_coordColor.pushBack(m_tricolor[2]); + m_coord.push_back(m_triangle[0]); + m_coordColor.push_back(m_tricolor[0]); + m_coord.push_back(m_triangle[1]); + m_coordColor.push_back(m_tricolor[1]); + m_coord.push_back(m_triangle[2]); + m_coordColor.push_back(m_tricolor[2]); } void ewol::Drawing::internalSetColor(const etk::Color<>& _color) { diff --git a/sources/ewol/compositing/Drawing.h b/sources/ewol/compositing/Drawing.h index 4540d574..49e78517 100644 --- a/sources/ewol/compositing/Drawing.h +++ b/sources/ewol/compositing/Drawing.h @@ -32,8 +32,8 @@ namespace ewol { int32_t m_GLMatrix; //!< openGL id on the element (transformation matrix) int32_t m_GLColor; //!< openGL id on the element (color buffer) private: // Background Color (display only when needed) - etk::Vector m_coord; //!< internal position for the text display - etk::Vector > m_coordColor; //!< internal color of the background + std::vector m_coord; //!< internal position for the text display + std::vector > m_coordColor; //!< internal color of the background public: /** * @brief Basic constructor diff --git a/sources/ewol/compositing/Image.cpp b/sources/ewol/compositing/Image.cpp index 669ac04c..ec102636 100644 --- a/sources/ewol/compositing/Image.cpp +++ b/sources/ewol/compositing/Image.cpp @@ -140,43 +140,43 @@ void ewol::Image::printPart(const vec2& _size, vec3 point = m_position; vec2 tex(_sourcePosStart.x(),_sourcePosStop.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStop.x(),_sourcePosStop.y()); point.setX(m_position.x() + _size.x()); point.setY(m_position.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStop.x(),_sourcePosStart.y()); point.setX(m_position.x() + _size.x()); point.setY(m_position.y() + _size.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStart.x(),_sourcePosStart.y()); point.setX(m_position.x()); point.setY(m_position.y() + _size.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStart.x(),_sourcePosStop.y()); point.setX(m_position.x()); point.setY(m_position.y()); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); return; } vec3 center = m_position + vec3(_size.x(),_size.y(),0)/2.0f; @@ -187,43 +187,43 @@ void ewol::Image::printPart(const vec2& _size, point.setValue(-limitedSize.x(), -limitedSize.y(), 0); point = point.rotate(vec3(0,0,1), m_angle) + center; - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStop.x(),_sourcePosStop.y()); point.setValue(limitedSize.x(), -limitedSize.y(), 0); point = point.rotate(vec3(0,0,1), m_angle) + center; - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStop.x(),_sourcePosStart.y()); point.setValue(limitedSize.x(), limitedSize.y(), 0); point = point.rotate(vec3(0,0,1), m_angle) + center; - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStart.x(),_sourcePosStart.y()); point.setValue(-limitedSize.x(), limitedSize.y(), 0); point = point.rotate(vec3(0,0,1), m_angle) + center; - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); tex.setValue(_sourcePosStart.x(),_sourcePosStop.y()); point.setValue(-limitedSize.x(), -limitedSize.y(), 0); point = point.rotate(vec3(0,0,1), m_angle) + center; - m_coord.pushBack(point); - m_coordTex.pushBack(tex); - m_coordColor.pushBack(m_color); + m_coord.push_back(point); + m_coordTex.push_back(tex); + m_coordColor.push_back(m_color); } void ewol::Image::setSource(const etk::UString& _newFile, const vec2& _size) { diff --git a/sources/ewol/compositing/Image.h b/sources/ewol/compositing/Image.h index 2e047653..4ab3e49b 100644 --- a/sources/ewol/compositing/Image.h +++ b/sources/ewol/compositing/Image.h @@ -32,9 +32,9 @@ namespace ewol { int32_t m_GLtexID; //!< openGL id on the element (texture ID) private: ewol::TextureFile* m_resource; //!< texture resources - etk::Vector m_coord; //!< internal coord of the object - etk::Vector m_coordTex; //!< internal texture coordinate for every point - etk::Vector > m_coordColor; //!< internal color of the different point + std::vector m_coord; //!< internal coord of the object + std::vector m_coordTex; //!< internal texture coordinate for every point + std::vector > m_coordColor; //!< internal color of the different point private: /** * @brief load the openGL program and get all the ID needed diff --git a/sources/ewol/compositing/Text.cpp b/sources/ewol/compositing/Text.cpp index 9cef2b0f..3e62e87b 100644 --- a/sources/ewol/compositing/Text.cpp +++ b/sources/ewol/compositing/Text.cpp @@ -363,7 +363,7 @@ void ewol::Text::setDistanceFieldMode(bool _newMode) { } void ewol::Text::print(const etk::UString& _text) { - etk::Vector decorationEmpty; + std::vector decorationEmpty; print(_text, decorationEmpty); } @@ -498,7 +498,7 @@ void ewol::Text::printHTML(const etk::UString& _text) { htmlFlush(); } -void ewol::Text::print(const etk::UString& _text, const etk::Vector& _decoration) { +void ewol::Text::print(const etk::UString& _text, const std::vector& _decoration) { if (m_font == NULL) { EWOL_ERROR("Font Id is not corectly defined"); return; @@ -816,17 +816,17 @@ void ewol::Text::print(const etk::UChar& _charcode) { * */ // set texture coordonates : - m_coordTex.pushBack(texturePos[0]); - m_coordTex.pushBack(texturePos[1]); - m_coordTex.pushBack(texturePos[2]); + m_coordTex.push_back(texturePos[0]); + m_coordTex.push_back(texturePos[1]); + m_coordTex.push_back(texturePos[2]); // set display positions : - m_coord.pushBack(bitmapDrawPos[0]); - m_coord.pushBack(bitmapDrawPos[1]); - m_coord.pushBack(bitmapDrawPos[2]); + m_coord.push_back(bitmapDrawPos[0]); + m_coord.push_back(bitmapDrawPos[1]); + m_coord.push_back(bitmapDrawPos[2]); // set the color - m_coordColor.pushBack(m_color); - m_coordColor.pushBack(m_color); - m_coordColor.pushBack(m_color); + m_coordColor.push_back(m_color); + m_coordColor.push_back(m_color); + m_coordColor.push_back(m_color); /* Step 2 : * * ** @@ -835,17 +835,17 @@ void ewol::Text::print(const etk::UChar& _charcode) { * ******** */ // set texture coordonates : - m_coordTex.pushBack(texturePos[0]); - m_coordTex.pushBack(texturePos[2]); - m_coordTex.pushBack(texturePos[3]); + m_coordTex.push_back(texturePos[0]); + m_coordTex.push_back(texturePos[2]); + m_coordTex.push_back(texturePos[3]); // set display positions : - m_coord.pushBack(bitmapDrawPos[0]); - m_coord.pushBack(bitmapDrawPos[2]); - m_coord.pushBack(bitmapDrawPos[3]); + m_coord.push_back(bitmapDrawPos[0]); + m_coord.push_back(bitmapDrawPos[2]); + m_coord.push_back(bitmapDrawPos[3]); // set the color - m_coordColor.pushBack(m_color); - m_coordColor.pushBack(m_color); - m_coordColor.pushBack(m_color); + m_coordColor.push_back(m_color); + m_coordColor.push_back(m_color); + m_coordColor.push_back(m_color); } } } @@ -1044,14 +1044,14 @@ void ewol::Text::htmlAddData(const etk::UString& _data) { m_htmlCurrrentLine+=" "; if(m_htmlDecoration.size()>0) { TextDecoration tmp = m_htmlDecoration[m_htmlDecoration.size()-1]; - m_htmlDecoration.pushBack(tmp); + m_htmlDecoration.push_back(tmp); } else { - m_htmlDecoration.pushBack(m_htmlDecoTmp); + m_htmlDecoration.push_back(m_htmlDecoTmp); } } m_htmlCurrrentLine += _data; for(int32_t iii=0; iii<_data.size() ; iii++) { - m_htmlDecoration.pushBack(m_htmlDecoTmp); + m_htmlDecoration.push_back(m_htmlDecoTmp); } } diff --git a/sources/ewol/compositing/Text.h b/sources/ewol/compositing/Text.h index b3f7c2cb..887ae542 100644 --- a/sources/ewol/compositing/Text.h +++ b/sources/ewol/compositing/Text.h @@ -85,9 +85,9 @@ namespace ewol { private: ewol::TexturedFont* m_font; //!< Font resources private: // Text - etk::Vector m_coord; //!< internal coord of the object - etk::Vector m_coordTex; //!< internal texture coordinate for every point - etk::Vector > m_coordColor; //!< internal color of the different point + std::vector m_coord; //!< internal coord of the object + std::vector m_coordTex; //!< internal texture coordinate for every point + std::vector > m_coordColor; //!< internal color of the different point private: /** * @brief load the openGL program and get all the ID needed @@ -301,7 +301,7 @@ namespace ewol { * @param[in] _text The string to display. * @param[in] _decoration The text decoration for the text that might be display (if the vector is smaller, the last parameter is get) */ - void print(const etk::UString& _text, const etk::Vector& _decoration); + void print(const etk::UString& _text, const std::vector& _decoration); /** * @brief display the current char in the current element (note that the kerning is availlable if the position is not changed) * @param[in] _charcode Char that might be dispalyed @@ -379,7 +379,7 @@ namespace ewol { private: // this section is reserved for HTML parsing and display: etk::UString m_htmlCurrrentLine; //!< current line for HTML display - etk::Vector m_htmlDecoration; //!< current decoration for the HTML display + std::vector m_htmlDecoration; //!< current decoration for the HTML display TextDecoration m_htmlDecoTmp; //!< current decoration /** * @brief add a line with the current m_htmlDecoTmp decoration diff --git a/sources/ewol/physicsShape/PhysicsConvexHull.cpp b/sources/ewol/physicsShape/PhysicsConvexHull.cpp index d7cd5e37..78fb5e47 100644 --- a/sources/ewol/physicsShape/PhysicsConvexHull.cpp +++ b/sources/ewol/physicsShape/PhysicsConvexHull.cpp @@ -22,12 +22,12 @@ bool ewol::PhysicsConvexHull::parse(const char* _line) { while (tmp != NULL) { *tmp = '\0'; sscanf(base, "%f %f %f", &pos.m_floats[0], &pos.m_floats[1], &pos.m_floats[2] ); - m_points.pushBack(pos); + m_points.push_back(pos); base = tmp+1; tmp= strchr(base, '|'); } sscanf(base, "%f %f %f", &pos.m_floats[0], &pos.m_floats[1], &pos.m_floats[2] ); - m_points.pushBack(pos); + m_points.push_back(pos); /* for (int32_t iii=0; iii m_points; + std::vector m_points; public: - const etk::Vector& getPointList(void) const { + const std::vector& getPointList(void) const { return m_points; }; public: diff --git a/sources/ewol/renderer/Android/Context.cpp b/sources/ewol/renderer/Android/Context.cpp index 1bf230ec..483ce529 100644 --- a/sources/ewol/renderer/Android/Context.cpp +++ b/sources/ewol/renderer/Android/Context.cpp @@ -395,7 +395,7 @@ class AndroidContext : public ewol::eContext { } }; -static etk::Vector s_listInstance; +static std::vector s_listInstance; extern "C" { @@ -458,7 +458,7 @@ extern "C" return -1; } // for future case : all time this ... - s_listInstance.pushBack(tmpContext); + s_listInstance.push_back(tmpContext); int32_t newID = s_listInstance.size()-1; return newID; } diff --git a/sources/ewol/renderer/EMultiCast.cpp b/sources/ewol/renderer/EMultiCast.cpp index 12586d11..47e64f69 100644 --- a/sources/ewol/renderer/EMultiCast.cpp +++ b/sources/ewol/renderer/EMultiCast.cpp @@ -33,7 +33,7 @@ void ewol::EMultiCast::add(ewol::EObject* _object, const char* const _message) { EWOL_ERROR("Add with NULL Message"); return; } - m_messageList.pushBack(MessageList(_message, _object)); + m_messageList.push_back(MessageList(_message, _object)); EWOL_DEBUG("SendMulticast ADD listener :" << _object->getId() << " on \"" << _message << "\"" ); } diff --git a/sources/ewol/renderer/EMultiCast.h b/sources/ewol/renderer/EMultiCast.h index 6fee1310..34739739 100644 --- a/sources/ewol/renderer/EMultiCast.h +++ b/sources/ewol/renderer/EMultiCast.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include @@ -28,7 +28,7 @@ namespace ewol { const char* m_message; ewol::EObject* m_object; }; - etk::Vector m_messageList; //!< List of all message ... + std::vector m_messageList; //!< List of all message ... public: EMultiCast(); ~EMultiCast(void); diff --git a/sources/ewol/renderer/EObject.cpp b/sources/ewol/renderer/EObject.cpp index cd3d1bb3..065108ed 100644 --- a/sources/ewol/renderer/EObject.cpp +++ b/sources/ewol/renderer/EObject.cpp @@ -53,7 +53,7 @@ void ewol::EObject::removeObject(void) { void ewol::EObject::addEventId(const char * _generateEventId) { if (NULL != _generateEventId) { - m_availlableEventId.pushBack(_generateEventId); + m_availlableEventId.push_back(_generateEventId); } } @@ -141,7 +141,7 @@ void ewol::EObject::registerOnEvent(ewol::EObject * _destinationObject, } else { tmpEvent->destEventId = _eventId; } - m_externEvent.pushBack(tmpEvent); + m_externEvent.push_back(tmpEvent); } void ewol::EObject::unRegisterOnEvent(ewol::EObject * _destinationObject, @@ -193,7 +193,7 @@ void ewol::EObject::registerConfig(const char* _config, } } } - m_listConfig.pushBack(ewol::EConfigElement(_config, _type, _control, _description, _default)); + m_listConfig.push_back(ewol::EConfigElement(_config, _type, _control, _description, _default)); } diff --git a/sources/ewol/renderer/EObject.h b/sources/ewol/renderer/EObject.h index 3df30cf7..0455210e 100644 --- a/sources/ewol/renderer/EObject.h +++ b/sources/ewol/renderer/EObject.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include namespace ewol { // some class need to define element befor other ... @@ -47,8 +47,8 @@ namespace ewol { bool m_static; //!< set this variable at true if this element must not be auto destroy (exemple : use static object) private: int32_t m_uniqueId; //!< Object UniqueID == > TODO : Check if it use is needed - etk::Vector m_externEvent; //!< Generic list of event generation for output link - etk::Vector m_availlableEventId; //!< List of all event availlable for this widget + std::vector m_externEvent; //!< Generic list of event generation for output link + std::vector m_availlableEventId; //!< List of all event availlable for this widget public: /** * @brief Constructor @@ -137,7 +137,7 @@ namespace ewol { */ virtual void onReceiveMessage(const ewol::EMessage& _msg) { }; private: - etk::Vector m_listConfig; + std::vector m_listConfig; protected: /** * @brief the EObject add a configuration capabilities @@ -166,7 +166,7 @@ namespace ewol { * @brief get all the configuration list * @return The list of all parameter availlable in the widget */ - virtual const etk::Vector& getConfigList(void) { return m_listConfig; }; + virtual const std::vector& getConfigList(void) { return m_listConfig; }; /** * @brief Configuration requested to the curent EObject (systrem mode) * @param[in] _conf Configuration handle. diff --git a/sources/ewol/renderer/EObjectManager.cpp b/sources/ewol/renderer/EObjectManager.cpp index 39d37670..c688f20f 100644 --- a/sources/ewol/renderer/EObjectManager.cpp +++ b/sources/ewol/renderer/EObjectManager.cpp @@ -57,7 +57,7 @@ void ewol::EObjectManager::unInit(void) { void ewol::EObjectManager::add(ewol::EObject* _object) { if (NULL != _object) { - m_eObjectList.pushBack(_object); + m_eObjectList.push_back(_object); } else { EWOL_ERROR("try to add an inexistant EObject in manager"); } @@ -120,7 +120,7 @@ void ewol::EObjectManager::autoRemove(ewol::EObject* _object) { m_eObjectList.erase(iii); EWOL_DEBUG("Auto-Remove EObject : [" << _object->getId() << "] type=\"" << _object->getObjectType() << "\""); informOneObjectIsRemoved(_object); - m_eObjectAutoRemoveList.pushBack(_object); + m_eObjectAutoRemoveList.push_back(_object); ewol::getContext().forceRedrawAll(); return; } diff --git a/sources/ewol/renderer/EObjectManager.h b/sources/ewol/renderer/EObjectManager.h index cd18e256..4547fcff 100644 --- a/sources/ewol/renderer/EObjectManager.h +++ b/sources/ewol/renderer/EObjectManager.h @@ -16,8 +16,8 @@ namespace ewol { class EObjectManager { private: - etk::Vector m_eObjectList; // all widget allocated == > all time increment ... never removed ... - etk::Vector m_eObjectAutoRemoveList; // all widget allocated + std::vector m_eObjectList; // all widget allocated == > all time increment ... never removed ... + std::vector m_eObjectAutoRemoveList; // all widget allocated public: EObjectManager(void); ~EObjectManager(void); diff --git a/sources/ewol/renderer/audio/audio.cpp b/sources/ewol/renderer/audio/audio.cpp index e3b93ac4..c651f266 100644 --- a/sources/ewol/renderer/audio/audio.cpp +++ b/sources/ewol/renderer/audio/audio.cpp @@ -274,9 +274,9 @@ class RequestPlay { } }; -#include -etk::Vector ListEffects; -etk::Vector ListEffectsPlaying; +#include +std::vector ListEffects; +std::vector ListEffectsPlaying; int32_t ewol::audio::effects::add(etk::UString _file) { @@ -294,7 +294,7 @@ int32_t ewol::audio::effects::add(etk::UString _file) { EWOL_ERROR("Error to load the effects : \"" << _file << "\""); return -1; } - ListEffects.pushBack(tmpEffect); + ListEffects.push_back(tmpEffect); return ListEffects.size()-1; } @@ -342,7 +342,7 @@ void ewol::audio::effects::play(int32_t _effectId, float _xxx, float _yyy) { EWOL_CRITICAL("Allocation error of a playing element : " << _effectId); return; } - ListEffectsPlaying.pushBack(newPlay); + ListEffectsPlaying.push_back(newPlay); } diff --git a/sources/ewol/renderer/openGL.cpp b/sources/ewol/renderer/openGL.cpp index 161735cb..e2bfa924 100644 --- a/sources/ewol/renderer/openGL.cpp +++ b/sources/ewol/renderer/openGL.cpp @@ -6,7 +6,7 @@ * @license BSD v3 (see license file) */ -#include +#include #include #include @@ -20,7 +20,7 @@ static etk::Mutex& mutexOpenGl(void) { return s_drawMutex; } -etk::Vector l_matrixList; +std::vector l_matrixList; mat4 l_matrixCamera; static uint32_t l_flagsCurrent = 0; static uint32_t l_flagsMustBeSet = 0; @@ -32,7 +32,7 @@ void ewol::openGL::lock(void) { mutexOpenGl().lock(); l_matrixList.clear(); mat4 tmpMat; - l_matrixList.pushBack(tmpMat); + l_matrixList.push_back(tmpMat); l_matrixCamera.identity(); l_flagsCurrent = 0; l_flagsMustBeSet = 0; @@ -49,13 +49,13 @@ void ewol::openGL::setBasicMatrix(const mat4& _newOne) { EWOL_ERROR("matrix is not corect size in the stack : " << l_matrixList.size()); } l_matrixList.clear(); - l_matrixList.pushBack(_newOne); + l_matrixList.push_back(_newOne); } void ewol::openGL::setMatrix(const mat4& _newOne) { if (l_matrixList.size() == 0) { EWOL_ERROR("set matrix list is not corect size in the stack : " << l_matrixList.size()); - l_matrixList.pushBack(_newOne); + l_matrixList.push_back(_newOne); return; } l_matrixList[l_matrixList.size()-1] = _newOne; @@ -65,11 +65,11 @@ void ewol::openGL::push(void) { if (l_matrixList.size() == 0) { EWOL_ERROR("set matrix list is not corect size in the stack : " << l_matrixList.size()); mat4 tmp; - l_matrixList.pushBack(tmp); + l_matrixList.push_back(tmp); return; } mat4 tmp = l_matrixList[l_matrixList.size()-1]; - l_matrixList.pushBack(tmp); + l_matrixList.push_back(tmp); } void ewol::openGL::pop(void) { @@ -77,7 +77,7 @@ void ewol::openGL::pop(void) { EWOL_ERROR("set matrix list is not corect size in the stack : " << l_matrixList.size()); l_matrixList.clear(); mat4 tmp; - l_matrixList.pushBack(tmp); + l_matrixList.push_back(tmp); l_matrixCamera.identity(); return; } @@ -89,7 +89,7 @@ const mat4& ewol::openGL::getMatrix(void) { if (l_matrixList.size() == 0) { EWOL_ERROR("set matrix list is not corect size in the stack : " << l_matrixList.size()); mat4 tmp; - l_matrixList.pushBack(tmp); + l_matrixList.push_back(tmp); } return l_matrixList[l_matrixList.size()-1]; } @@ -252,7 +252,7 @@ void ewol::openGL::drawArrays(uint32_t _mode, int32_t _first, int32_t _count) { } } -void ewol::openGL::drawElements(uint32_t _mode, const etk::Vector& _indices) { +void ewol::openGL::drawElements(uint32_t _mode, const std::vector& _indices) { if (l_programId >= 0) { updateAllFlags(); //EWOL_DEBUG("Request draw of " << indices.size() << "elements"); @@ -260,14 +260,14 @@ void ewol::openGL::drawElements(uint32_t _mode, const etk::Vector& _in } } -void ewol::openGL::drawElements16(uint32_t _mode, const etk::Vector& _indices) { +void ewol::openGL::drawElements16(uint32_t _mode, const std::vector& _indices) { if (l_programId >= 0) { updateAllFlags(); glDrawElements(_mode, _indices.size(), GL_UNSIGNED_SHORT, &_indices[0]); } } -void ewol::openGL::drawElements8(uint32_t _mode, const etk::Vector& _indices) { +void ewol::openGL::drawElements8(uint32_t _mode, const std::vector& _indices) { if (l_programId >= 0) { updateAllFlags(); glDrawElements(_mode, _indices.size(), GL_UNSIGNED_BYTE, &_indices[0]); diff --git a/sources/ewol/renderer/openGL.h b/sources/ewol/renderer/openGL.h index 15241d57..daaefa0e 100644 --- a/sources/ewol/renderer/openGL.h +++ b/sources/ewol/renderer/openGL.h @@ -10,7 +10,7 @@ #define __OPEN_GL_H__ #include -#include +#include #include #ifdef __cplusplus @@ -170,9 +170,9 @@ namespace ewol { * @brief draw a specific array == > this enable mode difference ... */ void drawArrays(uint32_t _mode, int32_t _first, int32_t _count); - void drawElements (uint32_t _mode, const etk::Vector& _indices); - void drawElements16(uint32_t _mode, const etk::Vector& _indices); - void drawElements8 (uint32_t _mode, const etk::Vector& _indices); + void drawElements (uint32_t _mode, const std::vector& _indices); + void drawElements16(uint32_t _mode, const std::vector& _indices); + void drawElements8 (uint32_t _mode, const std::vector& _indices); /** * @brief Use openGL program * @param[in] id Id of the program that might be used diff --git a/sources/ewol/resources/Colored3DObject.cpp b/sources/ewol/resources/Colored3DObject.cpp index 842662be..d5b3a8ac 100644 --- a/sources/ewol/resources/Colored3DObject.cpp +++ b/sources/ewol/resources/Colored3DObject.cpp @@ -32,7 +32,7 @@ ewol::Colored3DObject::~Colored3DObject(void) { } -void ewol::Colored3DObject::draw(etk::Vector& _vertices, +void ewol::Colored3DObject::draw(std::vector& _vertices, const etk::Color& _color, bool _updateDepthBuffer, bool _depthtest) { @@ -74,7 +74,7 @@ void ewol::Colored3DObject::draw(etk::Vector& _vertices, } } -void ewol::Colored3DObject::draw(etk::Vector& _vertices, +void ewol::Colored3DObject::draw(std::vector& _vertices, const etk::Color& _color, mat4& _transformationMatrix, bool _updateDepthBuffer, @@ -114,7 +114,7 @@ void ewol::Colored3DObject::draw(etk::Vector& _vertices, } } -void ewol::Colored3DObject::drawLine(etk::Vector& _vertices, +void ewol::Colored3DObject::drawLine(std::vector& _vertices, const etk::Color& _color, mat4& _transformationMatrix, bool _updateDepthBuffer, diff --git a/sources/ewol/resources/Colored3DObject.h b/sources/ewol/resources/Colored3DObject.h index 692976cf..051007a2 100644 --- a/sources/ewol/resources/Colored3DObject.h +++ b/sources/ewol/resources/Colored3DObject.h @@ -27,16 +27,16 @@ namespace ewol { virtual ~Colored3DObject(void); public: virtual const char* getType(void) { return "ewol::Colored3DObject"; }; - virtual void draw(etk::Vector& _vertices, + virtual void draw(std::vector& _vertices, const etk::Color& _color, bool _updateDepthBuffer=true, bool _depthtest=true); - virtual void draw(etk::Vector& _vertices, + virtual void draw(std::vector& _vertices, const etk::Color& _color, mat4& _transformationMatrix, bool _updateDepthBuffer=true, bool _depthtest=true); - virtual void drawLine(etk::Vector& _vertices, + virtual void drawLine(std::vector& _vertices, const etk::Color& _color, mat4& _transformationMatrix, bool _updateDepthBuffer=true, diff --git a/sources/ewol/resources/ConfigFile.cpp b/sources/ewol/resources/ConfigFile.cpp index 9fdf19aa..cb2aac10 100644 --- a/sources/ewol/resources/ConfigFile.cpp +++ b/sources/ewol/resources/ConfigFile.cpp @@ -118,7 +118,7 @@ void ewol::ConfigFile::reload(void) { EWOL_DEBUG("error while allocation"); } else { tmpElement->parse(paramValue); - m_list.pushBack(tmpElement); + m_list.push_back(tmpElement); } } } @@ -140,7 +140,7 @@ int32_t ewol::ConfigFile::request(const etk::UString& _paramName) { if (NULL == tmpElement) { EWOL_DEBUG("error while allocation"); } else { - m_list.pushBack(tmpElement); + m_list.push_back(tmpElement); } return m_list.size()-1; } diff --git a/sources/ewol/resources/ConfigFile.h b/sources/ewol/resources/ConfigFile.h index 012562d5..ce327c90 100644 --- a/sources/ewol/resources/ConfigFile.h +++ b/sources/ewol/resources/ConfigFile.h @@ -36,7 +36,7 @@ namespace ewol { class ConfigFile : public ewol::Resource { private: - etk::Vector m_list; + std::vector m_list; etk::UString m_errorString; protected: ConfigFile(const etk::UString& _filename); diff --git a/sources/ewol/resources/FontFreeType.cpp b/sources/ewol/resources/FontFreeType.cpp index 1bb02d6c..22be5866 100644 --- a/sources/ewol/resources/FontFreeType.cpp +++ b/sources/ewol/resources/FontFreeType.cpp @@ -7,7 +7,7 @@ */ #include -#include +#include #include @@ -223,7 +223,7 @@ bool ewol::FontFreeType::drawGlyph(egami::Image& _imageOut, } -void ewol::FontFreeType::generateKerning(int32_t fontSize, etk::Vector& listGlyph) { +void ewol::FontFreeType::generateKerning(int32_t fontSize, std::vector& listGlyph) { if(false == m_init) { return; } diff --git a/sources/ewol/resources/FontFreeType.h b/sources/ewol/resources/FontFreeType.h index d8f975d3..67e9e14e 100644 --- a/sources/ewol/resources/FontFreeType.h +++ b/sources/ewol/resources/FontFreeType.h @@ -44,7 +44,7 @@ namespace ewol { int32_t getHeight(int32_t _fontSize); - void generateKerning(int32_t _fontSize, etk::Vector& _listGlyph); + void generateKerning(int32_t _fontSize, std::vector& _listGlyph); public: /** * @brief keep the resource pointer. diff --git a/sources/ewol/resources/Mesh.cpp b/sources/ewol/resources/Mesh.cpp index 06b82c96..392cf77f 100644 --- a/sources/ewol/resources/Mesh.cpp +++ b/sources/ewol/resources/Mesh.cpp @@ -133,15 +133,15 @@ void ewol::Mesh::draw(mat4& _positionMatrix, vec3 cameraNormal = vec3(0,0,-1); cameraNormal.normalized(); // remove face that is notin the view ... - etk::Vector tmpIndexResult; - etk::Vector& tmppFaces = m_listFaces.getValue(kkk).m_faces; - //etk::Vector& tmppIndex = m_listFaces.getValue(kkk).m_index; + std::vector tmpIndexResult; + std::vector& tmppFaces = m_listFaces.getValue(kkk).m_faces; + //std::vector& tmppIndex = m_listFaces.getValue(kkk).m_index; if (normalModeFace == m_normalMode) { for(int32_t iii=0; iii= 0.0f) { - tmpIndexResult.pushBack(iii*3); - tmpIndexResult.pushBack(iii*3+1); - tmpIndexResult.pushBack(iii*3+2); + tmpIndexResult.push_back(iii*3); + tmpIndexResult.push_back(iii*3+1); + tmpIndexResult.push_back(iii*3+2); } } } else { @@ -149,9 +149,9 @@ void ewol::Mesh::draw(mat4& _positionMatrix, if( (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[0]], cameraNormal) >= -0.2f) || (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[1]], cameraNormal) >= -0.2f) || (btDot(mattttt * m_listVertexNormal[tmppFaces[iii].m_normal[2]], cameraNormal) >= -0.2f) ) { - tmpIndexResult.pushBack(iii*3); - tmpIndexResult.pushBack(iii*3+1); - tmpIndexResult.pushBack(iii*3+2); + tmpIndexResult.push_back(iii*3); + tmpIndexResult.push_back(iii*3+1); + tmpIndexResult.push_back(iii*3+2); } } } @@ -180,12 +180,12 @@ void ewol::Mesh::draw(mat4& _positionMatrix, void ewol::Mesh::calculateNormaleFace(void) { m_listFacesNormal.clear(); if (m_normalMode != ewol::Mesh::normalModeFace) { - etk::Vector& tmpFaceList = m_listFaces.getValue(0).m_faces; + std::vector& tmpFaceList = m_listFaces.getValue(0).m_faces; for(int32_t iii=0 ; iii& tmpFaceList = m_listFaces.getValue(0).m_faces; + std::vector& tmpFaceList = m_listFaces.getValue(0).m_faces; vec3 normal(0,0,0); // add the vertex from all the element in the list for face when the element in the face ... for(int32_t jjj=0 ; jjj m_faces; - etk::Vector m_index; + std::vector m_faces; + std::vector m_index; }; class Mesh : public ewol::Resource { public: @@ -92,13 +92,13 @@ namespace ewol { MaterialGlId m_GLMaterial; ewol::Light m_light; protected: - etk::Vector m_listVertex; //!< List of all vertex in the element - etk::Vector m_listUV; //!< List of all UV point in the mesh (for the specify texture) - etk::Vector m_listFacesNormal; //!< List of all Face normal, when calculated - etk::Vector m_listVertexNormal; //!< List of all Face normal, when calculated + std::vector m_listVertex; //!< List of all vertex in the element + std::vector m_listUV; //!< List of all UV point in the mesh (for the specify texture) + std::vector m_listFacesNormal; //!< List of all Face normal, when calculated + std::vector m_listVertexNormal; //!< List of all Face normal, when calculated etk::Hash m_listFaces; //!< List of all Face for the mesh etk::Hash m_materials; - etk::Vector m_physics; //!< collision shape module ... (independent of bullet lib) + std::vector m_physics; //!< collision shape module ... (independent of bullet lib) protected: ewol::VirtualBufferObject* m_verticesVBO; protected: @@ -129,7 +129,7 @@ namespace ewol { * @return get the chcking stus of normal or not */ bool getCheckNormal(void) { return m_checkNormal; }; - const etk::Vector& getPhysicalProperties(void) const { return m_physics; }; + const std::vector& getPhysicalProperties(void) const { return m_physics; }; private: void* m_pointerShape; //!< all mesh have a basic shape (bullet or other) the void pointer mermit to not depent on the bullet lib public: diff --git a/sources/ewol/resources/Program.cpp b/sources/ewol/resources/Program.cpp index 09b3731a..1bcbe830 100644 --- a/sources/ewol/resources/Program.cpp +++ b/sources/ewol/resources/Program.cpp @@ -41,7 +41,7 @@ ewol::Program::Program(const etk::UString& _filename) : return; } else { EWOL_DEBUG("Add shader on program : "<< tmpFilename << "vert"); - m_shaderList.pushBack(tmpShader); + m_shaderList.push_back(tmpShader); } tmpShader = ewol::Shader::keep(tmpFilename+"frag"); if (NULL == tmpShader) { @@ -49,7 +49,7 @@ ewol::Program::Program(const etk::UString& _filename) : return; } else { EWOL_DEBUG("Add shader on program : "<< tmpFilename << "frag"); - m_shaderList.pushBack(tmpShader); + m_shaderList.push_back(tmpShader); } } else { etk::UString fileExtention = file.fileGetExtention(); @@ -84,7 +84,7 @@ ewol::Program::Program(const etk::UString& _filename) : EWOL_CRITICAL("Error while getting a specific shader filename : " << tmpFilename); } else { EWOL_DEBUG("Add shader on program : "<< tmpFilename); - m_shaderList.pushBack(tmpShader); + m_shaderList.push_back(tmpShader); } } @@ -132,7 +132,7 @@ int32_t ewol::Program::getAttribute(etk::UString _elementName) { EWOL_WARNING("glGetAttribLocation(\"" << tmp.m_name << "\") = " << tmp.m_elementId); tmp.m_isLinked = false; } - m_elementList.pushBack(tmp); + m_elementList.push_back(tmp); return m_elementList.size()-1; } @@ -153,7 +153,7 @@ int32_t ewol::Program::getUniform(etk::UString _elementName) { EWOL_WARNING("glGetUniformLocation(\"" << tmp.m_name << "\") = " << tmp.m_elementId); tmp.m_isLinked = false; } - m_elementList.pushBack(tmp); + m_elementList.push_back(tmp); return m_elementList.size()-1; } diff --git a/sources/ewol/resources/Program.h b/sources/ewol/resources/Program.h index 518f5eda..e4d493aa 100644 --- a/sources/ewol/resources/Program.h +++ b/sources/ewol/resources/Program.h @@ -47,8 +47,8 @@ namespace ewol { private : bool m_exist; //!< the file existed GLuint m_program; //!< openGL id of the current program - etk::Vector m_shaderList; //!< List of all the shader loaded - etk::Vector m_elementList; //!< List of all the attribute requested by the user + std::vector m_shaderList; //!< List of all the shader loaded + std::vector m_elementList; //!< List of all the attribute requested by the user bool m_hasTexture; //!< A texture has been set to the current shader bool m_hasTexture1; //!< A texture has been set to the current shader protected: diff --git a/sources/ewol/resources/ResourceManager.cpp b/sources/ewol/resources/ResourceManager.cpp index c3279930..f0d4b114 100644 --- a/sources/ewol/resources/ResourceManager.cpp +++ b/sources/ewol/resources/ResourceManager.cpp @@ -98,7 +98,7 @@ void ewol::ResourceManager::update(ewol::Resource* _object) { } } // add it ... - m_resourceListToUpdate.pushBack(_object); + m_resourceListToUpdate.push_back(_object); } // Specific to load or update the data in the openGl context == > system use only @@ -173,7 +173,7 @@ void ewol::ResourceManager::localAdd(ewol::Resource* _object) { } } // add at the end if no slot is free - m_resourceList.pushBack(_object); + m_resourceList.push_back(_object); } bool ewol::ResourceManager::release(ewol::Resource*& _object) { diff --git a/sources/ewol/resources/ResourceManager.h b/sources/ewol/resources/ResourceManager.h index c4fbc85c..9930ac04 100644 --- a/sources/ewol/resources/ResourceManager.h +++ b/sources/ewol/resources/ResourceManager.h @@ -25,8 +25,8 @@ namespace ewol { class ResourceManager { private: - etk::Vector m_resourceList; - etk::Vector m_resourceListToUpdate; + std::vector m_resourceList; + std::vector m_resourceListToUpdate; bool m_contextHasBeenRemoved; public: /** diff --git a/sources/ewol/resources/Shader.cpp b/sources/ewol/resources/Shader.cpp index 2cf74eeb..5d7caa56 100644 --- a/sources/ewol/resources/Shader.cpp +++ b/sources/ewol/resources/Shader.cpp @@ -86,7 +86,7 @@ void ewol::Shader::updateContext(void) { } EWOL_ERROR("Could not compile \"" << tmpShaderType << "\" name='" << m_name << "'"); EWOL_ERROR("Error " << l_bufferDisplayError); - etk::Vector lines = etk::UString(m_fileData).split('\n'); + std::vector lines = etk::UString(m_fileData).split('\n'); for (esize_t iii=0 ; iii folderList; + std::vector folderList; if (true == ewol::getContext().getFontDefault().getUseExternal()) { #if defined(__TARGET_OS__Android) - folderList.pushBack("/system/fonts"); + folderList.push_back("/system/fonts"); #elif defined(__TARGET_OS__Linux) - folderList.pushBack("/usr/share/fonts/truetype"); + folderList.push_back("/usr/share/fonts/truetype"); #endif } - folderList.pushBack(ewol::getContext().getFontDefault().getFolder()); + folderList.push_back(ewol::getContext().getFontDefault().getFolder()); for (int32_t folderID=0; folderID output; + std::vector output; myFolder.folderGetRecursiveFiles(output); - etk::Vector split = localName.split(';'); + std::vector split = localName.split(';'); EWOL_INFO("try to find font named : " << split << " in: " << myFolder); //EWOL_CRITICAL("parse string : " << split); bool hasFindAFont = false; @@ -282,7 +282,7 @@ bool ewol::TexturedFont::addGlyph(const etk::UChar& _val) { EWOL_WARNING("Did not find char : '" << _val << "'=" << _val.get()); tmpchar.setNotExist(); } - m_listElement[iii].pushBack(tmpchar); + m_listElement[iii].push_back(tmpchar); //m_font[iii]->display(); // generate the kerning for all the characters : if (tmpchar.exist() == true) { diff --git a/sources/ewol/resources/TexturedFont.h b/sources/ewol/resources/TexturedFont.h index 673c98e9..c0206317 100644 --- a/sources/ewol/resources/TexturedFont.h +++ b/sources/ewol/resources/TexturedFont.h @@ -35,7 +35,7 @@ namespace ewol { ewol::FontBase* m_font[4]; enum ewol::font::mode m_modeWraping[4]; //!< This is a wrapping mode to prevent the fact that no font is define for a specific mode public: - etk::Vector m_listElement[4]; + std::vector m_listElement[4]; private: // for the texture generation : ivec2 m_lastGlyphPos[4]; diff --git a/sources/ewol/resources/VirtualBufferObject.cpp b/sources/ewol/resources/VirtualBufferObject.cpp index 34ff5ed7..3c9baddf 100644 --- a/sources/ewol/resources/VirtualBufferObject.cpp +++ b/sources/ewol/resources/VirtualBufferObject.cpp @@ -87,9 +87,9 @@ void ewol::VirtualBufferObject::flush(void) { void ewol::VirtualBufferObject::pushOnBuffer(int32_t _id, const vec3& _data) { m_vboUsed[_id] = true; - m_buffer[_id].pushBack(_data.x()); - m_buffer[_id].pushBack(_data.y()); - m_buffer[_id].pushBack(_data.z()); + m_buffer[_id].push_back(_data.x()); + m_buffer[_id].push_back(_data.y()); + m_buffer[_id].push_back(_data.z()); } vec3 ewol::VirtualBufferObject::getOnBufferVec3(int32_t _id, int32_t _elementID) { @@ -107,8 +107,8 @@ int32_t ewol::VirtualBufferObject::sizeOnBufferVec3(int32_t _id) { void ewol::VirtualBufferObject::pushOnBuffer(int32_t _id, const vec2& _data) { m_vboUsed[_id] = true; - m_buffer[_id].pushBack(_data.x()); - m_buffer[_id].pushBack(_data.y()); + m_buffer[_id].push_back(_data.x()); + m_buffer[_id].push_back(_data.y()); } vec2 ewol::VirtualBufferObject::getOnBufferVec2(int32_t _id, int32_t _elementID) { diff --git a/sources/ewol/resources/VirtualBufferObject.h b/sources/ewol/resources/VirtualBufferObject.h index 60b925c2..11e7e390 100644 --- a/sources/ewol/resources/VirtualBufferObject.h +++ b/sources/ewol/resources/VirtualBufferObject.h @@ -27,7 +27,7 @@ namespace ewol { bool m_exist; //!< This data is availlable in the Graphic card GLuint m_vbo[NB_VBO_MAX]; //!< openGl ID of this VBO bool m_vboUsed[NB_VBO_MAX]; //!< true if the VBO is allocated or used ... - etk::Vector m_buffer[NB_VBO_MAX]; //!< data that is availlable in the VBO system ... + std::vector m_buffer[NB_VBO_MAX]; //!< data that is availlable in the VBO system ... protected: /** * @brief Constructor of this VBO. @@ -54,7 +54,7 @@ namespace ewol { * @param[in] id Id of the buffer requested * @return A reference on the data. */ - etk::Vector& getRefBuffer(int32_t id) { m_vboUsed[id] = true; return m_buffer[id]; }; + std::vector& getRefBuffer(int32_t id) { m_vboUsed[id] = true; return m_buffer[id]; }; /** * @brief push data on a buffer with a custum type : * @param[in] id Id of the buffer requested. diff --git a/sources/ewol/resources/font/FontBase.h b/sources/ewol/resources/font/FontBase.h index 4bb75d59..e3a98ee6 100644 --- a/sources/ewol/resources/font/FontBase.h +++ b/sources/ewol/resources/font/FontBase.h @@ -39,7 +39,7 @@ namespace ewol { virtual int32_t getHeight(int32_t _fontSize) = 0; - virtual void generateKerning(int32_t _fontSize, etk::Vector& _listGlyph) { }; + virtual void generateKerning(int32_t _fontSize, std::vector& _listGlyph) { }; virtual void display(void) {}; }; diff --git a/sources/ewol/resources/font/GlyphProperty.h b/sources/ewol/resources/font/GlyphProperty.h index b2bf06b5..739ebe25 100644 --- a/sources/ewol/resources/font/GlyphProperty.h +++ b/sources/ewol/resources/font/GlyphProperty.h @@ -61,7 +61,7 @@ namespace ewol { vec2 m_texturePosStart; //!< Texture normalised position (START) vec2 m_texturePosSize; //!< Texture normalised position (SIZE) private: - etk::Vector m_kerning; //!< kerning values of link of all elements + std::vector m_kerning; //!< kerning values of link of all elements public: GlyphProperty(void) : m_UVal(0), @@ -84,7 +84,7 @@ namespace ewol { }; void kerningAdd(const etk::UChar _charcode, float _value) { - m_kerning.pushBack(ewol::Kerning(_charcode, _value)); + m_kerning.push_back(ewol::Kerning(_charcode, _value)); }; void kerningClear(void) { diff --git a/sources/ewol/resources/font/Kerning.h b/sources/ewol/resources/font/Kerning.h index 1bccb42f..484e804a 100644 --- a/sources/ewol/resources/font/Kerning.h +++ b/sources/ewol/resources/font/Kerning.h @@ -42,7 +42,7 @@ namespace ewol { float m_value; //!< kerning real offset public: /** - * @brief Simple constructor that allow to allocate the etk::Vector element + * @brief Simple constructor that allow to allocate the std::vector element */ Kerning(void) : m_UVal(0), diff --git a/sources/ewol/widget/ContainerN.cpp b/sources/ewol/widget/ContainerN.cpp index 5a7ba1a3..9d52a303 100644 --- a/sources/ewol/widget/ContainerN.cpp +++ b/sources/ewol/widget/ContainerN.cpp @@ -59,7 +59,7 @@ int32_t widget::ContainerN::subWidgetAdd(ewol::Widget* _newWidget) { if (_newWidget!=NULL) { _newWidget->setUpperWidget(this); } - m_subWidget.pushBack(_newWidget); + m_subWidget.push_back(_newWidget); markToRedraw(); requestUpdateSize(); // added at the last eelement : diff --git a/sources/ewol/widget/ContainerN.h b/sources/ewol/widget/ContainerN.h index 7d1eb8ce..930ca363 100644 --- a/sources/ewol/widget/ContainerN.h +++ b/sources/ewol/widget/ContainerN.h @@ -20,7 +20,7 @@ namespace widget { */ class ContainerN : public ewol::Widget { protected: - etk::Vector m_subWidget; + std::vector m_subWidget; public: /** * @brief Constructor diff --git a/sources/ewol/widget/Gird.cpp b/sources/ewol/widget/Gird.cpp index 1b66802f..2f1e1d9e 100644 --- a/sources/ewol/widget/Gird.cpp +++ b/sources/ewol/widget/Gird.cpp @@ -162,7 +162,7 @@ void widget::Gird::setColNumber(int32_t _colNumber) { } else { // just add the col size: for (int32_t iii=m_sizeCol.size()-1; iii<_colNumber-1 ; iii++) { - m_sizeCol.pushBack(0); + m_sizeCol.push_back(0); } } } @@ -256,7 +256,7 @@ void widget::Gird::subWidgetAdd(int32_t _colId, int32_t _rowId, ewol::Widget* _n } } // not find == > just adding it ... - m_subWidget.pushBack(prop); + m_subWidget.push_back(prop); } void widget::Gird::subWidgetRemove(ewol::Widget* _newWidget) diff --git a/sources/ewol/widget/Gird.h b/sources/ewol/widget/Gird.h index 2ea11752..9b160532 100644 --- a/sources/ewol/widget/Gird.h +++ b/sources/ewol/widget/Gird.h @@ -10,7 +10,7 @@ #define __EWOL_WIDGET_GIRD_H__ #include -#include +#include #include #include #include @@ -31,8 +31,8 @@ namespace widget { }; int32_t m_sizeRow; //!< size of all lines (row) (if set (otherwise 0)) == > we have a only one size ==> multiple size will have no use ... int32_t m_uniformSizeRow; - etk::Vector m_sizeCol; //!< size of all colomn (if set (otherwise 0)) - etk::Vector m_subWidget; //!< all sub widget are contained in this element + std::vector m_sizeCol; //!< size of all colomn (if set (otherwise 0)) + std::vector m_subWidget; //!< all sub widget are contained in this element ewol::Widget* m_tmpWidget; //!< use when replace a widget ... bool m_gavityButtom; public: diff --git a/sources/ewol/widget/List.cpp b/sources/ewol/widget/List.cpp index d3602065..5e7ea02c 100644 --- a/sources/ewol/widget/List.cpp +++ b/sources/ewol/widget/List.cpp @@ -78,7 +78,7 @@ void widget::List::addOObject(ewol::Compositing* _newObject, int32_t _pos) { return; } if (_pos < 0 || _pos >= m_listOObject.size() ) { - m_listOObject.pushBack(_newObject); + m_listOObject.push_back(_newObject); } else { m_listOObject.insert(_pos, _newObject); } @@ -128,7 +128,7 @@ void widget::List::onRegenerateDisplay(void) { (minHeight + 2*m_paddingSizeY) * nbRaw ); - etk::Vector listSizeColomn; + std::vector listSizeColomn; ewol::Drawing * BGOObjects = new ewol::Drawing(); etk::Color<> basicBG = getBasicBG(); @@ -159,7 +159,7 @@ void widget::List::onRegenerateDisplay(void) { int32_t displayPositionX = 0; ivec2 tmpRegister(startRaw, displayPositionY); // add the default position raw : - m_lineSize.pushBack(tmpRegister); + m_lineSize.push_back(tmpRegister); for(int32_t jjj=0; jjj m_listOObject; //!< generic element to display... - etk::Vector m_lineSize; + std::vector m_listOObject; //!< generic element to display... + std::vector m_lineSize; public: void addOObject(ewol::Compositing* _newObject, int32_t _pos=-1); void clearOObjectList(void); diff --git a/sources/ewol/widget/ListFileSystem.h b/sources/ewol/widget/ListFileSystem.h index cc38f9bf..d729a73f 100644 --- a/sources/ewol/widget/ListFileSystem.h +++ b/sources/ewol/widget/ListFileSystem.h @@ -23,7 +23,7 @@ namespace widget { */ class ListFileSystem : public widget::List { private: - etk::Vector m_list; + std::vector m_list; etk::UString m_folder; int32_t m_selectedLine; bool m_showFile; diff --git a/sources/ewol/widget/Menu.cpp b/sources/ewol/widget/Menu.cpp index e8af9dd5..afc7623f 100644 --- a/sources/ewol/widget/Menu.cpp +++ b/sources/ewol/widget/Menu.cpp @@ -79,7 +79,7 @@ int32_t widget::Menu::add(int32_t _parent, tmpObject->m_image = _image; tmpObject->m_generateEvent = _generateEvent; tmpObject->m_message = _message; - m_listElement.pushBack(tmpObject); + m_listElement.push_back(tmpObject); if (-1 == tmpObject->m_parentId) { widget::Button *myButton = NULL; myButton = new widget::Button(); diff --git a/sources/ewol/widget/Menu.h b/sources/ewol/widget/Menu.h index 98912d0f..8a8b4570 100644 --- a/sources/ewol/widget/Menu.h +++ b/sources/ewol/widget/Menu.h @@ -45,7 +45,7 @@ namespace widget { virtual void subWidgetRemove(ewol::Widget* _newWidget); virtual void subWidgetUnLink(ewol::Widget* _newWidget); private: - etk::Vector m_listElement; + std::vector m_listElement; int32_t m_staticId; // unique ID for every element of the menu ... widget::ContextMenu* m_widgetContextMenu; public: diff --git a/sources/ewol/widget/Widget.cpp b/sources/ewol/widget/Widget.cpp index 25c7ed2b..cad9d635 100644 --- a/sources/ewol/widget/Widget.cpp +++ b/sources/ewol/widget/Widget.cpp @@ -591,7 +591,7 @@ void ewol::Widget::shortCutAdd(const char * _descriptiveString, tmpElement->unicodeValue = _descriptiveString[strlen(_descriptiveString) -1]; } // add it on the List ... - m_localShortcut.pushBack(tmpElement); + m_localShortcut.push_back(tmpElement); } void ewol::Widget::shortCutClean(void) { diff --git a/sources/ewol/widget/Widget.h b/sources/ewol/widget/Widget.h index a03cd006..e1e7fe71 100644 --- a/sources/ewol/widget/Widget.h +++ b/sources/ewol/widget/Widget.h @@ -18,7 +18,7 @@ namespace ewol { class Windows; }; #include -#include +#include #include #include #include @@ -585,7 +585,7 @@ namespace ewol { // -- Shortcut : management of the shortcut // ---------------------------------------------------------------------------------------------------------------- private: - etk::Vector m_localShortcut; //!< list of all shortcut in the widget + std::vector m_localShortcut; //!< list of all shortcut in the widget protected: /** * @brief add a specific shortcut with his description diff --git a/sources/ewol/widget/WidgetManager.cpp b/sources/ewol/widget/WidgetManager.cpp index 128a4efd..1697c9ee 100644 --- a/sources/ewol/widget/WidgetManager.cpp +++ b/sources/ewol/widget/WidgetManager.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #undef __class__ #define __class__ "WidgetManager" @@ -165,7 +165,7 @@ void ewol::WidgetManager::periodicCallAdd(ewol::Widget* _pWidget) { return; } } - m_listOfPeriodicWidget.pushBack(_pWidget); + m_listOfPeriodicWidget.push_back(_pWidget); m_havePeriodic = true; } diff --git a/sources/ewol/widget/WidgetManager.h b/sources/ewol/widget/WidgetManager.h index 7dc48489..6d30f0f8 100644 --- a/sources/ewol/widget/WidgetManager.h +++ b/sources/ewol/widget/WidgetManager.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ namespace ewol { // For the focus Management ewol::Widget* m_focusWidgetDefault; ewol::Widget* m_focusWidgetCurrent; - etk::Vector m_listOfPeriodicWidget; + std::vector m_listOfPeriodicWidget; bool m_havePeriodic; bool m_haveRedraw; etk::Hash m_creatorList; diff --git a/sources/ewol/widget/WidgetScrolled.cpp b/sources/ewol/widget/WidgetScrolled.cpp index f569a0bc..cb9c0624 100644 --- a/sources/ewol/widget/WidgetScrolled.cpp +++ b/sources/ewol/widget/WidgetScrolled.cpp @@ -326,7 +326,7 @@ void widget::WidgetScrooled::addOObject(ewol::Compositing* _newObject, int32_t _ return; } if (_pos < 0 || _pos >= m_listOObject.size() ) { - m_listOObject.pushBack(_newObject); + m_listOObject.push_back(_newObject); } else { m_listOObject.insert(_pos, _newObject); } diff --git a/sources/ewol/widget/WidgetScrolled.h b/sources/ewol/widget/WidgetScrolled.h index 18745822..07519edc 100644 --- a/sources/ewol/widget/WidgetScrolled.h +++ b/sources/ewol/widget/WidgetScrolled.h @@ -27,7 +27,7 @@ namespace widget { scroolModeGame, //!< Zoom enable, no move left and right }; private: - etk::Vector m_listOObject; //!< generic element to display... + std::vector m_listOObject; //!< generic element to display... void addOObject(ewol::Compositing* _newObject, int32_t _pos=-1); void clearOObjectList(void); protected: diff --git a/sources/ewol/widget/Windows.cpp b/sources/ewol/widget/Windows.cpp index 244c3902..e63ac580 100644 --- a/sources/ewol/widget/Windows.cpp +++ b/sources/ewol/widget/Windows.cpp @@ -180,7 +180,7 @@ void ewol::Windows::setSubWidget(ewol::Widget* _widget) { } void ewol::Windows::popUpWidgetPush(ewol::Widget* _widget) { - m_popUpWidgetList.pushBack(_widget); + m_popUpWidgetList.push_back(_widget); // Regenerate the size calculation : calculateSize(m_size); // TODO : it is dansgerous to access directly to the system ... diff --git a/sources/ewol/widget/Windows.h b/sources/ewol/widget/Windows.h index 0a4b4bf9..fb583d05 100644 --- a/sources/ewol/widget/Windows.h +++ b/sources/ewol/widget/Windows.h @@ -48,7 +48,7 @@ namespace ewol { } private: ewol::Widget* m_subWidget; - etk::Vector m_popUpWidgetList; + std::vector m_popUpWidgetList; public: void setSubWidget(ewol::Widget* _widget); void popUpWidgetPush(ewol::Widget* _widget); diff --git a/sources/ewol/widget/meta/ColorChooser.cpp b/sources/ewol/widget/meta/ColorChooser.cpp index 6c8d0958..2adebca5 100644 --- a/sources/ewol/widget/meta/ColorChooser.cpp +++ b/sources/ewol/widget/meta/ColorChooser.cpp @@ -11,8 +11,8 @@ #include #include #include -//#include -#include +//#include +#include extern "C" { // file browsing ... diff --git a/sources/ewol/widget/meta/FileChooser.cpp b/sources/ewol/widget/meta/FileChooser.cpp index 082ccba0..e1b8d6d2 100644 --- a/sources/ewol/widget/meta/FileChooser.cpp +++ b/sources/ewol/widget/meta/FileChooser.cpp @@ -14,8 +14,8 @@ #include #include #include -//#include -#include +//#include +#include #include #include diff --git a/sources/ewol/widget/meta/Parameter.cpp b/sources/ewol/widget/meta/Parameter.cpp index 17d46a30..b21fafbf 100644 --- a/sources/ewol/widget/meta/Parameter.cpp +++ b/sources/ewol/widget/meta/Parameter.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include diff --git a/sources/ewol/widget/meta/ParameterList.cpp b/sources/ewol/widget/meta/ParameterList.cpp index 24db9a72..ca5eef40 100644 --- a/sources/ewol/widget/meta/ParameterList.cpp +++ b/sources/ewol/widget/meta/ParameterList.cpp @@ -60,7 +60,7 @@ void widget::ParameterList::addOObject(ewol::Compositing* _newObject, int32_t _p return; } if (_pos < 0 || _pos >= m_listOObject.size() ) { - m_listOObject.pushBack(_newObject); + m_listOObject.push_back(_newObject); } else { m_listOObject.insert(_pos, _newObject); } @@ -116,7 +116,7 @@ void widget::ParameterList::onRegenerateDisplay(void) { (minHeight + 2*m_paddingSizeY) * nbRaw ); - etk::Vector listSizeColomn; + std::vector listSizeColomn; // set background color : ewol::Drawing * tmpDraw = new ewol::Drawing(); @@ -210,7 +210,7 @@ void widget::ParameterList::onLostFocus(void) { void widget::ParameterList::menuAdd(etk::UString& _label, int32_t _refId, etk::UString& _image) { widget::elementPL* tmpEmement = new widget::elementPL(_label, _refId, _image, false); if (NULL != tmpEmement) { - m_list.pushBack(tmpEmement); + m_list.push_back(tmpEmement); if (m_idSelected == -1 && _label != "---" && _refId>0) { m_idSelected = m_list.size()-1; } @@ -222,7 +222,7 @@ void widget::ParameterList::menuAddGroup(etk::UString& _label) { etk::UString image = ""; widget::elementPL* tmpEmement = new widget::elementPL(_label, -1, image, true); if (NULL != tmpEmement) { - m_list.pushBack(tmpEmement); + m_list.push_back(tmpEmement); markToRedraw(); } } diff --git a/sources/ewol/widget/meta/ParameterList.h b/sources/ewol/widget/meta/ParameterList.h index a394e9ca..51f3dd55 100644 --- a/sources/ewol/widget/meta/ParameterList.h +++ b/sources/ewol/widget/meta/ParameterList.h @@ -39,14 +39,14 @@ namespace widget { class ParameterList :public widget::WidgetScrooled { private: int32_t m_idSelected; - etk::Vector m_list; + std::vector m_list; public: ParameterList(void); virtual ~ParameterList(void); void setLabel(etk::UString _newLabel); // drawing capabilities .... private: - etk::Vector m_listOObject; //!< generic element to display... + std::vector m_listOObject; //!< generic element to display... public: void addOObject(ewol::Compositing* _newObject, int32_t _pos=-1); void clearOObjectList(void); diff --git a/sources/ewol/widget/meta/StdPopUp.cpp b/sources/ewol/widget/meta/StdPopUp.cpp index b0e53e94..260a429e 100644 --- a/sources/ewol/widget/meta/StdPopUp.cpp +++ b/sources/ewol/widget/meta/StdPopUp.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #undef __class__ #define __class__ "ewol::StdPopUp"