diff --git a/external/agg b/external/agg index 31442b46..04556d63 160000 --- a/external/agg +++ b/external/agg @@ -1 +1 @@ -Subproject commit 31442b4615e43ebda829622b4da4961c32e01f26 +Subproject commit 04556d63d1bac4b9e6d3a569a56a2f6b6113736a diff --git a/external/airtaudio b/external/airtaudio index 490e993c..bb547a72 160000 --- a/external/airtaudio +++ b/external/airtaudio @@ -1 +1 @@ -Subproject commit 490e993c6fa05036f06abe1e39f9e04b5c5e03cb +Subproject commit bb547a72d99802ac5d9a99c843549f175c856826 diff --git a/external/date/date/date.cpp b/external/date/date/date.cpp index e70786a0..314ad909 100644 --- a/external/date/date/date.cpp +++ b/external/date/date/date.cpp @@ -26,27 +26,27 @@ #define BUILD_SECOND 0 #endif -int32_t date::getYear(void) { +int32_t date::getYear() { return BUILD_YEAR; } -int32_t date::getMonth(void) { +int32_t date::getMonth() { return BUILD_MONTH; } -int32_t date::getDay(void) { +int32_t date::getDay() { return BUILD_DAY; } -int32_t date::getHour(void) { +int32_t date::getHour() { return BUILD_HOUR; } -int32_t date::getMinute(void) { +int32_t date::getMinute() { return BUILD_MINUTE; } -int32_t date::getSecond(void) { +int32_t date::getSecond() { return BUILD_SECOND; } diff --git a/external/date/date/date.h b/external/date/date/date.h index 9582ff9f..bd512d8b 100644 --- a/external/date/date/date.h +++ b/external/date/date/date.h @@ -12,12 +12,12 @@ #include namespace date { - int32_t getYear(void); - int32_t getMonth(void); - int32_t getDay(void); - int32_t getHour(void); - int32_t getMinute(void); - int32_t getSecond(void); + int32_t getYear(); + int32_t getMonth(); + int32_t getDay(); + int32_t getHour(); + int32_t getMinute(); + int32_t getSecond(); }; diff --git a/external/eaudiofx b/external/eaudiofx index 28982a1b..18c23700 160000 --- a/external/eaudiofx +++ b/external/eaudiofx @@ -1 +1 @@ -Subproject commit 28982a1bbddc3d7362b6caac9df01ccb2c9f8c71 +Subproject commit 18c2370065e3bc24681b009ca835a746496e1553 diff --git a/external/egami b/external/egami index 889807e0..bb58a8c0 160000 --- a/external/egami +++ b/external/egami @@ -1 +1 @@ -Subproject commit 889807e0b9b88890a9c6734e054da5edf23e59d9 +Subproject commit bb58a8c06e30cf141a59f8a09a544919c1f695ed diff --git a/external/ege b/external/ege index 000bde32..ba20ab59 160000 --- a/external/ege +++ b/external/ege @@ -1 +1 @@ -Subproject commit 000bde321dedc1ab709589a5f4cf057fe7825a63 +Subproject commit ba20ab59f74866367fb8efa260fc6eb26889422b diff --git a/external/ejson b/external/ejson index 86116be4..77ff2747 160000 --- a/external/ejson +++ b/external/ejson @@ -1 +1 @@ -Subproject commit 86116be4dbcd8809b82a3bf607845c9bb4d5424b +Subproject commit 77ff2747bb6b82555947e59ee6171e44eeb85db6 diff --git a/external/enet b/external/enet index 488658ae..22baa22b 160000 --- a/external/enet +++ b/external/enet @@ -1 +1 @@ -Subproject commit 488658aecf730231e265d7d6b6887d00b74f9dec +Subproject commit 22baa22bc23e1202285de3e640911047ea7b395d diff --git a/external/esvg b/external/esvg index 467a412c..a6c50c8f 160000 --- a/external/esvg +++ b/external/esvg @@ -1 +1 @@ -Subproject commit 467a412ccdfeee3e64ec57c82ba36fda275483b9 +Subproject commit a6c50c8f94cce5e14c9448a809fc9d1acc268c81 diff --git a/external/etk b/external/etk index 2059e5f0..d2997292 160000 --- a/external/etk +++ b/external/etk @@ -1 +1 @@ -Subproject commit 2059e5f06a95cb4aa02ef084b6f134f7d3ad000b +Subproject commit d2997292a5c1204d8f38a2d751c5fb416058dc10 diff --git a/external/ewolsa b/external/ewolsa index 7bad0ec9..9569402a 160000 --- a/external/ewolsa +++ b/external/ewolsa @@ -1 +1 @@ -Subproject commit 7bad0ec956e8bfd8eb06d8a55572bfe6012c2e44 +Subproject commit 9569402acee2fdbe6baf591a5db0fec940380f48 diff --git a/external/exml b/external/exml index 92ea8abb..970c050b 160000 --- a/external/exml +++ b/external/exml @@ -1 +1 @@ -Subproject commit 92ea8abb9e66eee0be8fa1b70dc23ed4374615d6 +Subproject commit 970c050bc2816f3f7f31a4a2cbde6b1eee88b0aa diff --git a/sources/ewol/Dimension.cpp b/sources/ewol/Dimension.cpp index dd7545a5..0b0f7e3a 100644 --- a/sources/ewol/Dimension.cpp +++ b/sources/ewol/Dimension.cpp @@ -31,7 +31,7 @@ static const float millimeterToCentimeter = 10.0f; static const float millimeterToKilometer = 1000000.0f; -void ewol::Dimension::init(void) { +void ewol::Dimension::init() { if (true == isInit) { return; } @@ -42,7 +42,7 @@ void ewol::Dimension::init(void) { isInit = true; } -void ewol::Dimension::unInit(void) { +void ewol::Dimension::unInit() { isInit = false; ratio.setValue(9999999,888888); invRatio.setValue(1.0f/ratio.x(),1.0f/ratio.y()); @@ -73,7 +73,7 @@ float ewol::Dimension::getWindowsDiag(enum ewol::Dimension::distance _type) { return size.length(); } -ewol::Dimension::Dimension(void) : +ewol::Dimension::Dimension() : m_data(0,0), m_type(ewol::Dimension::Pixel) { // notinh to do ... @@ -122,11 +122,11 @@ void ewol::Dimension::set(std::string _config) { EWOL_VERBOSE(" config dimention : \"" << _config << "\" == > " << *this ); } -ewol::Dimension::~Dimension(void) { +ewol::Dimension::~Dimension() { // nothing to do ... } -ewol::Dimension::operator std::string(void) const { +ewol::Dimension::operator std::string() const { std::string str; str = get(getType()); @@ -218,7 +218,7 @@ void ewol::Dimension::set(const vec2& _size, enum ewol::Dimension::distance _typ m_type = _type; } -vec2 ewol::Dimension::getPixel(void) const { +vec2 ewol::Dimension::getPixel() const { if (m_type!=ewol::Dimension::Pourcent) { return m_data; } else { @@ -229,7 +229,7 @@ vec2 ewol::Dimension::getPixel(void) const { } } -vec2 ewol::Dimension::getPourcent(void) const { +vec2 ewol::Dimension::getPourcent() const { if (m_type!=ewol::Dimension::Pourcent) { vec2 windDim = windowsSize.getPixel(); //EWOL_DEBUG(" windows dimention : " /*<< windowsSize*/ << " == > " << windDim << "px"); // ==> infinite loop ... @@ -240,27 +240,27 @@ vec2 ewol::Dimension::getPourcent(void) const { return vec2(m_data.x()*100.0f, m_data.y()*100.0f);; } -vec2 ewol::Dimension::getMeter(void) const { +vec2 ewol::Dimension::getMeter() const { return ewol::Dimension::getMillimeter()*millimeterToMeter; } -vec2 ewol::Dimension::getCentimeter(void) const { +vec2 ewol::Dimension::getCentimeter() const { return ewol::Dimension::getMillimeter()*millimeterToCentimeter; } -vec2 ewol::Dimension::getMillimeter(void) const { +vec2 ewol::Dimension::getMillimeter() const { return ewol::Dimension::getPixel()*invRatio; } -vec2 ewol::Dimension::getKilometer(void) const { +vec2 ewol::Dimension::getKilometer() const { return ewol::Dimension::getMillimeter()*millimeterToKilometer; } -vec2 ewol::Dimension::getInch(void) const { +vec2 ewol::Dimension::getInch() const { return ewol::Dimension::getMillimeter()*millimeterToInch; } -vec2 ewol::Dimension::getFoot(void) const { +vec2 ewol::Dimension::getFoot() const { return ewol::Dimension::getMillimeter()*millimeterToFoot; } diff --git a/sources/ewol/Dimension.h b/sources/ewol/Dimension.h index 8cff4e08..cbd2999a 100644 --- a/sources/ewol/Dimension.h +++ b/sources/ewol/Dimension.h @@ -37,7 +37,7 @@ namespace ewol { /** * @brief Constructor (default :0,0 mode pixel) */ - Dimension(void); + Dimension(); /** * @brief Constructor * @param[in] _size Requested dimention @@ -65,12 +65,12 @@ namespace ewol { /** * @brief Destructor */ - ~Dimension(void); + ~Dimension(); /** * @brief string cast : */ - operator std::string(void) const; + operator std::string() const; /** * @brief get the current dimention in requested type @@ -96,42 +96,42 @@ namespace ewol { * @brief get the current dimention in pixel * @return dimention in Pixel */ - vec2 getPixel(void) const; + vec2 getPixel() const; /** * @brief get the current dimention in Pourcent * @return dimention in Pourcent */ - vec2 getPourcent(void) const; + vec2 getPourcent() const; /** * @brief get the current dimention in Meter * @return dimention in Meter */ - vec2 getMeter(void) const; + vec2 getMeter() const; /** * @brief get the current dimention in Centimeter * @return dimention in Centimeter */ - vec2 getCentimeter(void) const; + vec2 getCentimeter() const; /** * @brief get the current dimention in Millimeter * @return dimention in Millimeter */ - vec2 getMillimeter(void) const; + vec2 getMillimeter() const; /** * @brief get the current dimention in Kilometer * @return dimention in Kilometer */ - vec2 getKilometer(void) const; + vec2 getKilometer() const; /** * @brief get the current dimention in Inch * @return dimention in Inch */ - vec2 getInch(void) const; + vec2 getInch() const; /** * @brief get the current dimention in Foot * @return dimention in Foot */ - vec2 getFoot(void) const; + vec2 getFoot() const; /***************************************************** * = assigment *****************************************************/ @@ -166,18 +166,18 @@ namespace ewol { * @breif get the dimension type * @return the type */ - enum distance getType(void) const { + enum distance getType() const { return m_type; }; public : // Global static access : /** * @brief basic init */ - static void init(void); + static void init(); /** * @brief basic un-init */ - static void unInit(void); + static void unInit(); /** * @brief set the Milimeter ratio for calculation * @param[in] Ratio Milimeter ration for the screen calculation interpolation diff --git a/sources/ewol/Padding.h b/sources/ewol/Padding.h index d9a23ced..1ca917ea 100644 --- a/sources/ewol/Padding.h +++ b/sources/ewol/Padding.h @@ -19,7 +19,7 @@ namespace ewol { private: float m_value[4]; //!< this represent the 4 padding value Left top right buttom (like css) public: - Padding(void) { } + Padding() { } Padding(float _xl, float _yt=0, float _xr=0, float _yb=0) { setValue(_xl, _yt, _xr, _yb); } @@ -30,31 +30,31 @@ namespace ewol { m_value[3] = _yb; } - float x(void) const { + float x() const { return m_value[0] + m_value[2]; } - float y(void) const { + float y() const { return m_value[1] + m_value[3]; } - float xLeft(void) const { + float xLeft() const { return m_value[0]; } void setXLeft(float _val) { m_value[0] = _val; } - float xRight(void) const { + float xRight() const { return m_value[2]; } void setXRight(float _val) { m_value[2] = _val; } - float yTop(void) const { + float yTop() const { return m_value[1]; } void setYTop(float _val) { m_value[1] = _val; } - float yButtom(void) const { + float yButtom() const { return m_value[3]; } void setYButtom(float _val) { diff --git a/sources/ewol/compositing/Area.cpp b/sources/ewol/compositing/Area.cpp index c15f1851..f1338fcf 100644 --- a/sources/ewol/compositing/Area.cpp +++ b/sources/ewol/compositing/Area.cpp @@ -28,12 +28,12 @@ ewol::compositing::Area::Area(const ivec2& _size) : loadProgram(); } -ewol::compositing::Area::~Area(void) { +ewol::compositing::Area::~Area() { ewol::resource::Texture::release(m_resource); ewol::resource::Program::release(m_GLprogram); } -void ewol::compositing::Area::loadProgram(void) { +void ewol::compositing::Area::loadProgram() { // get the shader resource : m_GLPosition = 0; m_GLprogram = ewol::resource::Program::keep("DATA:textured3D.prog"); @@ -76,7 +76,7 @@ void ewol::compositing::Area::draw(bool _disableDepthTest) { m_GLprogram->unUse(); } -void ewol::compositing::Area::clear(void) { +void ewol::compositing::Area::clear() { // call upper class ewol::Compositing::clear(); // reset Buffer : diff --git a/sources/ewol/compositing/Area.h b/sources/ewol/compositing/Area.h index 5c1a7bad..6e35d5c4 100644 --- a/sources/ewol/compositing/Area.h +++ b/sources/ewol/compositing/Area.h @@ -37,7 +37,7 @@ namespace ewol { /** * @brief load the openGL program and get all the ID needed */ - void loadProgram(void); + void loadProgram(); public: /** * @brief generic constructor @@ -47,7 +47,7 @@ namespace ewol { /** * @brief generic destructor */ - ~Area(void); + ~Area(); public: /** * @brief draw All the refistered text in the current element on openGL @@ -56,12 +56,12 @@ namespace ewol { /** * @brief clear alll the registered element in the current element */ - void clear(void); + void clear(); /** * @brief get the current display position (sometime needed in the gui control) * @return the current position. */ - const vec3& getPos(void) { + const vec3& getPos() { return m_position; }; /** @@ -90,10 +90,10 @@ namespace ewol { */ void print(const ivec2& _size); - egami::Image& get(void) { + egami::Image& get() { return m_resource->get(); }; - void flush(void) { + void flush() { m_resource->flush(); }; }; diff --git a/sources/ewol/compositing/Compositing.cpp b/sources/ewol/compositing/Compositing.cpp index 0ee3cebe..7f6f67c0 100644 --- a/sources/ewol/compositing/Compositing.cpp +++ b/sources/ewol/compositing/Compositing.cpp @@ -13,17 +13,17 @@ #include -ewol::Compositing::Compositing(void) { +ewol::Compositing::Compositing() { // nothing to do } -ewol::Compositing::~Compositing(void) { +ewol::Compositing::~Compositing() { // nothing to do } -void ewol::Compositing::resetMatrix(void) { +void ewol::Compositing::resetMatrix() { m_matrixApply.identity(); } @@ -43,7 +43,7 @@ void ewol::Compositing::scale(const vec3& _vect) { } -void ewol::Compositing::clear(void) { +void ewol::Compositing::clear() { m_matrixApply.identity(); } diff --git a/sources/ewol/compositing/Compositing.h b/sources/ewol/compositing/Compositing.h index bc0f8267..df149d6f 100644 --- a/sources/ewol/compositing/Compositing.h +++ b/sources/ewol/compositing/Compositing.h @@ -21,11 +21,11 @@ namespace ewol { /** * @brief generic constructor */ - Compositing(void); + Compositing(); /** * @brief Generic destructor */ - virtual ~Compositing(void); + virtual ~Compositing(); /** * @brief Virtal pure function that request the draw of all openGl elements */ @@ -33,11 +33,11 @@ namespace ewol { /** * @brief clear alll tre registered element in the current element */ - virtual void clear(void); + virtual void clear(); /** * @brief reset to the eye matrix the openGL mouving system */ - virtual void resetMatrix(void); + virtual void resetMatrix(); /** * @brief translate the current display of this element * @param[in] _vect The translation vector to apply at the transformation matrix diff --git a/sources/ewol/compositing/Drawing.cpp b/sources/ewol/compositing/Drawing.cpp index df6756f4..1f2e5aed 100644 --- a/sources/ewol/compositing/Drawing.cpp +++ b/sources/ewol/compositing/Drawing.cpp @@ -217,7 +217,7 @@ static void SutherlandHodgman(std::vector & input, std::vector & o } #endif -ewol::compositing::Drawing::Drawing(void) : +ewol::compositing::Drawing::Drawing() : m_position(0.0, 0.0, 0.0), m_clippingPosStart(0.0, 0.0, 0.0), m_clippingPosStop(0.0, 0.0, 0.0), @@ -237,11 +237,11 @@ ewol::compositing::Drawing::Drawing(void) : } } -ewol::compositing::Drawing::~Drawing(void) { +ewol::compositing::Drawing::~Drawing() { unLoadProgram(); } -void ewol::compositing::Drawing::generateTriangle(void) { +void ewol::compositing::Drawing::generateTriangle() { m_triElement = 0; m_coord.push_back(m_triangle[0]); @@ -272,15 +272,15 @@ void ewol::compositing::Drawing::setPoint(const vec3& _point) { } } -void ewol::compositing::Drawing::resetCount(void) { +void ewol::compositing::Drawing::resetCount() { m_triElement = 0; } -void ewol::compositing::Drawing::unLoadProgram(void) { +void ewol::compositing::Drawing::unLoadProgram() { ewol::resource::Program::release(m_GLprogram); } -void ewol::compositing::Drawing::loadProgram(void) { +void ewol::compositing::Drawing::loadProgram() { // remove previous loading ... in case unLoadProgram(); // oad the new ... @@ -316,7 +316,7 @@ void ewol::compositing::Drawing::draw(bool _disableDepthTest) { m_GLprogram->unUse(); } -void ewol::compositing::Drawing::clear(void) { +void ewol::compositing::Drawing::clear() { // call upper class ewol::Compositing::clear(); // reset Buffer : @@ -372,7 +372,7 @@ void ewol::compositing::Drawing::setThickness(float _thickness) { } } -void ewol::compositing::Drawing::addVertex(void) { +void ewol::compositing::Drawing::addVertex() { internalSetColor(m_color); setPoint(m_position); } diff --git a/sources/ewol/compositing/Drawing.h b/sources/ewol/compositing/Drawing.h index 1ddf4348..dd319d11 100644 --- a/sources/ewol/compositing/Drawing.h +++ b/sources/ewol/compositing/Drawing.h @@ -39,20 +39,20 @@ namespace ewol { /** * @brief Basic constructor */ - Drawing(void); + Drawing(); /** * @brief Basic destructor */ - ~Drawing(void); + ~Drawing(); private: /** * @brief load the openGL program and get all the ID needed */ - void loadProgram(void); + void loadProgram(); /** * @brief Un-Load the openGL program and get all the ID needed */ - void unLoadProgram(void); + void unLoadProgram(); float m_thickness; //!< when drawing line and other things int32_t m_triElement; //!< special counter of the single dot generated vec3 m_triangle[3]; //!< Register every system with a combinaison of tiangle @@ -61,11 +61,11 @@ namespace ewol { /** * @brief Lunch the generation of triangle */ - void generateTriangle(void); + void generateTriangle(); /** * @brief in case of some error the count can be reset */ - void resetCount(void); + void resetCount(); /** * @brief set the Color of the current triangle drawing * @param[in] _color Color to current dots generated @@ -85,12 +85,12 @@ namespace ewol { /** * @brief clear alll tre registered element in the current element */ - void clear(void); + void clear(); /** * @brief get the current display position (sometime needed in the gui control) * @return the current position. */ - const vec3& getPos(void) { + const vec3& getPos() { return m_position; }; /** @@ -124,7 +124,7 @@ namespace ewol { * @brief Get the foreground color of the font. * @return Foreground color. */ - const etk::Color<>& getColor(void) { + const etk::Color<>& getColor() { return m_color; }; /** @@ -138,7 +138,7 @@ namespace ewol { * @brief Get the background color of the font. * @return Background color. */ - const etk::Color<>& getColorBg(void) { + const etk::Color<>& getColorBg() { return m_colorBg; }; /** @@ -176,7 +176,7 @@ namespace ewol { /** * @brief add a point reference at the current position (this is a vertex reference at the current position */ - void addVertex(void); + void addVertex(); /** * @brief draw a line to a specific position * @param[in] _dest Position of the end of the line. diff --git a/sources/ewol/compositing/Image.cpp b/sources/ewol/compositing/Image.cpp index 7f8f59a0..7eabd9f2 100644 --- a/sources/ewol/compositing/Image.cpp +++ b/sources/ewol/compositing/Image.cpp @@ -34,13 +34,13 @@ ewol::compositing::Image::Image(const std::string& _imageName, bool _df) : loadProgram(); } -ewol::compositing::Image::~Image(void) { +ewol::compositing::Image::~Image() { ewol::resource::TextureFile::release(m_resource); ewol::resource::ImageDF::release(m_resourceDF); ewol::resource::Program::release(m_GLprogram); } -void ewol::compositing::Image::loadProgram(void) { +void ewol::compositing::Image::loadProgram() { // get the shader resource : m_GLPosition = 0; ewol::resource::Program::release(m_GLprogram); @@ -104,7 +104,7 @@ void ewol::compositing::Image::draw(bool _disableDepthTest) { m_GLprogram->unUse(); } -void ewol::compositing::Image::clear(void) { +void ewol::compositing::Image::clear() { // call upper class ewol::Compositing::clear(); // reset Buffer : @@ -287,12 +287,12 @@ void ewol::compositing::Image::setSource(const std::string& _newFile, const vec2 } } -bool ewol::compositing::Image::hasSources(void) { +bool ewol::compositing::Image::hasSources() { return (m_resource != NULL || m_resourceDF != NULL); } -vec2 ewol::compositing::Image::getRealSize(void) { +vec2 ewol::compositing::Image::getRealSize() { if ( m_resource == NULL && m_resourceDF == NULL) { return vec2(0,0); diff --git a/sources/ewol/compositing/Image.h b/sources/ewol/compositing/Image.h index f25f4d71..f723847a 100644 --- a/sources/ewol/compositing/Image.h +++ b/sources/ewol/compositing/Image.h @@ -46,7 +46,7 @@ namespace ewol { /** * @brief load the openGL program and get all the ID needed */ - void loadProgram(void); + void loadProgram(); public: /** * @brief generic constructor @@ -57,7 +57,7 @@ namespace ewol { /** * @brief generic destructor */ - virtual ~Image(void); + virtual ~Image(); public: /** * @brief draw All the refistered text in the current element on openGL @@ -67,12 +67,12 @@ namespace ewol { /** * @brief clear alll tre registered element in the current element */ - void clear(void); + void clear(); /** * @brief get the current display position (sometime needed in the gui control) * @return the current position. */ - const vec3& getPos(void) { + const vec3& getPos() { return m_position; }; /** @@ -164,12 +164,12 @@ namespace ewol { * @brief Sometimes the user declare an image but not allocate the ressources all the time, this is to know it .. * @return the validity od the resources. */ - bool hasSources(void); + bool hasSources(); /** * @brief get the source image registered size in the file (<0 when multiple size image) * @return tre image registered size */ - vec2 getRealSize(void); + vec2 getRealSize(); public: /** * @brief Set render mode of the image @@ -180,7 +180,7 @@ namespace ewol { * @brief Get the render methode. * @return The render mode of the image. */ - bool getDistanceFieldMode(void) const { + bool getDistanceFieldMode() const { return m_distanceFieldMode; } }; diff --git a/sources/ewol/compositing/Shaper.cpp b/sources/ewol/compositing/Shaper.cpp index a4929e83..e972462a 100644 --- a/sources/ewol/compositing/Shaper.cpp +++ b/sources/ewol/compositing/Shaper.cpp @@ -52,11 +52,11 @@ ewol::compositing::Shaper::Shaper(const std::string& _shaperName) : loadProgram(); } -ewol::compositing::Shaper::~Shaper(void) { +ewol::compositing::Shaper::~Shaper() { unLoadProgram(); } -void ewol::compositing::Shaper::unLoadProgram(void) { +void ewol::compositing::Shaper::unLoadProgram() { ewol::resource::Program::release(m_GLprogram); ewol::resource::TextureFile::release(m_resourceTexture); ewol::resource::ConfigFile::release(m_config); @@ -79,7 +79,7 @@ void ewol::compositing::Shaper::unLoadProgram(void) { m_listAssiciatedId.clear(); } -void ewol::compositing::Shaper::loadProgram(void) { +void ewol::compositing::Shaper::loadProgram() { if (m_name == "") { EWOL_DEBUG("no Shaper set for loading resources ..."); return; @@ -207,7 +207,7 @@ void ewol::compositing::Shaper::draw(bool _disableDepthTest) { m_GLprogram->unUse(); } -void ewol::compositing::Shaper::clear(void) { +void ewol::compositing::Shaper::clear() { // nothing to do ... m_propertySize = vec2(0,0); m_propertyOrigin = vec2(0,0); @@ -566,11 +566,11 @@ void ewol::compositing::Shaper::setShape(const vec2& _origin, const vec2& _size, } } -ewol::Padding ewol::compositing::Shaper::getPadding(void) { +ewol::Padding ewol::compositing::Shaper::getPadding() { return getPaddingOut() + getBorder() + getPaddingIn(); } -ewol::Padding ewol::compositing::Shaper::getPaddingIn(void) { +ewol::Padding ewol::compositing::Shaper::getPaddingIn() { ewol::Padding padding(0,0,0,0); if (m_config != NULL) { padding.setValue(m_config->getNumber(m_confIdPaddingIn[shaperPosLeft]), @@ -581,7 +581,7 @@ ewol::Padding ewol::compositing::Shaper::getPaddingIn(void) { return padding; } -ewol::Padding ewol::compositing::Shaper::getPaddingOut(void) { +ewol::Padding ewol::compositing::Shaper::getPaddingOut() { ewol::Padding padding(0,0,0,0); if (m_config != NULL) { padding.setValue(m_config->getNumber(m_confIdPaddingOut[shaperPosLeft]), @@ -592,7 +592,7 @@ ewol::Padding ewol::compositing::Shaper::getPaddingOut(void) { return padding; } -ewol::Padding ewol::compositing::Shaper::getBorder(void) { +ewol::Padding ewol::compositing::Shaper::getBorder() { ewol::Padding padding(0,0,0,0); if (m_config != NULL) { padding.setValue(m_config->getNumber(m_confIdBorder[shaperPosLeft]), @@ -610,7 +610,7 @@ void ewol::compositing::Shaper::setSource(const std::string& _newFile) { loadProgram(); } -bool ewol::compositing::Shaper::hasSources(void) { +bool ewol::compositing::Shaper::hasSources() { return m_GLprogram!=NULL; } diff --git a/sources/ewol/compositing/Shaper.h b/sources/ewol/compositing/Shaper.h index a9622fc7..2a57c434 100644 --- a/sources/ewol/compositing/Shaper.h +++ b/sources/ewol/compositing/Shaper.h @@ -87,11 +87,11 @@ namespace ewol { /** * @brief load the openGL program and get all the ID needed */ - void loadProgram(void); + void loadProgram(); /** * @brief Un-Load the openGL program and get all the ID needed */ - void unLoadProgram(void); + void unLoadProgram(); public: /** * @brief generic constructor @@ -101,7 +101,7 @@ namespace ewol { /** * @brief generic destructor */ - ~Shaper(void); + ~Shaper(); public: /** * @brief draw All the refistered text in the current element on openGL @@ -110,7 +110,7 @@ namespace ewol { /** * @brief clear alll tre registered element in the current element */ - void clear(void); + void clear(); /** * @brief change the current status in an other * @param[in] _newStatusId the next new status requested @@ -122,21 +122,21 @@ namespace ewol { * @brief get the current displayed status of the shaper * @return The Status Id */ - int32_t getCurrentDisplayedStatus(void) { + int32_t getCurrentDisplayedStatus() { return m_stateNew; }; /** * @brief get the next displayed status of the shaper * @return The next status Id (-1 if no status in next) */ - int32_t getNextDisplayedStatus(void) { + int32_t getNextDisplayedStatus() { return m_nextStatusRequested; }; /** * @brief get the current trasion status * @return value of the transition status (0.0f when no activity) */ - float getTransitionStatus(void) { + float getTransitionStatus() { return m_stateTransition; }; /** @@ -150,14 +150,14 @@ namespace ewol { * @brief get the padding declared by the user in the config file * @return the padding property */ - ewol::Padding getPadding(void); - ewol::Padding getPaddingIn(void); - ewol::Padding getPaddingOut(void); + ewol::Padding getPadding(); + ewol::Padding getPaddingIn(); + ewol::Padding getPaddingOut(); /** * @brief get the padding declared by the user in the config file * @return the padding property */ - ewol::Padding getBorder(void); + ewol::Padding getBorder(); /** * @brief change the shaper Source * @param[in] _newFile New file of the shaper @@ -167,14 +167,14 @@ namespace ewol { * @brief get the shaper file Source * @return the shapper file name */ - const std::string& getSource(void) const { + const std::string& getSource() const { return m_name; }; /** * @brief Sometimes the user declare an image but not allocate the ressources all the time, this is to know it .. * @return the validity od the resources. */ - bool hasSources(void); + bool hasSources(); public: /** * @brief set the shape property: diff --git a/sources/ewol/compositing/Text.cpp b/sources/ewol/compositing/Text.cpp index ac2ec358..c7a160ea 100644 --- a/sources/ewol/compositing/Text.cpp +++ b/sources/ewol/compositing/Text.cpp @@ -21,7 +21,7 @@ ewol::compositing::Text::Text(const std::string& _fontName, int32_t _fontSize) : } -ewol::compositing::Text::~Text(void) { +ewol::compositing::Text::~Text() { ewol::resource::TexturedFont::release(m_font); } @@ -106,14 +106,14 @@ void ewol::compositing::Text::drawD(bool _disableDepthTest) { m_GLprogram->unUse(); } -float ewol::compositing::Text::getSize(void) { +float ewol::compositing::Text::getSize() { if (m_font == NULL) { EWOL_WARNING("no font..."); return 1.0f; } return m_font->getFontSize(); } -float ewol::compositing::Text::getHeight(void) { +float ewol::compositing::Text::getHeight() { if (m_font == NULL) { EWOL_WARNING("no font..."); return 10.0f; diff --git a/sources/ewol/compositing/Text.h b/sources/ewol/compositing/Text.h index 3116d25d..c1226e69 100644 --- a/sources/ewol/compositing/Text.h +++ b/sources/ewol/compositing/Text.h @@ -36,15 +36,15 @@ namespace ewol { /** * @brief generic destructor */ - virtual ~Text(void); + virtual ~Text(); public: virtual void drawD(bool _disableDepthTest); virtual void drawMT(const mat4& _transformationMatrix, bool _enableDepthTest); protected: float m_size; public: - virtual float getHeight(void); - virtual float getSize(void); + virtual float getHeight(); + virtual float getSize(); virtual ewol::GlyphProperty * getGlyphPointer(char32_t _charcode); public: diff --git a/sources/ewol/compositing/TextBase.cpp b/sources/ewol/compositing/TextBase.cpp index 066b27ea..0a28774a 100644 --- a/sources/ewol/compositing/TextBase.cpp +++ b/sources/ewol/compositing/TextBase.cpp @@ -46,7 +46,7 @@ ewol::compositing::TextBase::TextBase(const std::string& _shaderName, bool _load } -ewol::compositing::TextBase::~TextBase(void) { +ewol::compositing::TextBase::~TextBase() { ewol::resource::Program::release(m_GLprogram); } @@ -87,7 +87,7 @@ void ewol::compositing::TextBase::scale(const vec3& _vect) { m_vectorialDraw.scale(_vect); } -void ewol::compositing::TextBase::clear(void) { +void ewol::compositing::TextBase::clear() { // call upper class ewol::Compositing::clear(); // remove sub draw system @@ -100,7 +100,7 @@ void ewol::compositing::TextBase::clear(void) { reset(); } -void ewol::compositing::TextBase::reset(void) { +void ewol::compositing::TextBase::reset() { m_position = vec3(0,0,0); m_clippingPosStart = vec3(0,0,0); m_clippingPosStop = vec3(0,0,0); @@ -382,7 +382,7 @@ void ewol::compositing::TextBase::printHTML(const std::string& _text) { EWOL_ERROR( "can not load XML: main node not find: \"body\""); return; } - (void)parseHtmlNode(bodyNode); + parseHtmlNode(bodyNode); htmlFlush(); } @@ -410,7 +410,7 @@ void ewol::compositing::TextBase::printHTML(const std::u32string& _text) { EWOL_ERROR( "can not load XML: main node not find: \"body\""); return; } - (void)parseHtmlNode(bodyNode); + parseHtmlNode(bodyNode); htmlFlush(); } @@ -787,7 +787,7 @@ void ewol::compositing::TextBase::print(const std::u32string& _text, const std:: -void ewol::compositing::TextBase::forceLineReturn(void) { +void ewol::compositing::TextBase::forceLineReturn() { // reset position : setPos(vec3(m_startTextpos, m_position.y() - getHeight(), 0) ); } @@ -801,11 +801,11 @@ void ewol::compositing::TextBase::setTextAlignement(float _startTextpos, float _ } } -enum ewol::compositing::aligneMode ewol::compositing::TextBase::getAlignement(void) { +enum ewol::compositing::aligneMode ewol::compositing::TextBase::getAlignement() { return m_alignement; } -void ewol::compositing::TextBase::disableAlignement(void) { +void ewol::compositing::TextBase::disableAlignement() { m_alignement = alignDisable; } @@ -1071,7 +1071,7 @@ void ewol::compositing::TextBase::htmlAddData(const std::u32string& _data) { } } -void ewol::compositing::TextBase::htmlFlush(void) { +void ewol::compositing::TextBase::htmlFlush() { if (m_htmlCurrrentLine.size()>0) { print(m_htmlCurrrentLine, m_htmlDecoration); } @@ -1079,7 +1079,7 @@ void ewol::compositing::TextBase::htmlFlush(void) { m_htmlDecoration.clear(); } -void ewol::compositing::TextBase::disableCursor(void) { +void ewol::compositing::TextBase::disableCursor() { m_selectionStartPos = -100; m_cursorPos = -100; } diff --git a/sources/ewol/compositing/TextBase.h b/sources/ewol/compositing/TextBase.h index f131d428..763a3adb 100644 --- a/sources/ewol/compositing/TextBase.h +++ b/sources/ewol/compositing/TextBase.h @@ -29,7 +29,7 @@ namespace ewol { etk::Color<> m_colorBg; //!< display background color etk::Color<> m_colorFg; //!< display foreground color enum ewol::font::mode m_mode; //!< display mode Regular/Bold/Italic/BoldItalic - TextDecoration(void) { + TextDecoration() { m_colorBg = etk::color::blue; m_colorBg = etk::color::green; m_mode = ewol::font::Regular; @@ -48,7 +48,7 @@ namespace ewol { protected: ewol::compositing::Drawing m_vectorialDraw; //!< This is used to draw background selection and other things ... public: - virtual ewol::compositing::Drawing& getDrawing(void) { + virtual ewol::compositing::Drawing& getDrawing() { return m_vectorialDraw; }; protected: @@ -105,7 +105,7 @@ namespace ewol { /** * @brief generic destructor */ - virtual ~TextBase(void); + virtual ~TextBase(); public: // Derived function void translate(const vec3& _vect); void rotate(const vec3& _vect, float _angle); @@ -130,16 +130,16 @@ namespace ewol { /** * @brief clear all the registered element in the current element */ - virtual void clear(void); + virtual void clear(); /** * @brief clear all the intermediate result detween 2 prints */ - virtual void reset(void); + virtual void reset(); /** * @brief get the current display position (sometime needed in the gui control) * @return the current position. */ - const vec3& getPos(void) { + const vec3& getPos() { return m_position; }; /** @@ -239,11 +239,11 @@ namespace ewol { * @brief get the current font mode * @return The font mode applied */ - enum ewol::font::mode getFontMode(void) { + enum ewol::font::mode getFontMode() { return m_mode; }; - virtual float getHeight(void) = 0; - virtual float getSize(void) = 0; + virtual float getHeight() = 0; + virtual float getSize() = 0; virtual ewol::GlyphProperty * getGlyphPointer(char32_t _charcode) = 0; /** * @brief enable or disable the bold mode @@ -351,7 +351,7 @@ namespace ewol { /** * @brief This generate the line return == > it return to the alignement position start and at the correct line position ==> it might be use to not know the line height */ - void forceLineReturn(void); + void forceLineReturn(); protected: /** * @brief This parse a tinyXML node (void pointer to permit to hide tiny XML in include). @@ -370,12 +370,12 @@ namespace ewol { /** * @brief disable the alignement system */ - void disableAlignement(void); + void disableAlignement(); /** * @brief get the current alignement property * @return the curent alignement type */ - enum ewol::compositing::aligneMode getAlignement(void); + enum ewol::compositing::aligneMode getAlignement(); /** * @brief calculate a theoric text size * @param[in] _text The string to calculate dimention. @@ -446,12 +446,12 @@ namespace ewol { /** * @brief draw the current line */ - void htmlFlush(void); + void htmlFlush(); public: /** * @brief remove the cursor display */ - void disableCursor(void); + void disableCursor(); /** * @brief set a cursor at a specific position: * @param[in] _cursorPos id of the cursor position diff --git a/sources/ewol/compositing/TextDF.cpp b/sources/ewol/compositing/TextDF.cpp index d3cc980b..b574dc5f 100644 --- a/sources/ewol/compositing/TextDF.cpp +++ b/sources/ewol/compositing/TextDF.cpp @@ -25,7 +25,7 @@ ewol::compositing::TextDF::TextDF(const std::string& _fontName, int32_t _fontSiz } -ewol::compositing::TextDF::~TextDF(void) { +ewol::compositing::TextDF::~TextDF() { ewol::resource::DistanceFieldFont::release(m_fontDF); } @@ -114,7 +114,7 @@ void ewol::compositing::TextDF::drawD(bool _disableDepthTest) { m_GLprogram->unUse(); } -void ewol::compositing::TextDF::clear(void) { +void ewol::compositing::TextDF::clear() { ewol::compositing::TextBase::clear(); m_glyphLevel.clear(); } @@ -126,7 +126,7 @@ void ewol::compositing::TextDF::loadProgram(const std::string& _shaderName) { } -float ewol::compositing::TextDF::getHeight(void) { +float ewol::compositing::TextDF::getHeight() { if (m_fontDF == NULL) { EWOL_WARNING("no font..."); return 1; diff --git a/sources/ewol/compositing/TextDF.h b/sources/ewol/compositing/TextDF.h index 0e1efed8..0f13b80b 100644 --- a/sources/ewol/compositing/TextDF.h +++ b/sources/ewol/compositing/TextDF.h @@ -37,7 +37,7 @@ namespace ewol { /** * @brief generic destructor */ - virtual ~TextDF(void); + virtual ~TextDF(); public: /** * @brief Calculate size to be at the best size for a render in this special size. @@ -46,14 +46,14 @@ namespace ewol { */ void updateSizeToRender(const vec2& _size); public: - virtual void clear(void); + virtual void clear(); virtual void drawD(bool _disableDepthTest); virtual void drawMT(const mat4& _transformationMatrix, bool _enableDepthTest); protected: float m_size; public: - virtual float getHeight(void); - virtual float getSize(void) { + virtual float getHeight(); + virtual float getSize() { return m_size; } virtual void setSize(float _size) { diff --git a/sources/ewol/context/Android/Context.cpp b/sources/ewol/context/Android/Context.cpp index 0240c44b..2336932f 100644 --- a/sources/ewol/context/Android/Context.cpp +++ b/sources/ewol/context/Android/Context.cpp @@ -21,7 +21,7 @@ -int64_t ewol::getTime(void) { +int64_t ewol::getTime() { struct timeval now; gettimeofday(&now, NULL); //EWOL_VERBOSE("current time : " << now.tv_sec << "s " << now.tv_usec << "us"); @@ -275,7 +275,7 @@ class AndroidContext : public ewol::Context { } } - ~AndroidContext(void) { + ~AndroidContext() { // TODO ... } @@ -284,12 +284,12 @@ class AndroidContext : public ewol::Context { m_javaObjectEwolCallback = NULL; } - int32_t run(void) { + int32_t run() { // might never be called !!! return -1; } - void stop(void) { + void stop() { EWOL_DEBUG("C->java : send message to the java : STOP REQUESTED"); int status; if(!java_attach_current_thread(&status)) { @@ -357,7 +357,7 @@ class AndroidContext : public ewol::Context { break; } } - int32_t audioGetDeviceCount(void) { + int32_t audioGetDeviceCount() { // Request the clipBoard : EWOL_DEBUG("C->java : audio get device count"); if (m_javaApplicationType == appl_application) { @@ -504,10 +504,10 @@ class AndroidContext : public ewol::Context { java_check_exception(m_JavaVirtualMachinePointer); java_detach_current_thread(status); } - void keyboardShow(void) { + void keyboardShow() { sendJavaKeyboardUpdate(JNI_TRUE); }; - void keyboardHide(void) { + void keyboardHide() { sendJavaKeyboardUpdate(JNI_FALSE); }; diff --git a/sources/ewol/context/ConfigFont.cpp b/sources/ewol/context/ConfigFont.cpp index 2a47236f..512a2d15 100644 --- a/sources/ewol/context/ConfigFont.cpp +++ b/sources/ewol/context/ConfigFont.cpp @@ -12,7 +12,7 @@ #undef __class__ #define __class__ "context::ConfigFont" -ewol::context::ConfigFont::ConfigFont(void) : +ewol::context::ConfigFont::ConfigFont() : m_folder("DATA:fonts"), m_name("Arial;Helvetica"), m_size(10), @@ -20,7 +20,7 @@ ewol::context::ConfigFont::ConfigFont(void) : ewol::resource::freeTypeInit(); } -ewol::context::ConfigFont::~ConfigFont(void) { +ewol::context::ConfigFont::~ConfigFont() { // UnInit FreeTypes ewol::resource::freeTypeUnInit(); } diff --git a/sources/ewol/context/ConfigFont.h b/sources/ewol/context/ConfigFont.h index 667e4509..1035784c 100644 --- a/sources/ewol/context/ConfigFont.h +++ b/sources/ewol/context/ConfigFont.h @@ -18,8 +18,8 @@ namespace ewol { /** * Constructor / destructor */ - ConfigFont(void); - ~ConfigFont(void); + ConfigFont(); + ~ConfigFont(); private: std::string m_folder; public: @@ -34,7 +34,7 @@ namespace ewol { * @brief get the default font folder. * @return The default font folder. */ - const std::string& getFolder(void) { + const std::string& getFolder() { return m_folder; }; private: @@ -51,14 +51,14 @@ namespace ewol { * @brief get the current default font name * @raturn a reference on the font name string */ - const std::string& getName(void) { + const std::string& getName() { return m_name; }; /** * @brief get the default font size. * @return the font size. */ - int32_t getSize(void) { + int32_t getSize() { return m_size; }; private: @@ -75,7 +75,7 @@ namespace ewol { * @brief get the use of internal/external Font * @return true to enable search of internal data. */ - bool getUseExternal(void) { + bool getUseExternal() { return m_useExternal; }; }; diff --git a/sources/ewol/context/Context.cpp b/sources/ewol/context/Context.cpp index c75c5ea9..f06356a0 100644 --- a/sources/ewol/context/Context.cpp +++ b/sources/ewol/context/Context.cpp @@ -37,14 +37,14 @@ * @note due ti the fact that the system can be called for multiple instance, for naw we just limit the acces to one process at a time. * @return the main inteface Mutex */ -static etk::Mutex& mutexInterface(void) { +static etk::Mutex& mutexInterface() { static etk::Mutex s_interfaceMutex; return s_interfaceMutex; } static ewol::Context* l_curentInterface=NULL; -ewol::Context& ewol::getContext(void) { +ewol::Context& ewol::getContext() { #if DEBUG_LEVEL > 2 if(NULL == l_curentInterface){ EWOL_CRITICAL("[CRITICAL] try acces at an empty interface"); @@ -65,7 +65,7 @@ void ewol::Context::setInitImage(const std::string& _fileName) { * @brief set the curent interface. * @note this lock the main mutex */ -void ewol::Context::lockContext(void) { +void ewol::Context::lockContext() { mutexInterface().lock(); l_curentInterface = this; } @@ -74,7 +74,7 @@ void ewol::Context::lockContext(void) { * @brief set the curent interface at NULL. * @note this un-lock the main mutex */ -void ewol::Context::unLockContext(void) { +void ewol::Context::unLockContext() { l_curentInterface = NULL; mutexInterface().unLock(); } @@ -116,7 +116,7 @@ namespace ewol { enum ewol::key::keyboard keyboardMove; ewol::key::Special keyboardSpecial; - eSystemMessage(void) : + eSystemMessage() : TypeMessage(msgNone), clipboardID(ewol::context::clipBoard::clipboardStd), inputType(ewol::key::typeUnknow), @@ -143,11 +143,11 @@ void ewol::Context::inputEventGrabPointer(ewol::Widget* _widget) { m_input.grabPointer(_widget); } -void ewol::Context::inputEventUnGrabPointer(void) { +void ewol::Context::inputEventUnGrabPointer() { m_input.unGrabPointer(); } -void ewol::Context::processEvents(void) { +void ewol::Context::processEvents() { int32_t nbEvent = 0; //EWOL_DEBUG(" ******** Event"); ewol::eSystemMessage* data = NULL; @@ -373,7 +373,7 @@ ewol::Context::Context(int32_t _argc, const char* _argv[]) : EWOL_INFO(" == > Ewol system init (END)"); } -ewol::Context::~Context(void) { +ewol::Context::~Context() { EWOL_INFO(" == > Ewol system Un-Init (BEGIN)"); // TODO : Clean the message list ... // set the curent interface : @@ -395,7 +395,7 @@ ewol::Context::~Context(void) { EWOL_INFO(" == > Ewol system Un-Init (END)"); } -void ewol::Context::requestUpdateSize(void) { +void ewol::Context::requestUpdateSize() { ewol::eSystemMessage *data = new ewol::eSystemMessage(); if (data == NULL) { EWOL_ERROR("allocationerror of message"); @@ -515,7 +515,7 @@ void ewol::Context::OS_SetKeyboardMove(ewol::key::Special& _special, m_msgSystem.post(data); } -void ewol::Context::OS_Hide(void) { +void ewol::Context::OS_Hide() { ewol::eSystemMessage *data = new ewol::eSystemMessage(); if (data == NULL) { EWOL_ERROR("allocationerror of message"); @@ -525,7 +525,7 @@ void ewol::Context::OS_Hide(void) { m_msgSystem.post(data); } -void ewol::Context::OS_Show(void) { +void ewol::Context::OS_Show() { ewol::eSystemMessage *data = new ewol::eSystemMessage(); if (data == NULL) { EWOL_ERROR("allocationerror of message"); @@ -653,11 +653,11 @@ void ewol::Context::onObjectRemove(ewol::Object * _removeObject) { m_input.onObjectRemove(_removeObject); } -void ewol::Context::resetIOEvent(void) { +void ewol::Context::resetIOEvent() { m_input.newLayerSet(); } -void ewol::Context::OS_OpenGlContextDestroy(void) { +void ewol::Context::OS_OpenGlContextDestroy() { m_resourceManager.contextHasBeenDestroyed(); } @@ -673,14 +673,14 @@ void ewol::Context::setWindows(ewol::widget::Windows* _windows) { forceRedrawAll(); } -void ewol::Context::forceRedrawAll(void) { +void ewol::Context::forceRedrawAll() { if (m_windowsCurrent == NULL) { return; } m_windowsCurrent->calculateSize(vec2(m_windowsSize.x(), m_windowsSize.y())); } -void ewol::Context::OS_Stop(void) { +void ewol::Context::OS_Stop() { // set the curent interface : lockContext(); EWOL_INFO("OS_Stop..."); @@ -691,7 +691,7 @@ void ewol::Context::OS_Stop(void) { unLockContext(); } -void ewol::Context::OS_Suspend(void) { +void ewol::Context::OS_Suspend() { // set the curent interface : lockContext(); EWOL_INFO("OS_Suspend..."); @@ -703,7 +703,7 @@ void ewol::Context::OS_Suspend(void) { unLockContext(); } -void ewol::Context::OS_Resume(void) { +void ewol::Context::OS_Resume() { // set the curent interface : lockContext(); EWOL_INFO("OS_Resume..."); @@ -715,7 +715,7 @@ void ewol::Context::OS_Resume(void) { // release the curent interface : unLockContext(); } -void ewol::Context::OS_Foreground(void) { +void ewol::Context::OS_Foreground() { // set the curent interface : lockContext(); EWOL_INFO("OS_Foreground..."); @@ -726,7 +726,7 @@ void ewol::Context::OS_Foreground(void) { unLockContext(); } -void ewol::Context::OS_Background(void) { +void ewol::Context::OS_Background() { // set the curent interface : lockContext(); EWOL_INFO("OS_Background..."); @@ -738,7 +738,7 @@ void ewol::Context::OS_Background(void) { } -void ewol::Context::stop(void) { +void ewol::Context::stop() { } @@ -750,11 +750,11 @@ void ewol::Context::setPos(const vec2& _pos) { EWOL_INFO("setPos: NOT implemented ..."); } -void ewol::Context::hide(void) { +void ewol::Context::hide() { EWOL_INFO("hide: NOT implemented ..."); }; -void ewol::Context::show(void) { +void ewol::Context::show() { EWOL_INFO("show: NOT implemented ..."); } @@ -762,12 +762,12 @@ void ewol::Context::setTitle(const std::string& _title) { EWOL_INFO("setTitle: NOT implemented ..."); } -void ewol::Context::keyboardShow(void) { +void ewol::Context::keyboardShow() { EWOL_INFO("keyboardShow: NOT implemented ..."); } -void ewol::Context::keyboardHide(void) { +void ewol::Context::keyboardHide() { EWOL_INFO("keyboardHide: NOT implemented ..."); } diff --git a/sources/ewol/context/Context.h b/sources/ewol/context/Context.h index ac133474..26f6e4b6 100644 --- a/sources/ewol/context/Context.h +++ b/sources/ewol/context/Context.h @@ -41,47 +41,47 @@ namespace ewol { private: ewol::context::CommandLine m_commandLine; //!< Start command line information public: - ewol::context::CommandLine& getCmd(void) { + ewol::context::CommandLine& getCmd() { return m_commandLine; }; private: ewol::context::ConfigFont m_configFont; //!< global font configuration public: - ewol::context::ConfigFont& getFontDefault(void) { + ewol::context::ConfigFont& getFontDefault() { return m_configFont; }; private: ewol::widget::Manager m_widgetManager; //!< global widget manager public: - ewol::widget::Manager& getWidgetManager(void) { + ewol::widget::Manager& getWidgetManager() { return m_widgetManager; }; private: ewol::object::Manager m_objectManager; //!< Object Manager main instance public: - ewol::object::Manager& getEObjectManager(void) { + ewol::object::Manager& getEObjectManager() { return m_objectManager; }; private: ewol::resource::Manager m_resourceManager; //!< global resources Manager public: - ewol::resource::Manager& getResourcesManager(void) { + ewol::resource::Manager& getResourcesManager() { return m_resourceManager; }; public: Context(int32_t _argc=0, const char* _argv[]=NULL); - virtual ~Context(void); + virtual ~Context(); protected: /** * @brief set the curent interface. * @note this lock the main mutex */ - void lockContext(void); + void lockContext(); /** * @brief set the curent interface at NULL. * @note this un-lock the main mutex */ - void unLockContext(void); + void unLockContext(); private: int64_t m_previousDisplayTime; // this is to limit framerate ... in case... ewol::context::InputManager m_input; @@ -94,7 +94,7 @@ namespace ewol { /** * @brief Processing all the event arrived ... (commoly called in draw function) */ - void processEvents(void); + void processEvents(); public: virtual void setArchiveDir(int _mode, const char* _str); @@ -116,22 +116,22 @@ namespace ewol { /** * @brief The current context is suspended */ - virtual void OS_Suspend(void); + virtual void OS_Suspend(); /** * @brief The current context is resumed */ - virtual void OS_Resume(void); + virtual void OS_Resume(); /** * @brief The current context is set in foreground (framerate is maximum speed) */ - virtual void OS_Foreground(void); + virtual void OS_Foreground(); /** * @brief The current context is set in background (framerate is slowing down (max fps)/5 # 4fps) */ - virtual void OS_Background(void); + virtual void OS_Background(); - void requestUpdateSize(void); + void requestUpdateSize(); // return true if a flush is needed bool OS_Draw(bool _displayEveryTime); @@ -144,19 +144,19 @@ namespace ewol { /** * @brief reset event management for the IO like Input ou Mouse or keyborad */ - void resetIOEvent(void); + void resetIOEvent(); /** * @brief The OS inform that the openGL constext has been destroy == > use to automaticly reload the texture and other thinks ... */ - void OS_OpenGlContextDestroy(void); + void OS_OpenGlContextDestroy(); /** * @brief The OS Inform that the Window has been killed */ - void OS_Stop(void); + void OS_Stop(); /** * @brief The application request that the Window will be killed */ - virtual void stop(void); + virtual void stop(); private: ewol::widget::Windows* m_windowsCurrent; //!< curent displayed windows public: @@ -169,7 +169,7 @@ namespace ewol { * @brief get the current windows that is displayed * @return the current handle on the windows (can be null) */ - ewol::widget::Windows* getWindows(void) { + ewol::widget::Windows* getWindows() { return m_windowsCurrent; }; private: @@ -179,7 +179,7 @@ namespace ewol { * @brief get the current windows size * @return the current size ... */ - const vec2& getSize(void) { + const vec2& getSize() { return m_windowsSize; }; /** @@ -205,23 +205,23 @@ namespace ewol { /** * @brief The OS inform that the Windows is now Hidden. */ - void OS_Hide(void); + void OS_Hide(); /** * @brief The Application request that the Windows will be Hidden. */ - virtual void hide(void); + virtual void hide(); /** * @brief The OS inform that the Windows is now visible. */ - void OS_Show(void); + void OS_Show(); /** * @brief The Application request that the Windows will be visible. */ - virtual void show(void); + virtual void show(); /** * @brief Redraw all the windows */ - void forceRedrawAll(void); + void forceRedrawAll(); // TODO : Later ... /** @@ -238,16 +238,16 @@ namespace ewol { /** * @brief This fonction un-lock the pointer properties to move in relative instead of absolute */ - void inputEventUnGrabPointer(void); + void inputEventUnGrabPointer(); /** * @brief display the virtal keyboard (for touch system only) */ - virtual void keyboardShow(void); + virtual void keyboardShow(); /** * @brief Hide the virtal keyboard (for touch system only) */ - virtual void keyboardHide(void); + virtual void keyboardHide(); /** * @brief Inform the Gui that we want to have a copy of the clipboard @@ -300,14 +300,14 @@ namespace ewol { * @note : must be implemented in all system OS implementation * @return The curent time of the process */ - static int64_t getTime(void); + static int64_t getTime(); #if defined(__TARGET_OS__Android) public: typedef void (*AndroidAudioCallback)(void* _data, int32_t _size, void* _userData); // Android specific audio interface : - virtual int32_t audioGetDeviceCount(void) { + virtual int32_t audioGetDeviceCount() { return 0; } virtual std::string audioGetDeviceProperty(int32_t _idDevice) { @@ -364,7 +364,7 @@ namespace ewol { * @brief From everyware in the program, we can get the context inteface. * @return current reference on the instance. */ - Context& getContext(void); + Context& getContext(); }; //!< must be define in CPP by the application ... this are the main init and unInit of the Application diff --git a/sources/ewol/context/Fps.h b/sources/ewol/context/Fps.h index 4f16c20e..58727e98 100644 --- a/sources/ewol/context/Fps.h +++ b/sources/ewol/context/Fps.h @@ -56,13 +56,13 @@ namespace ewol { /** * @brief Destructor */ - ~Fps(void) { + ~Fps() { } /** * @brief this might be call every time a diplay start */ - void tic(void) { + void tic() { int64_t currentTime = ewol::getTime(); ticTime = currentTime; nbCallTime++; @@ -98,14 +98,14 @@ namespace ewol { /** * @brief this might be call when a display is really done */ - void incrementCounter(void) { + void incrementCounter() { nbDisplayTime++; drwingDone = true; } /** * @brief draw debug display ... */ - void draw(void) { + void draw() { if (true == display) { if (nbDisplayTime>0) { EWOL_INFO(m_displayName << " : Active : " diff --git a/sources/ewol/context/IOs/Context.cpp b/sources/ewol/context/IOs/Context.cpp index b83be511..1a01affe 100644 --- a/sources/ewol/context/IOs/Context.cpp +++ b/sources/ewol/context/IOs/Context.cpp @@ -31,7 +31,7 @@ #include -int64_t ewol::getTime(void) { +int64_t ewol::getTime() { struct timespec now; clock_serv_t cclock; mach_timespec_t mts; @@ -58,11 +58,11 @@ public: // nothing to do ... } - int32_t Run(void) { + int32_t Run() { return 0; } - virtual void stop(void) { + virtual void stop() { mm_exit(); } public: @@ -189,40 +189,40 @@ void IOs::setKeyboardMove(ewol::key::Special& _keyboardMode, enum ewol::key::key interface->MAC_SetKeyboardMove(_keyboardMode, _move, _isDown); } -void IOs::start(void) { +void IOs::start() { if (interface == NULL) { return; } //interface->OS_Start(); } -void IOs::resume(void) { +void IOs::resume() { if (interface == NULL) { return; } interface->OS_Resume(); } -void IOs::suspend(void) { +void IOs::suspend() { if (interface == NULL) { return; } interface->OS_Suspend(); } -void IOs::stop(void) { +void IOs::stop() { if (interface == NULL) { return; } interface->OS_Stop(); } -void IOs::background(void) { +void IOs::background() { if (interface == NULL) { return; } interface->OS_Background(); } -void IOs::foreground(void) { +void IOs::foreground() { if (interface == NULL) { return; } @@ -244,7 +244,7 @@ int ewol::run(int _argc, const char *_argv[]) { } // Creat and relaese ewol::Context interface: -void IOs::createInterface(void) { +void IOs::createInterface() { etk::setArgZero(l_argv[0]); EWOL_INFO("Create new interface"); interface = new MacOSInterface(l_argc, l_argv); @@ -254,7 +254,7 @@ void IOs::createInterface(void) { } } -void IOs::releaseInterface(void) { +void IOs::releaseInterface() { if (interface == NULL) { return; } diff --git a/sources/ewol/context/IOs/Context.h b/sources/ewol/context/IOs/Context.h index 11b37532..0db099c7 100644 --- a/sources/ewol/context/IOs/Context.h +++ b/sources/ewol/context/IOs/Context.h @@ -13,8 +13,8 @@ namespace IOs { // Create and relaese ewol::Context interface: - void createInterface(void); - void releaseInterface(void); + void createInterface(); + void releaseInterface(); // return true if a flush is needed bool draw(bool _displayEveryTime); /** @@ -28,12 +28,12 @@ namespace IOs { void setInputMotion(int32_t _id, float _x, float _y); void setKeyboard(ewol::key::Special _keyboardMode, int32_t _unichar, bool _isDown, bool _isAReapeateKey); void setKeyboardMove(ewol::key::Special& _keyboardMode, enum ewol::key::keyboard _move, bool _isDown); - void start(void); - void stop(void); - void foreground(void); - void background(void); - void resume(void); - void suspend(void); + void start(); + void stop(); + void foreground(); + void background(); + void resume(); + void suspend(); }; diff --git a/sources/ewol/context/IOs/Interface.h b/sources/ewol/context/IOs/Interface.h index 559baa35..b6a40b21 100644 --- a/sources/ewol/context/IOs/Interface.h +++ b/sources/ewol/context/IOs/Interface.h @@ -14,7 +14,7 @@ extern "C" { #endif int mm_main(int argc, const char *argv[]); -void mm_exit(void); +void mm_exit(); void mm_openURL(const char *_url); #ifdef __cplusplus diff --git a/sources/ewol/context/IOs/OpenglView.h b/sources/ewol/context/IOs/OpenglView.h index 7726cace..37c8e855 100644 --- a/sources/ewol/context/IOs/OpenglView.h +++ b/sources/ewol/context/IOs/OpenglView.h @@ -35,8 +35,8 @@ int deltaDisplay; int displayCounter; } -- (void)stopDisplayLink; -- (void)startDisplayLink; -- (void)speedSlow; -- (void)speedNormal; +- ()stopDisplayLink; +- ()startDisplayLink; +- ()speedSlow; +- ()speedNormal; @end diff --git a/sources/ewol/context/InputManager.cpp b/sources/ewol/context/InputManager.cpp index 16bcd1f8..88764c52 100644 --- a/sources/ewol/context/InputManager.cpp +++ b/sources/ewol/context/InputManager.cpp @@ -28,7 +28,7 @@ #define EVENT_DEBUG EWOL_VERBOSE //#define EVENT_DEBUG EWOL_DEBUG -void ewol::context::InputManager::calculateLimit(void) { +void ewol::context::InputManager::calculateLimit() { m_eventInputLimit.sepatateTime = 300000; // µs m_eventInputLimit.DpiOffset = m_dpi*100; m_eventMouseLimit.sepatateTime = 300000; // µs @@ -133,7 +133,7 @@ void ewol::context::InputManager::grabPointer(ewol::Widget* _widget) { _widget->getSize().y()/2.0f) ); } -void ewol::context::InputManager::unGrabPointer(void) { +void ewol::context::InputManager::unGrabPointer() { m_grabWidget = NULL; m_context.grabPointerEvents(false, vec2(0,0)); } @@ -151,7 +151,7 @@ void ewol::context::InputManager::onObjectRemove(ewol::Object * removeObject) { } } -void ewol::context::InputManager::newLayerSet(void) { +void ewol::context::InputManager::newLayerSet() { for(int32_t iii=0; iii the it was finger event ... @@ -103,7 +103,7 @@ namespace ewol { /** * @brief a new layer on the windows is set == > might remove all the property of the current element ... */ - void newLayerSet(void); + void newLayerSet(); /** * @brief This is to transfert the event from one widget to another one * @param _source the widget where the event came from @@ -118,7 +118,7 @@ namespace ewol { /** * @brief This fonction un-lock the pointer properties to move in relative instead of absolute */ - void unGrabPointer(void); + void unGrabPointer(); private: ewol::key::Special m_specialKey; public: diff --git a/sources/ewol/context/MacOs/AppDelegate.h b/sources/ewol/context/MacOs/AppDelegate.h index 686d0bab..03b11d11 100644 --- a/sources/ewol/context/MacOs/AppDelegate.h +++ b/sources/ewol/context/MacOs/AppDelegate.h @@ -11,6 +11,6 @@ @interface MacOsAppDelegate : NSObject @property (assign) IBOutlet NSWindow *window; -- (void)sendEvent:(NSEvent *)event; -- (void)applicationWillResignActive:(MacOsAppDelegate *)application; +- ()sendEvent:(NSEvent *)event; +- ()applicationWillResignActive:(MacOsAppDelegate *)application; @end diff --git a/sources/ewol/context/MacOs/Context.cpp b/sources/ewol/context/MacOs/Context.cpp index 35221a18..868401b8 100644 --- a/sources/ewol/context/MacOs/Context.cpp +++ b/sources/ewol/context/MacOs/Context.cpp @@ -31,7 +31,7 @@ #include -int64_t ewol::getTime(void) { +int64_t ewol::getTime() { struct timespec now; clock_serv_t cclock; mach_timespec_t mts; @@ -58,7 +58,7 @@ class MacOSInterface : public ewol::Context { mm_main(_argc, _argv); } - int32_t Run(void) { + int32_t Run() { return mm_run(); } public: diff --git a/sources/ewol/context/MacOs/Interface.h b/sources/ewol/context/MacOs/Interface.h index ae3bcfa0..66d9e1b8 100644 --- a/sources/ewol/context/MacOs/Interface.h +++ b/sources/ewol/context/MacOs/Interface.h @@ -14,7 +14,7 @@ extern "C" { #endif int mm_main(int argc, const char *argv[]); -int mm_run(void); +int mm_run(); #ifdef __cplusplus } diff --git a/sources/ewol/context/MacOs/OpenglView.h b/sources/ewol/context/MacOs/OpenglView.h index b3f8c9b6..1afb678e 100644 --- a/sources/ewol/context/MacOs/OpenglView.h +++ b/sources/ewol/context/MacOs/OpenglView.h @@ -14,21 +14,21 @@ @interface OpenGLView : NSOpenGLView { NSTimer* _refreshTimer; } -- (void)prepareOpenGL; -- (void)drawRect:(NSRect) bounds; -- (void)mouseDown:(NSEvent *) event; -- (void)mouseDragged:(NSEvent *) event; -- (void)mouseUp:(NSEvent *)event; -- (void)mouseMoved:(NSEvent *)event; -- (void)mouseEntered:(NSEvent *)event; -- (void)mouseExited:(NSEvent *)event; -- (void)rightMouseDown:(NSEvent *)event; -- (void)rightMouseDragged:(NSEvent *)event; -- (void)rightMouseUp:(NSEvent *)event; -- (void)otherMouseDown:(NSEvent *)event; -- (void)otherMouseDragged:(NSEvent *)event; -- (void)otherMouseUp:(NSEvent *)event; -//- (void)sendEvent:(NSEvent *)event -- (void)keyDown:(NSEvent *)theEvent; -- (void)flagsChanged:(NSEvent *)theEvent; +- ()prepareOpenGL; +- ()drawRect:(NSRect) bounds; +- ()mouseDown:(NSEvent *) event; +- ()mouseDragged:(NSEvent *) event; +- ()mouseUp:(NSEvent *)event; +- ()mouseMoved:(NSEvent *)event; +- ()mouseEntered:(NSEvent *)event; +- ()mouseExited:(NSEvent *)event; +- ()rightMouseDown:(NSEvent *)event; +- ()rightMouseDragged:(NSEvent *)event; +- ()rightMouseUp:(NSEvent *)event; +- ()otherMouseDown:(NSEvent *)event; +- ()otherMouseDragged:(NSEvent *)event; +- ()otherMouseUp:(NSEvent *)event; +//- ()sendEvent:(NSEvent *)event +- ()keyDown:(NSEvent *)theEvent; +- ()flagsChanged:(NSEvent *)theEvent; @end diff --git a/sources/ewol/context/MacOs/Windows.h b/sources/ewol/context/MacOs/Windows.h index a0745e60..fbab1b13 100644 --- a/sources/ewol/context/MacOs/Windows.h +++ b/sources/ewol/context/MacOs/Windows.h @@ -13,7 +13,7 @@ } + (id)alloc; - (id)init; -+ (void)dealloc; ++ ()dealloc; @end diff --git a/sources/ewol/context/Windows/Context.cpp b/sources/ewol/context/Windows/Context.cpp index d5a6742c..dfc1031e 100644 --- a/sources/ewol/context/Windows/Context.cpp +++ b/sources/ewol/context/Windows/Context.cpp @@ -27,7 +27,7 @@ -int64_t ewol::getTime(void) { +int64_t ewol::getTime() { struct timeval now; gettimeofday(&now, NULL); //EWOL_VERBOSE("current time : " << now.tv_sec << "s " << now.tv_usec << "us"); @@ -54,11 +54,11 @@ class WindowsContext : public ewol::eContext { } } - ~WindowsContext(void) { + ~WindowsContext() { } - int32_t Run(void) { + int32_t Run() { HINSTANCE hInstance = 0; WNDCLASS wc; HWND hWnd; @@ -104,7 +104,7 @@ class WindowsContext : public ewol::eContext { DispatchMessage( &msg ); } } else { - (void)Draw(true); + ()Draw(true); SwapBuffers( hDC ); } } @@ -115,7 +115,7 @@ class WindowsContext : public ewol::eContext { return msg.wParam; } - void Stop(void) { + void Stop() { m_run = false; // To exit program ... PostQuitMessage(0); diff --git a/sources/ewol/context/X11/Context.cpp b/sources/ewol/context/X11/Context.cpp index 03a3ac05..3a09d844 100644 --- a/sources/ewol/context/X11/Context.cpp +++ b/sources/ewol/context/X11/Context.cpp @@ -53,7 +53,7 @@ bool hasDisplay = false; #define X11_CRITICAL EWOL_VERBOSE #endif -int64_t ewol::getTime(void) { +int64_t ewol::getTime() { struct timespec now; int ret = clock_gettime(CLOCK_REALTIME, &now); if (ret != 0) { @@ -191,11 +191,11 @@ class X11Interface : public ewol::Context { m_run = true; } - ~X11Interface(void) { + ~X11Interface() { // TODO : ... } - int32_t run(void) { + int32_t run() { bool specialEventThatNeedARedraw = false; // main cycle while(true == m_run) { @@ -740,7 +740,7 @@ class X11Interface : public ewol::Context { return 0; } /****************************************************************************************/ - virtual void stop(void) { + virtual void stop() { X11_INFO("X11-API: Stop"); m_run = false; } @@ -909,7 +909,7 @@ class X11Interface : public ewol::Context { } } /****************************************************************************************/ - bool createX11Context(void) { + bool createX11Context() { X11_INFO("X11: CreateX11Context"); int x,y, attr_mask; XSizeHints hints; @@ -1215,7 +1215,7 @@ class X11Interface : public ewol::Context { } } /****************************************************************************************/ - bool createOGlContext(void) { + bool createOGlContext() { X11_INFO("X11:CreateOGlContext"); /* create a GLX context */ GLXContext RenderContext = glXCreateContext(m_display, m_visual, 0, GL_TRUE); diff --git a/sources/ewol/context/clipBoard.cpp b/sources/ewol/context/clipBoard.cpp index 7808433c..191013c7 100644 --- a/sources/ewol/context/clipBoard.cpp +++ b/sources/ewol/context/clipBoard.cpp @@ -51,7 +51,7 @@ std::ostream& ewol::operator <<(std::ostream& _os, const enum ewol::context::cli } -void ewol::context::clipBoard::init(void) { +void ewol::context::clipBoard::init() { EWOL_INFO("Initialyse ClipBoards"); for(int32_t i=0; i -int64_t guiInterface::getTime(void) { +int64_t guiInterface::getTime() { struct timespec now; int ret = clock_gettime(CLOCK_REALTIME, &now); if (ret != 0) { @@ -190,7 +190,7 @@ void DirectFB_Init(int argc, const char *argv[]) { EWOL_INFO("DirectFB init (STOP)"); } -void DirectFB_UnInit(void) { +void DirectFB_UnInit() { // release our interfaces to shutdown DirectFB primary_gl->release(primary_gl); primary->release(primary); @@ -198,7 +198,7 @@ void DirectFB_UnInit(void) { dfb->release(dfb); } -void DirectFB_Run(void) { +void DirectFB_Run() { EWOL_INFO("X11 configure windows size : (" << screen_height << "," << screen_width << ")"); eSystem::Resize(screen_width, screen_height); @@ -384,17 +384,17 @@ void guiInterface::ClipBoardSet(enum ewol::context::clipBoard::clipboardListe _c #define __class__ "guiInterface" -void guiInterface::Stop(void) { +void guiInterface::Stop() { EWOL_INFO("X11-API: Stop"); m_run = false; } -void guiInterface::KeyboardShow(void) { +void guiInterface::KeyboardShow() { // nothing to do : No keyboard on computer ... } -void guiInterface::KeyboardHide(void) { +void guiInterface::KeyboardHide() { // nothing to do : No keyboard on computer ... } diff --git a/sources/ewol/debug.cpp b/sources/ewol/debug.cpp index 8651d7eb..f49940f4 100644 --- a/sources/ewol/debug.cpp +++ b/sources/ewol/debug.cpp @@ -8,7 +8,7 @@ #include -int32_t ewol::getLogId(void) { +int32_t ewol::getLogId() { static int32_t g_val = etk::log::registerInstance("ewol"); return g_val; } diff --git a/sources/ewol/debug.h b/sources/ewol/debug.h index 242bdc91..783397d3 100644 --- a/sources/ewol/debug.h +++ b/sources/ewol/debug.h @@ -12,7 +12,7 @@ #include namespace ewol { - int32_t getLogId(void); + int32_t getLogId(); }; // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define EWOL_BASE(info,data) \ diff --git a/sources/ewol/event/Entry.h b/sources/ewol/event/Entry.h index 50188c05..0686f52a 100644 --- a/sources/ewol/event/Entry.h +++ b/sources/ewol/event/Entry.h @@ -34,25 +34,25 @@ namespace ewol { void setType(enum ewol::key::keyboard _type) { m_type = _type; }; - inline const enum ewol::key::keyboard& getType(void) const { + inline const enum ewol::key::keyboard& getType() const { return m_type; }; void setStatus(enum ewol::key::status _status) { m_status = _status; }; - inline const enum ewol::key::status& getStatus(void) const { + inline const enum ewol::key::status& getStatus() const { return m_status; }; void setSpecialKey(const ewol::key::Special& _specialKey) { m_specialKey = _specialKey; }; - inline const ewol::key::Special& getSpecialKey(void) const { + inline const ewol::key::Special& getSpecialKey() const { return m_specialKey; }; void setChar(char32_t _char) { m_unicodeData = _char; }; - inline const char32_t& getChar(void) const { + inline const char32_t& getChar() const { return m_unicodeData; }; }; diff --git a/sources/ewol/event/Input.h b/sources/ewol/event/Input.h index e3acdc0e..4914d523 100644 --- a/sources/ewol/event/Input.h +++ b/sources/ewol/event/Input.h @@ -36,37 +36,37 @@ namespace ewol { void setType(enum ewol::key::type _type) { m_type = _type; }; - inline const enum ewol::key::type& getType(void) const { + inline const enum ewol::key::type& getType() const { return m_type; }; void setStatus(enum ewol::key::status _status) { m_status = _status; }; - inline const enum ewol::key::status& getStatus(void) const { + inline const enum ewol::key::status& getStatus() const { return m_status; }; void setId(uint8_t _id) { m_inputId = _id; }; - inline const uint8_t& getId(void) const { + inline const uint8_t& getId() const { return m_inputId; }; void setPos(const vec2& _pos) { m_pos = _pos; }; - inline const vec2& getPos(void) const { + inline const vec2& getPos() const { return m_pos; }; void setSpecialKey(const ewol::key::Special& _specialKey) { m_specialKey = _specialKey; }; - inline const ewol::key::Special& getSpecialKey(void) const { + inline const ewol::key::Special& getSpecialKey() const { return m_specialKey; }; /** * @brief Reset the input property of the curent event. */ - void reset(void) const { + void reset() const { // TODO : Call the entry element ant rest it ... } }; @@ -92,13 +92,13 @@ namespace ewol { void setDestWidget(ewol::Widget* _dest) { m_dest = _dest; }; - inline ewol::Widget* getDestWidget(void) const { + inline ewol::Widget* getDestWidget() const { return m_dest; }; void setRealId(int32_t _realIdEvent) { m_realIdEvent = _realIdEvent; }; - inline int32_t getRealId(void) const { + inline int32_t getRealId() const { return m_realIdEvent; }; }; diff --git a/sources/ewol/event/Time.h b/sources/ewol/event/Time.h index 7e5cb31c..38de245e 100644 --- a/sources/ewol/event/Time.h +++ b/sources/ewol/event/Time.h @@ -34,28 +34,28 @@ namespace ewol { void setTime(int64_t _timeSystem) { m_timeSystem=_timeSystem; }; - inline int64_t getTime(void) const { + inline int64_t getTime() const { return m_timeSystem; }; void setApplWakeUpTime(int64_t _timeUpAppl) { m_timeUpAppl=_timeUpAppl; }; - inline int64_t getApplWakeUpTime(void) const { + inline int64_t getApplWakeUpTime() const { return m_timeUpAppl; }; - inline int64_t getApplUpTime(void) const { + inline int64_t getApplUpTime() const { return m_timeSystem-m_timeUpAppl; }; void setDelta(float _timeDelta) { m_timeDelta=_timeDelta; }; - inline float getDelta(void) const { + inline float getDelta() const { return m_timeDelta; }; void setDeltaCall(float _timeDeltaCall) { m_timeDeltaCall=_timeDeltaCall; }; - inline float getDeltaCall(void) const { + inline float getDeltaCall() const { return m_timeDeltaCall; }; }; diff --git a/sources/ewol/ewol.cpp b/sources/ewol/ewol.cpp index 3c3ce644..df5df608 100644 --- a/sources/ewol/ewol.cpp +++ b/sources/ewol/ewol.cpp @@ -21,7 +21,7 @@ #define EWOL_VERSION "0.0.0" #endif -std::string ewol::getCompilationMode(void) { +std::string ewol::getCompilationMode() { #ifdef MODE_RELEASE return "Release"; #else @@ -29,7 +29,7 @@ std::string ewol::getCompilationMode(void) { #endif } -std::string ewol::getBoardType(void) { +std::string ewol::getBoardType() { #ifdef __TARGET_OS__Linux return "Linux"; #elif defined(__TARGET_OS__Android) @@ -45,7 +45,7 @@ std::string ewol::getBoardType(void) { #endif } -std::string ewol::getVersion(void) { +std::string ewol::getVersion() { return EWOL_VERSION; } diff --git a/sources/ewol/ewol.h b/sources/ewol/ewol.h index eaafa55a..fc3acc2a 100644 --- a/sources/ewol/ewol.h +++ b/sources/ewol/ewol.h @@ -29,23 +29,23 @@ namespace ewol { * @brief get EWOL version * @return The string that describe ewol version */ - std::string getVersion(void); + std::string getVersion(); /** * @brief get current time in us... * @return The current time * @note is implemented by the OS implementation cf renderer/X11/... */ - int64_t getTime(void); + int64_t getTime(); /** * @brief get compilation mode (release/debug) * @return the string of the mode of commpilation */ - std::string getCompilationMode(void); + std::string getCompilationMode(); /** * @brief get the board type (Android/Linux/MacOs/...) * @return the string of the mode of commpilation */ - std::string getBoardType(void); + std::string getBoardType(); }; #endif diff --git a/sources/ewol/key/Special.cpp b/sources/ewol/key/Special.cpp index 6f4977ed..74da11f9 100644 --- a/sources/ewol/key/Special.cpp +++ b/sources/ewol/key/Special.cpp @@ -19,7 +19,7 @@ // TODO : Update to support the Left and right of some key ... -ewol::key::Special::Special(void) : +ewol::key::Special::Special() : m_value(0) { } @@ -57,7 +57,7 @@ void ewol::key::Special::update(enum ewol::key::keyboard _move, bool _isDown) { } } -bool ewol::key::Special::getCapsLock(void) const { +bool ewol::key::Special::getCapsLock() const { if ((m_value & EWOL_FLAG_KEY_CAPS_LOCK) != 0) { return true; } @@ -75,7 +75,7 @@ void ewol::key::Special::setCapsLock(bool _value) { } } -bool ewol::key::Special::getShift(void) const { +bool ewol::key::Special::getShift() const { if ((m_value & EWOL_FLAG_KEY_SHIFT) != 0) { return true; } @@ -93,7 +93,7 @@ void ewol::key::Special::setShift(bool _value) { } } -bool ewol::key::Special::getCtrl(void) const { +bool ewol::key::Special::getCtrl() const { if ((m_value & EWOL_FLAG_KEY_CTRL) != 0) { return true; } @@ -111,7 +111,7 @@ void ewol::key::Special::setCtrl(bool _value) { } } -bool ewol::key::Special::getMeta(void) const { +bool ewol::key::Special::getMeta() const { if ((m_value & EWOL_FLAG_KEY_META) != 0) { return true; } @@ -129,7 +129,7 @@ void ewol::key::Special::setMeta(bool _value) { } } -bool ewol::key::Special::getAlt(void) const { +bool ewol::key::Special::getAlt() const { if ((m_value & EWOL_FLAG_KEY_ALT) != 0) { return true; } @@ -147,7 +147,7 @@ void ewol::key::Special::setAlt(bool _value) { } } -bool ewol::key::Special::getAltGr(void) const { +bool ewol::key::Special::getAltGr() const { if ((m_value & EWOL_FLAG_KEY_ALTGR) != 0) { return true; } @@ -165,7 +165,7 @@ void ewol::key::Special::setAltGr(bool _value) { } } -bool ewol::key::Special::getNumLock(void) const { +bool ewol::key::Special::getNumLock() const { if ((m_value & EWOL_FLAG_KEY_NUM_LOCK) != 0) { return true; } @@ -183,7 +183,7 @@ void ewol::key::Special::setNumLock(bool _value) { } } -bool ewol::key::Special::getInsert(void) const { +bool ewol::key::Special::getInsert() const { if ((m_value & EWOL_FLAG_KEY_INSERT) != 0) { return true; } diff --git a/sources/ewol/key/Special.h b/sources/ewol/key/Special.h index fab8a9fd..de8839ff 100644 --- a/sources/ewol/key/Special.h +++ b/sources/ewol/key/Special.h @@ -24,12 +24,12 @@ namespace ewol { /** * @brief Main constructor */ - Special(void); + Special(); /** * @brief get the current CapLock Status * @return The CapLock value */ - bool getCapsLock(void) const; + bool getCapsLock() const; /** * @brief set the current CapLock Status * @param[in] _value The new CapLock value @@ -39,7 +39,7 @@ namespace ewol { * @brief Get the current Shift key status * @return The Shift value */ - bool getShift(void) const; + bool getShift() const; /** * @brief Set the current Shift key status * @param[in] _value The new Shift value @@ -49,7 +49,7 @@ namespace ewol { * @brief Get the Current Control key status * @return The Control value */ - bool getCtrl(void) const; + bool getCtrl() const; /** * @brief Set the Current Control key status * @param[in] _value The new Control value @@ -59,7 +59,7 @@ namespace ewol { * @brief Get the current Meta key status (also named windows or apple key) * @return The Meta value (name Windows key, apple key, command key ...) */ - bool getMeta(void) const; + bool getMeta() const; /** * @brief Set the current Meta key status (also named windows or apple key) * @param[in] _value The new Meta value (name Windows key, apple key, command key ...) @@ -69,7 +69,7 @@ namespace ewol { * @brief Get the current Alt key status * @return The Alt value */ - bool getAlt(void) const; + bool getAlt() const; /** * @brief Set the current Alt key status * @param[in] _value The new Alt value @@ -79,7 +79,7 @@ namespace ewol { * @brief Get the current Alt-Gr key status * @return The Alt-gr value (does not exist on MacOs) */ - bool getAltGr(void) const; + bool getAltGr() const; /** * @brief Set the current Alt-Gr key status * @param[in] _value The new Alt-gr value (does not exist on MacOs) @@ -89,7 +89,7 @@ namespace ewol { * @brief Get the current Ver-num key status * @return The Numerical Lock value */ - bool getNumLock(void) const; + bool getNumLock() const; /** * @brief Set the current Ver-num key status * @param[in] _value The new Numerical Lock value @@ -99,7 +99,7 @@ namespace ewol { * @brief Get the current Intert key status * @return The Insert value */ - bool getInsert(void) const; + bool getInsert() const; /** * @brief Set the current Intert key status * @param[in] _value The new Insert value diff --git a/sources/ewol/object/Config.h b/sources/ewol/object/Config.h index 1ba02116..ed79fcf7 100644 --- a/sources/ewol/object/Config.h +++ b/sources/ewol/object/Config.h @@ -27,13 +27,13 @@ namespace ewol { void setConfig(const char* _config) { m_config = _config; }; - inline const char* getConfig(void) const { + inline const char* getConfig() const { return m_config; }; void setData(const std::string& _data) { m_data = _data; }; - inline const std::string& getData(void) const { + inline const std::string& getData() const { return m_data; }; }; diff --git a/sources/ewol/object/ConfigElement.h b/sources/ewol/object/ConfigElement.h index 2d00995d..2bac67de 100644 --- a/sources/ewol/object/ConfigElement.h +++ b/sources/ewol/object/ConfigElement.h @@ -34,19 +34,19 @@ namespace ewol { m_default(_default) { }; - inline const char* getConfig(void) const { + inline const char* getConfig() const { return m_config; }; - inline const char* getType(void) const { + inline const char* getType() const { return m_type; }; - inline const char* getControl(void) const { + inline const char* getControl() const { return m_control; }; - inline const char* getDescription(void) const { + inline const char* getDescription() const { return m_description; }; - inline const char* getDefault(void) const { + inline const char* getDefault() const { return m_default; }; }; diff --git a/sources/ewol/object/Manager.cpp b/sources/ewol/object/Manager.cpp index db8a6b76..a2230a64 100644 --- a/sources/ewol/object/Manager.cpp +++ b/sources/ewol/object/Manager.cpp @@ -14,14 +14,14 @@ #undef __class__ #define __class__ "ewol::object::Manager" -ewol::object::Manager::Manager(void) { +ewol::object::Manager::Manager() { EWOL_DEBUG(" == > init Object-Manager"); // Can create mlemory leak ... == > but not predictable comportement otherwise ... m_eObjectAutoRemoveList.clear(); m_eObjectList.clear(); } -ewol::object::Manager::~Manager(void) { +ewol::object::Manager::~Manager() { bool hasError = false; if (m_eObjectAutoRemoveList.size()!=0) { EWOL_ERROR("Must not have anymore eObject to auto-remove !!!"); @@ -36,7 +36,7 @@ ewol::object::Manager::~Manager(void) { } } -void ewol::object::Manager::unInit(void) { +void ewol::object::Manager::unInit() { EWOL_DEBUG(" == > Un-Init Object-Manager"); removeAllAutoRemove(); EWOL_INFO(" remove missing user widget"); @@ -91,7 +91,7 @@ void ewol::object::Manager::add(ewol::Object* _object) { } } -int32_t ewol::object::Manager::getNumberObject(void) { +int32_t ewol::object::Manager::getNumberObject() { return m_eObjectList.size() + m_eObjectAutoRemoveList.size(); } @@ -176,7 +176,7 @@ void ewol::object::Manager::autoRemove(ewol::Object* _object) { } // clean all Object that request an autoRemove ... -void ewol::object::Manager::removeAllAutoRemove(void) { +void ewol::object::Manager::removeAllAutoRemove() { //EWOL_DEBUG("Auto-Remove Object section : " << m_eObjectAutoRemoveList.size() << " elemeents"); while(0 m_eObjectList; // all widget allocated == > all time increment ... never removed ... std::vector m_eObjectAutoRemoveList; // all widget allocated public: - Manager(void); - ~Manager(void); + Manager(); + ~Manager(); /** * @brief remove all resources (un-init) out of the destructor (due to the system implementation) */ - void unInit(void); + void unInit(); void add(ewol::Object* _object); void rm(ewol::Object* _object); - int32_t getNumberObject(void); + int32_t getNumberObject(); void autoRemove(ewol::Object* _object); - void removeAllAutoRemove(void); + void removeAllAutoRemove(); ewol::Object* get(const std::string& _name); private: @@ -40,7 +40,7 @@ namespace ewol { private: ewol::object::MultiCast m_multiCast; //!< muticast manager public: - ewol::object::MultiCast& multiCast(void) { + ewol::object::MultiCast& multiCast() { return m_multiCast; }; }; diff --git a/sources/ewol/object/Message.h b/sources/ewol/object/Message.h index a8a2674d..fa01a245 100644 --- a/sources/ewol/object/Message.h +++ b/sources/ewol/object/Message.h @@ -30,19 +30,19 @@ namespace ewol { void setCaller(ewol::Object* _caller) { m_callerObject = _caller; }; - inline ewol::Object* getCaller(void) const { + inline ewol::Object* getCaller() const { return m_callerObject; }; void setMessage(const char* _message) { m_event = _message; }; - inline const char* getMessage(void) const { + inline const char* getMessage() const { return m_event; }; void setData(const std::string& _data) { m_data = _data; }; - inline const std::string& getData(void) const { + inline const std::string& getData() const { return m_data; }; }; diff --git a/sources/ewol/object/MultiCast.cpp b/sources/ewol/object/MultiCast.cpp index 21595dcf..ab2fd325 100644 --- a/sources/ewol/object/MultiCast.cpp +++ b/sources/ewol/object/MultiCast.cpp @@ -13,12 +13,12 @@ #undef __class__ #define __class__ "object::MultiCast" -ewol::object::MultiCast::MultiCast(void) { +ewol::object::MultiCast::MultiCast() { EWOL_INFO("EObject message Multi-Cast"); } -ewol::object::MultiCast::~MultiCast(void) { +ewol::object::MultiCast::~MultiCast() { EWOL_INFO("EObject message Multi-Cast"); m_messageList.clear(); } diff --git a/sources/ewol/object/MultiCast.h b/sources/ewol/object/MultiCast.h index 9a50eb26..eb90dae6 100644 --- a/sources/ewol/object/MultiCast.h +++ b/sources/ewol/object/MultiCast.h @@ -31,8 +31,8 @@ namespace ewol { }; std::vector m_messageList; //!< List of all message ... public: - MultiCast(void); - ~MultiCast(void); + MultiCast(); + ~MultiCast(); void anonymousSend(const char* const _messageId, const std::string& _data) { send(NULL, _messageId, _data); }; diff --git a/sources/ewol/object/Object.cpp b/sources/ewol/object/Object.cpp index 02c97be5..0b2fec99 100644 --- a/sources/ewol/object/Object.cpp +++ b/sources/ewol/object/Object.cpp @@ -19,7 +19,7 @@ const char* const ewol::Object::configName = "name"; size_t ewol::Object::m_valUID = 0; -ewol::Object::Object(void) : +ewol::Object::Object() : m_static(false), m_isResource(false) { // note this is nearly atomic ... (but it is enough) @@ -39,7 +39,7 @@ ewol::Object::Object(const std::string& _name) : registerConfig(configName, "string", NULL, "Object name, might be a unique reference in all the program"); } -ewol::Object::~Object(void) { +ewol::Object::~Object() { EWOL_DEBUG("delete Object : [" << m_uniqueId << "] : " << getTypeDescription()); getObjectManager().rm(this); getMultiCast().rm(this); @@ -54,7 +54,7 @@ ewol::Object::~Object(void) { m_uniqueId = -1; } -const char * const ewol::Object::getObjectType(void) { +const char * const ewol::Object::getObjectType() { if (m_listType.size() == 0) { return "ewol::Object"; } @@ -68,7 +68,7 @@ void ewol::Object::addObjectType(const char* _type) { } m_listType.push_back(_type); } -std::string ewol::Object::getTypeDescription(void) { +std::string ewol::Object::getTypeDescription() { std::string ret("ewol::Object"); for(auto element : m_listType) { ret += "|"; @@ -89,11 +89,11 @@ bool ewol::Object::isTypeCompatible(const std::string& _type) { return false; } -void ewol::Object::autoDestroy(void) { +void ewol::Object::autoDestroy() { getObjectManager().autoRemove(this); } -void ewol::Object::removeObject(void) { +void ewol::Object::removeObject() { getObjectManager().autoRemove(this); } @@ -351,7 +351,7 @@ bool ewol::Object::setConfig(const std::string& _config, const std::string& _val std::string ewol::Object::getConfig(const char* _config) const { std::string res=""; if (NULL != _config) { - (void)onGetConfig(_config, res); + onGetConfig(_config, res); } return res; } @@ -385,14 +385,14 @@ bool ewol::Object::setConfigNamed(const std::string& _objectName, const std::str return object->setConfig(_config, _value); } -ewol::object::Manager& ewol::Object::getObjectManager(void) { +ewol::object::Manager& ewol::Object::getObjectManager() { return ewol::getContext().getEObjectManager(); } -ewol::object::MultiCast& ewol::Object::getMultiCast(void) { +ewol::object::MultiCast& ewol::Object::getMultiCast() { return ewol::getContext().getEObjectManager().multiCast(); } -ewol::Context& ewol::Object::getContext(void) { +ewol::Context& ewol::Object::getContext() { return ewol::getContext(); } diff --git a/sources/ewol/object/Object.h b/sources/ewol/object/Object.h index 83cf7b85..8884ed0f 100644 --- a/sources/ewol/object/Object.h +++ b/sources/ewol/object/Object.h @@ -56,7 +56,7 @@ namespace ewol { /** * @brief Constructor. */ - Object(void); + Object(); /** * @brief Constructor. * @param[in] _name Name of the Object. @@ -65,17 +65,17 @@ namespace ewol { /** * @brief Destructor */ - virtual ~Object(void); + virtual ~Object(); protected: /** * @brief Auto-destroy the object */ - void autoDestroy(void); + void autoDestroy(); public: /** * @brief Asynchronous removing the object */ - void removeObject(void); + void removeObject(); private: std::vector m_listType; public: @@ -83,12 +83,12 @@ namespace ewol { * @brief get the current Object type of the Object * @return the last type name of the element */ - const char * const getObjectType(void); + const char * const getObjectType(); /** * @brief Get the herarchie of the Object type. * @return descriptive string. */ - std::string getTypeDescription(void); + std::string getTypeDescription(); /** * @brief check if the element herited from a specific type * @param[in] _type Type to check. @@ -108,7 +108,7 @@ namespace ewol { * @brief get the static status of the Object == > mark at true if the user set the object mark as static allocated element ==> not auto remove element * @return true if it might not be removed == > usefull for conficuration class */ - bool getStatic(void){ + bool getStatic(){ return m_static; }; private: @@ -118,7 +118,7 @@ namespace ewol { * @brief get the UniqueId of the Object * @return the requested ID */ - int32_t getId(void){ + int32_t getId(){ return m_uniqueId; }; private: @@ -213,7 +213,7 @@ namespace ewol { * @brief get all the configuration list * @return The list of all parameter availlable in the widget */ - virtual const std::vector& getConfigList(void) { + virtual const std::vector& getConfigList() { return m_listConfig; }; /** @@ -242,7 +242,7 @@ namespace ewol { * @brief get the Object name * @return The requested name */ - const std::string& getName(void) const { + const std::string& getName() const { return m_name; }; /** @@ -272,17 +272,17 @@ namespace ewol { * @breif get the current Object manager. * @return the requested object manager. */ - ewol::object::Manager& getObjectManager(void); + ewol::object::Manager& getObjectManager(); /** * @breif get the current Object Message Multicast manager. * @return the requested object manager. */ - ewol::object::MultiCast& getMultiCast(void); + ewol::object::MultiCast& getMultiCast(); /** * @brief get the curent the system inteface. * @return current reference on the instance. */ - ewol::Context& getContext(void); + ewol::Context& getContext(); private: bool m_isResource; //!< enable this when you want to declare this element is auto-remove public: @@ -298,7 +298,7 @@ namespace ewol { * @brief Get the resource status of the element. * @return the resource status. */ - bool getStatusResource(void) { + bool getStatusResource() { return m_isResource; } }; diff --git a/sources/ewol/openGL/openGL.cpp b/sources/ewol/openGL/openGL.cpp index 73280c48..0d176dd9 100644 --- a/sources/ewol/openGL/openGL.cpp +++ b/sources/ewol/openGL/openGL.cpp @@ -16,7 +16,7 @@ * @note due ti the fact that the system can be called for multiple instance, for naw we just limit the acces to one process at a time. * @return the main inteface Mutex */ -static etk::Mutex& mutexOpenGl(void) { +static etk::Mutex& mutexOpenGl() { static etk::Mutex s_drawMutex; return s_drawMutex; } @@ -29,7 +29,7 @@ static uint32_t l_textureflags = 0; static int32_t l_programId = 0; -void ewol::openGL::lock(void) { +void ewol::openGL::lock() { mutexOpenGl().lock(); l_matrixList.clear(); mat4 tmpMat; @@ -41,7 +41,7 @@ void ewol::openGL::lock(void) { l_programId = -1; } -void ewol::openGL::unLock(void) { +void ewol::openGL::unLock() { mutexOpenGl().unLock(); } @@ -62,7 +62,7 @@ void ewol::openGL::setMatrix(const mat4& _newOne) { l_matrixList[l_matrixList.size()-1] = _newOne; } -void ewol::openGL::push(void) { +void ewol::openGL::push() { if (l_matrixList.size() == 0) { EWOL_ERROR("set matrix list is not corect size in the stack : " << l_matrixList.size()); mat4 tmp; @@ -73,7 +73,7 @@ void ewol::openGL::push(void) { l_matrixList.push_back(tmp); } -void ewol::openGL::pop(void) { +void ewol::openGL::pop() { if (l_matrixList.size() <= 1) { EWOL_ERROR("set matrix list is not corect size in the stack : " << l_matrixList.size()); l_matrixList.clear(); @@ -86,7 +86,7 @@ void ewol::openGL::pop(void) { l_matrixCamera.identity(); } -const mat4& ewol::openGL::getMatrix(void) { +const mat4& ewol::openGL::getMatrix() { if (l_matrixList.size() == 0) { EWOL_ERROR("set matrix list is not corect size in the stack : " << l_matrixList.size()); mat4 tmp; @@ -95,7 +95,7 @@ const mat4& ewol::openGL::getMatrix(void) { return l_matrixList[l_matrixList.size()-1]; } -const mat4& ewol::openGL::getCameraMatrix(void) { +const mat4& ewol::openGL::getCameraMatrix() { return l_matrixCamera; } @@ -103,17 +103,17 @@ void ewol::openGL::setCameraMatrix(const mat4& _newOne) { l_matrixCamera = _newOne; } -void ewol::openGL::finish(void) { +void ewol::openGL::finish() { l_programId = -1; l_textureflags = 0; } -void ewol::openGL::flush(void) { +void ewol::openGL::flush() { l_programId = -1; l_textureflags = 0; } -void ewol::openGL::swap(void) { +void ewol::openGL::swap() { } @@ -211,7 +211,7 @@ void ewol::openGL::disable(enum ewol::openGL::openGlFlags _flagID) { #endif } -void ewol::openGL::updateAllFlags(void) { +void ewol::openGL::updateAllFlags() { #ifdef DIRECT_MODE return; #endif diff --git a/sources/ewol/openGL/openGL.h b/sources/ewol/openGL/openGL.h index 388f6b53..dd4cbd59 100644 --- a/sources/ewol/openGL/openGL.h +++ b/sources/ewol/openGL/openGL.h @@ -58,11 +58,11 @@ namespace ewol { /** * @brief Lock the openGL context for one user only == > better to keep flags and other things ... */ - void lock(void); + void lock(); /** * @brief Un-lock the openGL context for an other user... */ - void unLock(void); + void unLock(); /** * @brief When you will done an opengl rendering, you might call this reset matrix first. It remove all the stach of the matrix pushed. * @param[in] _newOne the default matrix that might be set for the graphic card for renderer. if too more pop will be done, this is the last that mmight survived @@ -77,21 +77,21 @@ namespace ewol { /** * @brief store current matrix in the matrix stack. */ - void push(void); + void push(); /** * @brief remove the current matrix and get the last one from the matrix stack. */ - void pop(void); + void pop(); /** * @brief get a reference on the current matrix destinate to opengl renderer. * @return The requested matrix. */ - const mat4& getMatrix(void); + const mat4& getMatrix(); /** * @brief get a reference on the current matrix camera destinate to opengl renderer. * @return The requested matrix. */ - const mat4& getCameraMatrix(void); + const mat4& getCameraMatrix(); /** * @brief set a reference on the current camera to opengl renderer. * @param[in] _newOne The requested matrix. @@ -100,15 +100,15 @@ namespace ewol { /** * @brief */ - void finish(void); + void finish(); /** * @brief */ - void flush(void); + void flush(); /** * @brief */ - void swap(void); + void swap(); enum openGlFlags { FLAG_BLEND = 1<<0, //!< If enabled, blend the computed fragment color values with the values in the color buffers. See glBlendFunc. @@ -155,7 +155,7 @@ namespace ewol { /** * @brieg update all the internal flag needed to be set from tre previous element set ... */ - void updateAllFlags(void); + void updateAllFlags(); /** * @brief enable Texture on the system * @param[in] flagID The flag requested diff --git a/sources/ewol/resource/ColorFile.cpp b/sources/ewol/resource/ColorFile.cpp index 0ae3e3cb..9fb1f22f 100644 --- a/sources/ewol/resource/ColorFile.cpp +++ b/sources/ewol/resource/ColorFile.cpp @@ -27,12 +27,12 @@ ewol::resource::ColorFile::ColorFile(const std::string& _filename) : } -ewol::resource::ColorFile::~ColorFile(void) { +ewol::resource::ColorFile::~ColorFile() { // remove all element m_list.clear(); } -void ewol::resource::ColorFile::reload(void) { +void ewol::resource::ColorFile::reload() { // remove all previous set of value : for (int32_t iii = 0; iii < m_list.size() ; ++iii) { m_list[iii] = m_errorColor; diff --git a/sources/ewol/resource/ColorFile.h b/sources/ewol/resource/ColorFile.h index a17c3df3..e6f05042 100644 --- a/sources/ewol/resource/ColorFile.h +++ b/sources/ewol/resource/ColorFile.h @@ -33,7 +33,7 @@ namespace ewol { /** * @brief Simple Destructor of this class (nothing specific ...) */ - virtual ~ColorFile(void); + virtual ~ColorFile(); public: /** * @brief Set the error color. @@ -63,11 +63,11 @@ namespace ewol { * @brief Get All color name * @return list of all color existing */ - std::vector getColors(void) const { + std::vector getColors() const { return m_list.getKeys(); } public: // herited function: - void reload(void); + void reload(); public: /** * @brief keep the resource pointer. diff --git a/sources/ewol/resource/Colored3DObject.cpp b/sources/ewol/resource/Colored3DObject.cpp index 2ec266ff..fe29992b 100644 --- a/sources/ewol/resource/Colored3DObject.cpp +++ b/sources/ewol/resource/Colored3DObject.cpp @@ -14,7 +14,7 @@ #define __class__ "resource::Colored3DObject" -ewol::resource::Colored3DObject::Colored3DObject(void) : +ewol::resource::Colored3DObject::Colored3DObject() : m_GLprogram(NULL) { addObjectType("ewol::Colored3DObject"); // get the shader resource : @@ -27,7 +27,7 @@ ewol::resource::Colored3DObject::Colored3DObject(void) : } } -ewol::resource::Colored3DObject::~Colored3DObject(void) { +ewol::resource::Colored3DObject::~Colored3DObject() { // remove dynamics dependencies : ewol::resource::Program::release(m_GLprogram); } @@ -155,7 +155,7 @@ void ewol::resource::Colored3DObject::drawLine(std::vector& _vertices, } } -ewol::resource::Colored3DObject* ewol::resource::Colored3DObject::keep(void) { +ewol::resource::Colored3DObject* ewol::resource::Colored3DObject::keep() { EWOL_VERBOSE("KEEP : direct Colored3DObject"); // need to crate a new one ... ewol::resource::Colored3DObject* object = new ewol::resource::Colored3DObject(); diff --git a/sources/ewol/resource/Colored3DObject.h b/sources/ewol/resource/Colored3DObject.h index 69956da3..d1de6869 100644 --- a/sources/ewol/resource/Colored3DObject.h +++ b/sources/ewol/resource/Colored3DObject.h @@ -24,8 +24,8 @@ namespace ewol { int32_t m_GLMatrix; int32_t m_GLColor; protected: - Colored3DObject(void); - virtual ~Colored3DObject(void); + Colored3DObject(); + virtual ~Colored3DObject(); public: virtual void draw(std::vector& _vertices, const etk::Color& _color, @@ -47,7 +47,7 @@ namespace ewol { * @note Never free this pointer by your own... * @return pointer on the resource or NULL if an error occured. */ - static ewol::resource::Colored3DObject* keep(void); + static ewol::resource::Colored3DObject* keep(); /** * @brief release the keeped resources * @param[in,out] reference on the object pointer diff --git a/sources/ewol/resource/ConfigFile.cpp b/sources/ewol/resource/ConfigFile.cpp index c2768b2d..0509de91 100644 --- a/sources/ewol/resource/ConfigFile.cpp +++ b/sources/ewol/resource/ConfigFile.cpp @@ -27,7 +27,7 @@ ewol::resource::ConfigFile::ConfigFile(const std::string& _filename) : } -ewol::resource::ConfigFile::~ConfigFile(void) { +ewol::resource::ConfigFile::~ConfigFile() { // remove all element for (size_t iii=0; iii m_list; protected: ConfigFile(const std::string& _filename); - virtual ~ConfigFile(void); + virtual ~ConfigFile(); public: - void reload(void); + void reload(); int32_t request(const std::string& _paramName); diff --git a/sources/ewol/resource/DistanceFieldFont.cpp b/sources/ewol/resource/DistanceFieldFont.cpp index e30c9dc3..b34e3046 100644 --- a/sources/ewol/resource/DistanceFieldFont.cpp +++ b/sources/ewol/resource/DistanceFieldFont.cpp @@ -120,7 +120,7 @@ ewol::resource::DistanceFieldFont::DistanceFieldFont(const std::string& _fontNam //exportOnFile(); } -ewol::resource::DistanceFieldFont::~DistanceFieldFont(void) { +ewol::resource::DistanceFieldFont::~DistanceFieldFont() { ewol::resource::FontFreeType::release(m_font); } @@ -374,7 +374,7 @@ void ewol::resource::DistanceFieldFont::release(ewol::resource::DistanceFieldFon _object = NULL; } -void ewol::resource::DistanceFieldFont::exportOnFile(void) { +void ewol::resource::DistanceFieldFont::exportOnFile() { EWOL_DEBUG("EXPORT: DistanceFieldFont : file : '" << m_fileName << ".json'"); ejson::Document doc; ejson::Array* tmpList = new ejson::Array(); @@ -408,7 +408,7 @@ void ewol::resource::DistanceFieldFont::exportOnFile(void) { egami::store(m_data, m_fileName + ".png"); } -bool ewol::resource::DistanceFieldFont::importFromFile(void) { +bool ewol::resource::DistanceFieldFont::importFromFile() { EWOL_DEBUG("IMPORT: DistanceFieldFont : file : '" << m_fileName << ".json'"); // test file existance: etk::FSNode fileJSON(m_fileName + ".json"); diff --git a/sources/ewol/resource/DistanceFieldFont.h b/sources/ewol/resource/DistanceFieldFont.h index 0a8c5bb8..1a87396a 100644 --- a/sources/ewol/resource/DistanceFieldFont.h +++ b/sources/ewol/resource/DistanceFieldFont.h @@ -32,7 +32,7 @@ namespace ewol { int32_t m_lastRawHeigh; protected: DistanceFieldFont(const std::string& _fontName); - ~DistanceFieldFont(void); + ~DistanceFieldFont(); public: float getDisplayRatio(float _size); /** @@ -89,15 +89,15 @@ namespace ewol { float m_borderSize; //!< number of pixel added on the border of a glyph vec2 m_textureBorderSize; //!< Transformed the border size in the texture dimention public: - float getPixelBorderSize(void) { + float getPixelBorderSize() { return m_borderSize; } - const vec2& getTextureBorderSize(void) { + const vec2& getTextureBorderSize() { return m_textureBorderSize; } public: - void exportOnFile(void); - bool importFromFile(void); + void exportOnFile(); + bool importFromFile(); }; }; }; diff --git a/sources/ewol/resource/FontFreeType.cpp b/sources/ewol/resource/FontFreeType.cpp index 5a4ec6bd..39b0ed53 100644 --- a/sources/ewol/resource/FontFreeType.cpp +++ b/sources/ewol/resource/FontFreeType.cpp @@ -25,7 +25,7 @@ static int32_t l_countLoaded=0; static FT_Library library; -void ewol::resource::freeTypeInit(void) { +void ewol::resource::freeTypeInit() { EWOL_DEBUG(" == > init Font-Manager"); l_countLoaded++; if (l_countLoaded>1) { @@ -38,7 +38,7 @@ void ewol::resource::freeTypeInit(void) { } } -void ewol::resource::freeTypeUnInit(void) { +void ewol::resource::freeTypeUnInit() { EWOL_DEBUG(" == > Un-Init Font-Manager"); l_countLoaded--; if (l_countLoaded>0) { @@ -97,7 +97,7 @@ ewol::resource::FontFreeType::FontFreeType(const std::string& _fontName) : } } -ewol::resource::FontFreeType::~FontFreeType(void) { +ewol::resource::FontFreeType::~FontFreeType() { // clean the tmp memory if (NULL != m_FileBuffer) { delete[] m_FileBuffer; @@ -304,7 +304,7 @@ void ewol::resource::FontFreeType::generateKerning(int32_t fontSize, std::vector } -void ewol::resource::FontFreeType::display(void) { +void ewol::resource::FontFreeType::display() { if(false == m_init) { return; } diff --git a/sources/ewol/resource/FontFreeType.h b/sources/ewol/resource/FontFreeType.h index 9e84ad9a..26889a18 100644 --- a/sources/ewol/resource/FontFreeType.h +++ b/sources/ewol/resource/FontFreeType.h @@ -27,10 +27,10 @@ namespace ewol { int32_t m_FileSize; FT_Face m_fftFace; bool m_init; - void display(void); + void display(); protected: FontFreeType(const std::string& _fontName); - ~FontFreeType(void); + ~FontFreeType(); public: bool getGlyphProperty(int32_t _fontSize, @@ -67,8 +67,8 @@ namespace ewol { */ static void release(ewol::resource::FontBase*& _object); }; - void freeTypeInit(void); - void freeTypeUnInit(void); + void freeTypeInit(); + void freeTypeUnInit(); }; }; diff --git a/sources/ewol/resource/Image.h b/sources/ewol/resource/Image.h index 8c99d4ee..2966e09f 100644 --- a/sources/ewol/resource/Image.h +++ b/sources/ewol/resource/Image.h @@ -23,9 +23,9 @@ namespace ewol { private: TextureFile(const std::string& _genName); TextureFile(std::string _genName, const std::string& _fileName, const ivec2& _size); - virtual ~TextureFile(void) { }; + virtual ~TextureFile() { }; public: - const vec2& getRealSize(void) { + const vec2& getRealSize() { return m_realImageSize; }; public: diff --git a/sources/ewol/resource/ImageDF.h b/sources/ewol/resource/ImageDF.h index 2236f14f..2c739bc7 100644 --- a/sources/ewol/resource/ImageDF.h +++ b/sources/ewol/resource/ImageDF.h @@ -24,7 +24,7 @@ namespace ewol { protected: ImageDF(const std::string& _genName); ImageDF(std::string _genName, const std::string& _fileName, const ivec2& _size); - virtual ~ImageDF(void) { }; + virtual ~ImageDF() { }; /** * @brief Generate distance field of this Image input. * @param[in] _input Input image to change in distance field mode. @@ -32,7 +32,7 @@ namespace ewol { */ void generateDistanceField(const egami::ImageMono& _input, egami::Image& _output); public: - const vec2& getRealSize(void) { + const vec2& getRealSize() { return m_realImageSize; }; public: diff --git a/sources/ewol/resource/Manager.cpp b/sources/ewol/resource/Manager.cpp index 4aacb4d9..9920953d 100644 --- a/sources/ewol/resource/Manager.cpp +++ b/sources/ewol/resource/Manager.cpp @@ -16,12 +16,12 @@ -ewol::resource::Manager::Manager(void) : +ewol::resource::Manager::Manager() : m_contextHasBeenRemoved(true) { // nothing to do ... } -ewol::resource::Manager::~Manager(void) { +ewol::resource::Manager::~Manager() { bool hasError = false; if (m_resourceListToUpdate.size()!=0) { EWOL_ERROR("Must not have anymore resources to update !!!"); @@ -36,7 +36,7 @@ ewol::resource::Manager::~Manager(void) { } } -void ewol::resource::Manager::unInit(void) { +void ewol::resource::Manager::unInit() { display(); m_resourceListToUpdate.clear(); // remove all resources ... @@ -52,7 +52,7 @@ void ewol::resource::Manager::unInit(void) { m_resourceList.clear(); } -void ewol::resource::Manager::display(void) { +void ewol::resource::Manager::display() { EWOL_INFO("Resources loaded : "); // remove all resources ... for (int64_t iii=m_resourceList.size()-1; iii >= 0; iii--) { @@ -66,7 +66,7 @@ void ewol::resource::Manager::display(void) { EWOL_INFO("Resources ---"); } -void ewol::resource::Manager::reLoadResources(void) { +void ewol::resource::Manager::reLoadResources() { EWOL_INFO("------------- Resources re-loaded -------------"); // remove all resources ... if (m_resourceList.size() != 0) { @@ -102,7 +102,7 @@ void ewol::resource::Manager::update(ewol::Resource* _object) { } // Specific to load or update the data in the openGl context == > system use only -void ewol::resource::Manager::updateContext(void) { +void ewol::resource::Manager::updateContext() { if (true == m_contextHasBeenRemoved) { // need to update all ... m_contextHasBeenRemoved = false; @@ -138,7 +138,7 @@ void ewol::resource::Manager::updateContext(void) { } // in this case, it is really too late ... -void ewol::resource::Manager::contextHasBeenDestroyed(void) { +void ewol::resource::Manager::contextHasBeenDestroyed() { for (size_t iii=0; iiiremoveContextToLate(); diff --git a/sources/ewol/resource/Manager.h b/sources/ewol/resource/Manager.h index fbcafa51..2288d7a5 100644 --- a/sources/ewol/resource/Manager.h +++ b/sources/ewol/resource/Manager.h @@ -24,25 +24,25 @@ namespace ewol { /** * @brief initialize the internal variable */ - Manager(void); + Manager(); /** * @brief Uninitiamize the resource manager, free all resources previously requested * @note when not free == > generate warning, because the segfault can appear after... */ - ~Manager(void); + ~Manager(); /** * @brief remove all resources (un-init) out of the destructor (due to the system implementation) */ - void unInit(void); + void unInit(); /** * @brief display in the log all the resources loaded ... */ - void display(void); + void display(); /** * @brief Reload all resources from files, and send there in openGL card if needed. * @note If file is reference at THEME:XXX:filename if the Theme change the file will reload the newOne */ - void reLoadResources(void); + void reLoadResources(); /** * @brief Call by the system to send all the needed data on the graphic card chen they change ... * @param[in] _object The resources that might be updated @@ -51,11 +51,11 @@ namespace ewol { /** * @brief Call by the system chen the openGL Context has been unexpectially removed == > This reload all the texture, VBO and other .... */ - void updateContext(void); + void updateContext(); /** * @brief This is to inform the resources manager that we have no more openGl context ... */ - void contextHasBeenDestroyed(void); + void contextHasBeenDestroyed(); public: // internal API to extent eResources in extern Soft ewol::Resource* localKeep(const std::string& _filename); diff --git a/sources/ewol/resource/Program.cpp b/sources/ewol/resource/Program.cpp index b19fa4c1..82f17934 100644 --- a/sources/ewol/resource/Program.cpp +++ b/sources/ewol/resource/Program.cpp @@ -95,7 +95,7 @@ ewol::resource::Program::Program(const std::string& _filename) : updateContext(); } -ewol::resource::Program::~Program(void) { +ewol::resource::Program::~Program() { for (size_t iii=0; iii too dangerous ... } else { @@ -246,7 +246,7 @@ void ewol::resource::Program::updateContext(void) { } } -void ewol::resource::Program::removeContext(void) { +void ewol::resource::Program::removeContext() { if (true == m_exist) { glDeleteProgram(m_program); m_program = 0; @@ -257,12 +257,12 @@ void ewol::resource::Program::removeContext(void) { } } -void ewol::resource::Program::removeContextToLate(void) { +void ewol::resource::Program::removeContextToLate() { m_exist = false; m_program = 0; } -void ewol::resource::Program::reload(void) { +void ewol::resource::Program::reload() { /* TODO : ... etk::file file(m_name, etk::FILE_TYPE_DATA); if (false == file.Exist()) { @@ -687,7 +687,7 @@ void ewol::resource::Program::uniform4iv(int32_t _idElem, int32_t _nbElement, co #endif -void ewol::resource::Program::use(void) { +void ewol::resource::Program::use() { #ifdef PROGRAM_DISPLAY_SPEED g_startTime = ewol::getTime(); #endif @@ -748,7 +748,7 @@ void ewol::resource::Program::setTexture1(int32_t _idElem, GLint _textureOpenGlI } -void ewol::resource::Program::unUse(void) { +void ewol::resource::Program::unUse() { //EWOL_WARNING("Will use program : " << m_program); if (0 == m_program) { return; diff --git a/sources/ewol/resource/Program.h b/sources/ewol/resource/Program.h index a26f8a4c..a17595c4 100644 --- a/sources/ewol/resource/Program.h +++ b/sources/ewol/resource/Program.h @@ -63,7 +63,7 @@ namespace ewol { /** * @brief Destructor, remove the current Program. */ - virtual ~Program(void); + virtual ~Program(); public: /** * @brief User request an attribute on this program. @@ -263,7 +263,7 @@ namespace ewol { /** * @brief Request the processing of this program */ - void use(void); + void use(); /** * @brief set the testure Id on the specify uniform element. * @param[in] _idElem Id of the uniform that might be sended. @@ -274,24 +274,24 @@ namespace ewol { /** * @brief Stop the processing of this program */ - void unUse(void); + void unUse(); /** * @brief This load/reload the data in the opengl context, needed when removed previously. */ - void updateContext(void); + void updateContext(); /** * @brief remove the data from the opengl context. */ - void removeContext(void); + void removeContext(); /** * @brief Special android spec! It inform us that all context is removed and after notify us... */ - void removeContextToLate(void); + void removeContextToLate(); /** * @brief Relode the shader from the file. used when a request of resouces reload is done. * @note this is really usefull when we tested the new themes or shader developpements. */ - void reload(void); + void reload(); public: /** * @brief keep the resource pointer. diff --git a/sources/ewol/resource/Resource.cpp b/sources/ewol/resource/Resource.cpp index a8dd3401..91a0085e 100644 --- a/sources/ewol/resource/Resource.cpp +++ b/sources/ewol/resource/Resource.cpp @@ -14,22 +14,22 @@ #include -void ewol::Resource::updateContext(void) { +void ewol::Resource::updateContext() { EWOL_DEBUG("Not set for : [" << getId() << "]" << getName() << " loaded " << m_counter << " time(s)"); } -void ewol::Resource::removeContext(void) { +void ewol::Resource::removeContext() { EWOL_DEBUG("Not set for : [" << getId() << "]" << getName() << " loaded " << m_counter << " time(s)"); } -void ewol::Resource::removeContextToLate(void) { +void ewol::Resource::removeContextToLate() { EWOL_DEBUG("Not set for : [" << getId() << "]" << getName() << " loaded " << m_counter << " time(s)"); } -void ewol::Resource::reload(void) { +void ewol::Resource::reload() { EWOL_DEBUG("Not set for : [" << getId() << "]" << getName() << " loaded " << m_counter << " time(s)"); } -ewol::resource::Manager& ewol::Resource::getManager(void) { +ewol::resource::Manager& ewol::Resource::getManager() { return ewol::getContext().getResourcesManager(); } \ No newline at end of file diff --git a/sources/ewol/resource/Resource.h b/sources/ewol/resource/Resource.h index 858040ec..eff982c7 100644 --- a/sources/ewol/resource/Resource.h +++ b/sources/ewol/resource/Resource.h @@ -24,7 +24,7 @@ namespace ewol { // class resources is pure virtual class Resource : public ewol::Object { public: - Resource(void) : + Resource() : m_counter(1), m_resourceLevel(MAX_RESOURCE_LEVEL-1) { addObjectType("ewol::Resource"); @@ -37,33 +37,33 @@ namespace ewol { addObjectType("ewol::Resource"); setStatusResource(true); }; - virtual ~Resource(void) { + virtual ~Resource() { }; private: uint32_t m_counter; //!< number of time the element was loaded. public: - void increment(void) { + void increment() { m_counter++; }; - bool decrement(void) { + bool decrement() { m_counter--; return (m_counter == 0)?true:false; }; - int32_t getCounter(void) { + int32_t getCounter() { return m_counter; }; protected: uint8_t m_resourceLevel; //!< Level of the resource ==> for updata priority [0..5] 0 must be update first. public: - uint8_t getResourceLevel(void) { + uint8_t getResourceLevel() { return m_resourceLevel; }; - virtual void updateContext(void); - virtual void removeContext(void); - virtual void removeContextToLate(void); - virtual void reload(void); - static ewol::resource::Manager& getManager(void); + virtual void updateContext(); + virtual void removeContext(); + virtual void removeContextToLate(); + virtual void reload(); + static ewol::resource::Manager& getManager(); }; }; diff --git a/sources/ewol/resource/Shader.cpp b/sources/ewol/resource/Shader.cpp index 273480c5..29629af2 100644 --- a/sources/ewol/resource/Shader.cpp +++ b/sources/ewol/resource/Shader.cpp @@ -37,7 +37,7 @@ ewol::resource::Shader::Shader(const std::string& _filename) : reload(); } -ewol::resource::Shader::~Shader(void) { +ewol::resource::Shader::~Shader() { if (NULL != m_fileData) { delete [] m_fileData; m_fileData = NULL; @@ -57,7 +57,7 @@ static void checkGlError(const char* _op) { #define LOG_OGL_INTERNAL_BUFFER_LEN (8192) static char l_bufferDisplayError[LOG_OGL_INTERNAL_BUFFER_LEN] = ""; -void ewol::resource::Shader::updateContext(void) { +void ewol::resource::Shader::updateContext() { if (true == m_exist) { // Do nothing == > too dangerous ... } else { @@ -98,7 +98,7 @@ void ewol::resource::Shader::updateContext(void) { } } -void ewol::resource::Shader::removeContext(void) { +void ewol::resource::Shader::removeContext() { if (true == m_exist) { glDeleteShader(m_shader); m_exist = false; @@ -106,12 +106,12 @@ void ewol::resource::Shader::removeContext(void) { } } -void ewol::resource::Shader::removeContextToLate(void) { +void ewol::resource::Shader::removeContextToLate() { m_exist = false; m_shader = 0; } -void ewol::resource::Shader::reload(void) { +void ewol::resource::Shader::reload() { etk::FSNode file(m_name); if (false == file.exist()) { EWOL_ERROR("File does not Exist : '" << file << "' : '" << file.getFileSystemName() << "'"); diff --git a/sources/ewol/resource/Shader.h b/sources/ewol/resource/Shader.h index c4a55b64..c24bd55e 100644 --- a/sources/ewol/resource/Shader.h +++ b/sources/ewol/resource/Shader.h @@ -34,39 +34,39 @@ namespace ewol { /** * @brief Destructor, remove the current Shader */ - virtual ~Shader(void); + virtual ~Shader(); public: /** * @brief get the opengl reference id of this shader. * @return The opengl id. */ - GLuint getGL_ID(void) { + GLuint getGL_ID() { return m_shader; }; /** * @brief get the opengl type of this shader. * @return The type of this loaded shader. */ - GLenum getShaderType(void) { + GLenum getShaderType() { return m_type; }; /** * @brief This load/reload the data in the opengl context, needed when removed previously. */ - void updateContext(void); + void updateContext(); /** * @brief remove the data from the opengl context. */ - void removeContext(void); + void removeContext(); /** * @brief Special android spec! It inform us that all context is removed and after notify us... */ - void removeContextToLate(void); + void removeContextToLate(); /** * @brief Relode the shader from the file. used when a request of resouces reload is done. * @note this is really usefull when we tested the new themes or shader developpements. */ - void reload(void); + void reload(); public: /** * @brief keep the resource pointer. diff --git a/sources/ewol/resource/Texture.cpp b/sources/ewol/resource/Texture.cpp index d43fa8ca..250e2be9 100644 --- a/sources/ewol/resource/Texture.cpp +++ b/sources/ewol/resource/Texture.cpp @@ -41,18 +41,18 @@ ewol::resource::Texture::Texture(const std::string& _filename) : m_endPointSize.setValue(1.0,1.0); } -ewol::resource::Texture::Texture(void) { +ewol::resource::Texture::Texture() { addObjectType("ewol::compositing::Texture"); m_loaded = false; m_texId = 0; m_endPointSize.setValue(1.0,1.0); } -ewol::resource::Texture::~Texture(void) { +ewol::resource::Texture::~Texture() { removeContext(); } -void ewol::resource::Texture::updateContext(void) { +void ewol::resource::Texture::updateContext() { if (false == m_loaded) { // Request a new texture at openGl : glGenTextures(1, &m_texId); @@ -83,7 +83,7 @@ void ewol::resource::Texture::updateContext(void) { m_loaded = true; } -void ewol::resource::Texture::removeContext(void) { +void ewol::resource::Texture::removeContext() { if (true == m_loaded) { // Request remove texture ... EWOL_INFO("TEXTURE: Rm [" << getId() << "] texId=" << m_texId); @@ -92,12 +92,12 @@ void ewol::resource::Texture::removeContext(void) { } } -void ewol::resource::Texture::removeContextToLate(void) { +void ewol::resource::Texture::removeContextToLate() { m_loaded = false; m_texId=0; } -void ewol::resource::Texture::flush(void) { +void ewol::resource::Texture::flush() { // request to the manager to be call at the next update ... getManager().update(this); } @@ -107,7 +107,7 @@ void ewol::resource::Texture::setImageSize(ivec2 _newSize) { m_data.resize(_newSize); } -ewol::resource::Texture* ewol::resource::Texture::keep(void) { +ewol::resource::Texture* ewol::resource::Texture::keep() { // this element create a new one every time .... ewol::resource::Texture* object = new ewol::resource::Texture(); if (NULL == object) { diff --git a/sources/ewol/resource/Texture.h b/sources/ewol/resource/Texture.h index a75b7fed..ac13ca95 100644 --- a/sources/ewol/resource/Texture.h +++ b/sources/ewol/resource/Texture.h @@ -29,41 +29,41 @@ namespace ewol { bool m_loaded; // Ewol internal API: public: - void updateContext(void); - void removeContext(void); - void removeContextToLate(void); + void updateContext(); + void removeContext(); + void removeContextToLate(); // middleware interface: public: - GLuint getId(void) const { + GLuint getId() const { return m_texId; }; - const vec2& getUsableSize(void) const { + const vec2& getUsableSize() const { return m_endPointSize; }; - const ivec2& getOpenGlSize(void) const { + const ivec2& getOpenGlSize() const { return m_data.getSize(); }; // Public API: protected: Texture(const std::string& _filename); - Texture(void); - ~Texture(void); + Texture(); + ~Texture(); public: // you must set the size here, because it will be set in multiple of pow(2) void setImageSize(ivec2 newSize); // get the reference on this image to draw nomething on it ... - inline egami::Image& get(void) { + inline egami::Image& get() { return m_data; }; // flush the data to send it at the openGl system - void flush(void); + void flush(); public: /** * @brief keep the resource pointer. * @note Never free this pointer by your own... * @return pointer on the resource or NULL if an error occured. */ - static ewol::resource::Texture* keep(void); + static ewol::resource::Texture* keep(); /** * @brief release the keeped resources * @param[in,out] reference on the object pointer diff --git a/sources/ewol/resource/TexturedFont.cpp b/sources/ewol/resource/TexturedFont.cpp index 2926c2f1..8db88e88 100644 --- a/sources/ewol/resource/TexturedFont.cpp +++ b/sources/ewol/resource/TexturedFont.cpp @@ -224,7 +224,7 @@ ewol::resource::TexturedFont::TexturedFont(const std::string& _fontName) : EWOL_DEBUG(" " << ewol::font::BoldItalic << " == >" << getWrappingMode(ewol::font::BoldItalic)); } -ewol::resource::TexturedFont::~TexturedFont(void) { +ewol::resource::TexturedFont::~TexturedFont() { for (int32_t iiiFontId=0; iiiFontId<4 ; iiiFontId++) { ewol::resource::FontFreeType::release(m_font[iiiFontId]); } diff --git a/sources/ewol/resource/TexturedFont.h b/sources/ewol/resource/TexturedFont.h index dc163133..a9c7d994 100644 --- a/sources/ewol/resource/TexturedFont.h +++ b/sources/ewol/resource/TexturedFont.h @@ -46,7 +46,7 @@ namespace ewol { int32_t m_lastRawHeigh[4]; protected: TexturedFont(const std::string& _fontName); - ~TexturedFont(void); + ~TexturedFont(); public: /** * @brief get the display height of this font @@ -60,7 +60,7 @@ namespace ewol { * @brief get the font height (user friendly) * @return Dimention of the font the user requested */ - int32_t getFontSize(void) { + int32_t getFontSize() { return m_size; }; /** diff --git a/sources/ewol/resource/VirtualBufferObject.cpp b/sources/ewol/resource/VirtualBufferObject.cpp index c87ae3c5..e83550f4 100644 --- a/sources/ewol/resource/VirtualBufferObject.cpp +++ b/sources/ewol/resource/VirtualBufferObject.cpp @@ -26,15 +26,15 @@ ewol::resource::VirtualBufferObject::VirtualBufferObject(int32_t _number) : EWOL_DEBUG("OGL : load VBO count=\"" << _number << "\""); } -ewol::resource::VirtualBufferObject::~VirtualBufferObject(void) { +ewol::resource::VirtualBufferObject::~VirtualBufferObject() { removeContext(); } -void ewol::resource::VirtualBufferObject::retreiveData(void) { +void ewol::resource::VirtualBufferObject::retreiveData() { EWOL_ERROR("TODO ... "); } -void ewol::resource::VirtualBufferObject::updateContext(void) { +void ewol::resource::VirtualBufferObject::updateContext() { if (false == m_exist) { // Allocate and assign a Vertex Array Object to our handle glGenBuffers(m_nbVBO, m_vbo); @@ -54,7 +54,7 @@ void ewol::resource::VirtualBufferObject::updateContext(void) { glBindBuffer(GL_ARRAY_BUFFER, 0); } -void ewol::resource::VirtualBufferObject::removeContext(void) { +void ewol::resource::VirtualBufferObject::removeContext() { if (true == m_exist) { EWOL_INFO("VBO: remove [" << getId() << "] OGl_Id=" << m_vbo[0] << "/" << m_vbo[1] @@ -68,19 +68,19 @@ void ewol::resource::VirtualBufferObject::removeContext(void) { } } -void ewol::resource::VirtualBufferObject::removeContextToLate(void) { +void ewol::resource::VirtualBufferObject::removeContextToLate() { m_exist = false; for (size_t iii=0; iii& _listGlyph) { }; - virtual void display(void) {}; + virtual void display() {}; }; }; }; diff --git a/sources/ewol/resource/font/GlyphProperty.h b/sources/ewol/resource/font/GlyphProperty.h index 46676112..08acef64 100644 --- a/sources/ewol/resource/font/GlyphProperty.h +++ b/sources/ewol/resource/font/GlyphProperty.h @@ -65,7 +65,7 @@ namespace ewol { private: std::vector m_kerning; //!< kerning values of link of all elements public: - GlyphProperty(void) : + GlyphProperty() : m_UVal(0), m_exist(true), m_glyphIndex(0), @@ -87,20 +87,20 @@ namespace ewol { void kerningAdd(const char32_t _charcode, float _value) { m_kerning.push_back(ewol::Kerning(_charcode, _value)); }; - void kerningClear(void) { + void kerningClear() { m_kerning.clear(); }; /** * @brief get the status of the char, if it exist or not in the FONT * @return true if the char is availlable, false otherwise */ - bool exist(void) const { + bool exist() const { return m_exist; }; /** * @brief set the element doen not exist !!! */ - void setNotExist(void) { + void setNotExist() { m_exist = false; }; }; diff --git a/sources/ewol/resource/font/Kerning.h b/sources/ewol/resource/font/Kerning.h index aa868eb1..1c3a136a 100644 --- a/sources/ewol/resource/font/Kerning.h +++ b/sources/ewol/resource/font/Kerning.h @@ -49,7 +49,7 @@ namespace ewol { /** * @brief Simple constructor that allow to allocate the std::vector element */ - Kerning(void) : + Kerning() : m_UVal(0), m_value(0) { @@ -67,7 +67,7 @@ namespace ewol { /** * @brief normal destructor */ - ~Kerning(void) { }; + ~Kerning() { }; }; }; diff --git a/sources/ewol/translate.cpp b/sources/ewol/translate.cpp index 2e46be2b..5ca2147e 100644 --- a/sources/ewol/translate.cpp +++ b/sources/ewol/translate.cpp @@ -21,7 +21,7 @@ class LocalInstanceTranslation { bool m_translateLoadad; std::map m_translate; public: - LocalInstanceTranslation(void) : + LocalInstanceTranslation() : m_major("ewol"), m_languageDefault("EN"), m_language(""), @@ -63,7 +63,7 @@ class LocalInstanceTranslation { m_translate.clear(); }; - const std::string& getLanguageDefault(void) { + const std::string& getLanguageDefault() { return m_languageDefault; }; @@ -99,7 +99,7 @@ class LocalInstanceTranslation { } }; - const std::string& getLanguage(void) { + const std::string& getLanguage() { return m_language; }; @@ -113,7 +113,7 @@ class LocalInstanceTranslation { return it->second; }; private: - void loadTranslation(void) { + void loadTranslation() { if (m_translateLoadad == true) { return; } @@ -179,7 +179,7 @@ class LocalInstanceTranslation { }; -static LocalInstanceTranslation& getInstanceTranslation(void) { +static LocalInstanceTranslation& getInstanceTranslation() { static LocalInstanceTranslation g_val; return g_val; } @@ -196,7 +196,7 @@ void ewol::translate::setLanguageDefault(const std::string& _lang) { getInstanceTranslation().setLanguageDefault(_lang); } -const std::string& ewol::translate::getLanguageDefault(void) { +const std::string& ewol::translate::getLanguageDefault() { return getInstanceTranslation().getLanguageDefault(); } @@ -204,11 +204,11 @@ void ewol::translate::setLanguage(const std::string& _lang) { getInstanceTranslation().setLanguage(_lang); } -const std::string& ewol::translate::getLanguage(void) { +const std::string& ewol::translate::getLanguage() { return getInstanceTranslation().getLanguage(); } -void ewol::translate::autoDetectLanguage(void) { +void ewol::translate::autoDetectLanguage() { EWOL_INFO("Auto-detect language of system"); #if defined(__TARGET_OS__Linux) char *s = getenv("LANG"); diff --git a/sources/ewol/translate.h b/sources/ewol/translate.h index a5347c22..22a2f489 100644 --- a/sources/ewol/translate.h +++ b/sources/ewol/translate.h @@ -50,7 +50,7 @@ namespace ewol { * @brief Get the current language selected * @return The 2/3 char defining the language */ - const std::string& getLanguageDefault(void); + const std::string& getLanguageDefault(); /** * @brief Set the language to load data. when no data availlable, we get the default language. * @param[in] _lang Language to load : ("EN" for english, "FR" for french, "DE" for German, "SP" for spanish ...) @@ -60,11 +60,11 @@ namespace ewol { * @brief Get the current language loaded * @return The 2/3 char defining the language */ - const std::string& getLanguage(void); + const std::string& getLanguage(); /** * @brief Automatic detection of the system language */ - void autoDetectLanguage(void); + void autoDetectLanguage(); /** * @brief Translate a specific text (if not find, it will be retured the same text). * @param[in] _instance Text to translate. diff --git a/sources/ewol/widget/Button.cpp b/sources/ewol/widget/Button.cpp index 62370c9a..0f54db45 100644 --- a/sources/ewol/widget/Button.cpp +++ b/sources/ewol/widget/Button.cpp @@ -34,7 +34,7 @@ const char* const ewol::widget::Button::configShaper = "shaper"; #define STATUS_DOWN (3) -static ewol::Widget* Create(void) { +static ewol::Widget* Create() { return new ewol::widget::Button(); } @@ -74,7 +74,7 @@ ewol::widget::Button::Button(const std::string& _shaperName) : } -ewol::widget::Button::~Button(void) { +ewol::widget::Button::~Button() { } @@ -94,17 +94,17 @@ void ewol::widget::Button::calculateSize(const vec2& _availlable) { } -void ewol::widget::Button::calculateMinMaxSize(void) { +void ewol::widget::Button::calculateMinMaxSize() { ewol::Padding padding = m_shaper.getPadding(); calculateMinMaxSizePadded(padding); } -void ewol::widget::Button::onDraw(void) { +void ewol::widget::Button::onDraw() { // draw the shaaper (if needed indeed) m_shaper.draw(); } -void ewol::widget::Button::onRegenerateDisplay(void) { +void ewol::widget::Button::onRegenerateDisplay() { ewol::widget::Container2::onRegenerateDisplay(); if (needRedraw() == false) { return; @@ -243,13 +243,13 @@ bool ewol::widget::Button::onEventEntry(const ewol::event::Entry& _event) { return false; } -void ewol::widget::Button::onLostFocus(void) { +void ewol::widget::Button::onLostFocus() { m_buttonPressed = false; EWOL_VERBOSE(getName() << " : Remove Focus ..."); CheckStatus(); } -void ewol::widget::Button::CheckStatus(void) { +void ewol::widget::Button::CheckStatus() { if (true == m_buttonPressed) { changeStatusIn(STATUS_PRESSED); } else { diff --git a/sources/ewol/widget/Button.h b/sources/ewol/widget/Button.h index f98b659b..22e48581 100644 --- a/sources/ewol/widget/Button.h +++ b/sources/ewol/widget/Button.h @@ -58,7 +58,7 @@ namespace ewol { /** * @brief Destructor */ - virtual ~Button(void); + virtual ~Button(); /** * @brief set the shaper name (use the contructer one this permit to not noad unused shaper) * @param[in] _shaperName The new shaper filename @@ -78,7 +78,7 @@ namespace ewol { * @return True : The button is pressed. * @return false : The button is released. */ - bool getValue(void) const { + bool getValue() const { return m_value; }; protected: @@ -93,7 +93,7 @@ namespace ewol { * @brief get the current button lock value. * @return The requested lock mode */ - enum buttonLock getLock(void) const { + enum buttonLock getLock() const { return m_lock; }; protected: @@ -108,7 +108,7 @@ namespace ewol { * @brief get the current toggle mode. * @return the current toggle mode. */ - bool getToggleMode(void) const { + bool getToggleMode() const { return m_toggleMode; }; private: @@ -126,23 +126,23 @@ namespace ewol { /** * @brief update the status with the internal satte of the button ... */ - void CheckStatus(void); + void CheckStatus(); protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; public: // Derived function - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); virtual void calculateSize(const vec2& _availlable); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventEntry(const ewol::event::Entry& _event); - virtual void onDetectPresenceToggleWidget(void) { + virtual void onDetectPresenceToggleWidget() { setToggleMode(true); } private: // derived function virtual void periodicCall(const ewol::event::Time& _event); - virtual void onLostFocus(void); + virtual void onLostFocus(); }; }; }; diff --git a/sources/ewol/widget/ButtonColor.cpp b/sources/ewol/widget/ButtonColor.cpp index a2f4bce0..6946e372 100644 --- a/sources/ewol/widget/ButtonColor.cpp +++ b/sources/ewol/widget/ButtonColor.cpp @@ -30,7 +30,7 @@ const char * const ewol::widget::ButtonColor::eventChange = "change"; static const char* const eventColorHasChange = "ewol-widget-ButtonColor-colorChange"; -static ewol::Widget* Create(void) { +static ewol::Widget* Create() { return new ewol::widget::ButtonColor(); } @@ -51,7 +51,7 @@ ewol::widget::ButtonColor::ButtonColor(etk::Color<> _baseColor, std::string _sha } -ewol::widget::ButtonColor::~ButtonColor(void) { +ewol::widget::ButtonColor::~ButtonColor() { } @@ -61,7 +61,7 @@ void ewol::widget::ButtonColor::setShaperName(std::string _shaperName) { } -void ewol::widget::ButtonColor::calculateMinMaxSize(void) { +void ewol::widget::ButtonColor::calculateMinMaxSize() { ewol::Padding padding = m_shaper.getPadding(); std::string label = m_textColorFg.getString(); vec3 minSize = m_text.calculateSize(label); @@ -72,13 +72,13 @@ void ewol::widget::ButtonColor::calculateMinMaxSize(void) { -void ewol::widget::ButtonColor::onDraw(void) { +void ewol::widget::ButtonColor::onDraw() { m_shaper.draw(); m_text.draw(); } -void ewol::widget::ButtonColor::onRegenerateDisplay(void) { +void ewol::widget::ButtonColor::onRegenerateDisplay() { if (needRedraw() == false) { return; } @@ -223,7 +223,7 @@ void ewol::widget::ButtonColor::setValue(etk::Color<> _color) { markToRedraw(); } -etk::Color<> ewol::widget::ButtonColor::getValue(void) { +etk::Color<> ewol::widget::ButtonColor::getValue() { return m_textColorFg; } diff --git a/sources/ewol/widget/ButtonColor.h b/sources/ewol/widget/ButtonColor.h index 4a91d33d..08ca77a8 100644 --- a/sources/ewol/widget/ButtonColor.h +++ b/sources/ewol/widget/ButtonColor.h @@ -46,7 +46,7 @@ namespace ewol { /** * @brief Main destructor. */ - virtual ~ButtonColor(void); + virtual ~ButtonColor(); /** * @brief set the shaper name (use the contructer one this permit to not noad unused shaper). * @param[in] _shaperName The new shaper filename. @@ -56,17 +56,17 @@ namespace ewol { * @brief get the current color of the color selection widget * @return The current color */ - etk::Color<> getValue(void); + etk::Color<> getValue(); /** * @brief Specify the current color. * @param[in] _color The new display color. */ void setValue(etk::Color<> _color); protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); public: // Derived function - virtual void calculateMinMaxSize(void); - virtual void onRegenerateDisplay(void); + virtual void calculateMinMaxSize(); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual void onReceiveMessage(const ewol::object::Message& _msg); private: diff --git a/sources/ewol/widget/CheckBox.cpp b/sources/ewol/widget/CheckBox.cpp index b3674149..44451522 100644 --- a/sources/ewol/widget/CheckBox.cpp +++ b/sources/ewol/widget/CheckBox.cpp @@ -27,7 +27,7 @@ const char* const ewol::widget::CheckBox::configShaper = "shaper"; #undef __class__ #define __class__ "CheckBox" -static ewol::Widget* Create(void) { +static ewol::Widget* Create() { return new ewol::widget::CheckBox(); } @@ -67,7 +67,7 @@ ewol::widget::CheckBox::CheckBox(const std::string& _shaperName) : } -ewol::widget::CheckBox::~CheckBox(void) { +ewol::widget::CheckBox::~CheckBox() { } @@ -87,7 +87,7 @@ void ewol::widget::CheckBox::calculateSize(const vec2& _availlable) { m_selectableAreaSize = m_size - (m_selectableAreaPos + vec2(ret.xRight(), ret.yTop())); } -void ewol::widget::CheckBox::calculateMinMaxSize(void) { +void ewol::widget::CheckBox::calculateMinMaxSize() { ewol::Padding padding = m_shaper.getPadding(); float boxSize = m_shaper.getConfigNumber(m_shaperIdSize); padding.setXLeft(padding.xLeft()*2.0f + boxSize); @@ -97,12 +97,12 @@ void ewol::widget::CheckBox::calculateMinMaxSize(void) { } } -void ewol::widget::CheckBox::onDraw(void) { +void ewol::widget::CheckBox::onDraw() { // draw the shaaper (if needed indeed) m_shaper.draw(); } -void ewol::widget::CheckBox::onRegenerateDisplay(void) { +void ewol::widget::CheckBox::onRegenerateDisplay() { ewol::widget::Container2::onRegenerateDisplay(); if (needRedraw() == false) { return; @@ -204,7 +204,7 @@ bool ewol::widget::CheckBox::onEventEntry(const ewol::event::Entry& _event) { return false; } -void ewol::widget::CheckBox::CheckStatus(void) { +void ewol::widget::CheckBox::CheckStatus() { if (true == m_buttonPressed) { changeStatusIn(STATUS_PRESSED); } else { diff --git a/sources/ewol/widget/CheckBox.h b/sources/ewol/widget/CheckBox.h index bef82f26..38dd7c0c 100644 --- a/sources/ewol/widget/CheckBox.h +++ b/sources/ewol/widget/CheckBox.h @@ -50,7 +50,7 @@ namespace ewol { /** * @brief main destructor. */ - virtual ~CheckBox(void); + virtual ~CheckBox(); /** * @brief set the shaper name (use the contructer one this permit to not noad unused shaper) * @param[in] _shaperName The new shaper filename @@ -69,7 +69,7 @@ namespace ewol { * @return True : The checkbox is active. * @return false : The checkbox is disable. */ - bool getValue(void) const { + bool getValue() const { return m_value; }; protected: @@ -81,15 +81,15 @@ namespace ewol { /** * @brief update the status with the internal satte of the button ... */ - void CheckStatus(void); + void CheckStatus(); protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; public: // Derived function - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); virtual void calculateSize(const vec2& _availlable); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventEntry(const ewol::event::Entry& _event); virtual void periodicCall(const ewol::event::Time& _event); diff --git a/sources/ewol/widget/ColorBar.cpp b/sources/ewol/widget/ColorBar.cpp index 11076aaf..3e0d8388 100644 --- a/sources/ewol/widget/ColorBar.cpp +++ b/sources/ewol/widget/ColorBar.cpp @@ -20,7 +20,7 @@ const char * const ewol::widget::ColorBar::eventChange = "change"; #undef __class__ #define __class__ "ColorBar" -ewol::widget::ColorBar::ColorBar(void) { +ewol::widget::ColorBar::ColorBar() { addObjectType("ewol::widget::ColorBar"); addEventId(eventChange); m_currentUserPos.setValue(0,0); @@ -29,12 +29,12 @@ ewol::widget::ColorBar::ColorBar(void) { setMouseLimit(1); } -ewol::widget::ColorBar::~ColorBar(void) { +ewol::widget::ColorBar::~ColorBar() { } -void ewol::widget::ColorBar::calculateMinMaxSize(void) { +void ewol::widget::ColorBar::calculateMinMaxSize() { m_minSize.setValue(160, 80); markToRedraw(); } @@ -52,7 +52,7 @@ static etk::Color<> s_listColor[NB_BAND_COLOR+1] = { 0xFF0000FF }; -etk::Color<> ewol::widget::ColorBar::getCurrentColor(void) { +etk::Color<> ewol::widget::ColorBar::getCurrentColor() { return m_currentColor; } void ewol::widget::ColorBar::setCurrentColor(etk::Color<> newOne) { @@ -62,12 +62,12 @@ void ewol::widget::ColorBar::setCurrentColor(etk::Color<> newOne) { // TODO : Later when really needed ... } -void ewol::widget::ColorBar::onDraw(void) { +void ewol::widget::ColorBar::onDraw() { m_draw.draw(); } -void ewol::widget::ColorBar::onRegenerateDisplay(void) { +void ewol::widget::ColorBar::onRegenerateDisplay() { if (true == needRedraw()) { // clean the object list ... m_draw.clear(); diff --git a/sources/ewol/widget/ColorBar.h b/sources/ewol/widget/ColorBar.h index 44899cdd..877167d1 100644 --- a/sources/ewol/widget/ColorBar.h +++ b/sources/ewol/widget/ColorBar.h @@ -23,19 +23,19 @@ namespace ewol { // Event list of properties static const char * const eventChange; public: - ColorBar(void); - virtual ~ColorBar(void); - etk::Color<> getCurrentColor(void); + ColorBar(); + virtual ~ColorBar(); + etk::Color<> getCurrentColor(); void setCurrentColor(etk::Color<> _newOne); private: ewol::compositing::Drawing m_draw; //!< Compositing drawing element etk::Color<> m_currentColor; vec2 m_currentUserPos; protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); public: // Derived function - virtual void calculateMinMaxSize(void); - virtual void onRegenerateDisplay(void); + virtual void calculateMinMaxSize(); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); }; }; diff --git a/sources/ewol/widget/Composer.cpp b/sources/ewol/widget/Composer.cpp index f50d4831..e1f6619f 100644 --- a/sources/ewol/widget/Composer.cpp +++ b/sources/ewol/widget/Composer.cpp @@ -15,7 +15,7 @@ #undef __class__ #define __class__ "ewol::widget::Composer" -ewol::widget::Composer::Composer(void) { +ewol::widget::Composer::Composer() { // nothing to do ... } @@ -34,7 +34,7 @@ ewol::widget::Composer::Composer(enum composerMode _mode, const std::string& _fi } } -ewol::widget::Composer::~Composer(void) { +ewol::widget::Composer::~Composer() { } diff --git a/sources/ewol/widget/Composer.h b/sources/ewol/widget/Composer.h index 7406dc61..b890d538 100644 --- a/sources/ewol/widget/Composer.h +++ b/sources/ewol/widget/Composer.h @@ -30,7 +30,7 @@ namespace ewol { /** * @brief Constructor */ - Composer(void); + Composer(); /** * @brief Constructor * @param[in] _mode mode of parsing the string @@ -40,7 +40,7 @@ namespace ewol { /** * @brief Destructor */ - ~Composer(void); + ~Composer(); /** * @brief load a composition with a file * @param[in] _fileName Name of the file diff --git a/sources/ewol/widget/Container.cpp b/sources/ewol/widget/Container.cpp index ff3dba22..1a6ecf05 100644 --- a/sources/ewol/widget/Container.cpp +++ b/sources/ewol/widget/Container.cpp @@ -22,11 +22,11 @@ ewol::widget::Container::Container(ewol::Widget* _subElement) : // nothing to do ... } -ewol::widget::Container::~Container(void) { +ewol::widget::Container::~Container() { subWidgetRemove(); } -ewol::Widget* ewol::widget::Container::getSubWidget(void) { +ewol::Widget* ewol::widget::Container::getSubWidget() { return m_subWidget; } @@ -43,7 +43,7 @@ void ewol::widget::Container::setSubWidget(ewol::Widget* _newWidget) { requestUpdateSize(); } -void ewol::widget::Container::subWidgetRemove(void) { +void ewol::widget::Container::subWidgetRemove() { if (NULL != m_subWidget) { m_subWidget->removeUpperWidget(); m_subWidget->removeObject(); @@ -53,7 +53,7 @@ void ewol::widget::Container::subWidgetRemove(void) { } } -void ewol::widget::Container::subWidgetUnLink(void) { +void ewol::widget::Container::subWidgetUnLink() { if (NULL != m_subWidget) { m_subWidget->removeUpperWidget(); } @@ -119,7 +119,7 @@ void ewol::widget::Container::calculateSize(const vec2& _availlable) { ewol::Widget::calculateSize(_availlable); } -void ewol::widget::Container::calculateMinMaxSize(void) { +void ewol::widget::Container::calculateMinMaxSize() { // call main class ewol::Widget::calculateMinMaxSize(); // call sub classes @@ -131,7 +131,7 @@ void ewol::widget::Container::calculateMinMaxSize(void) { //EWOL_ERROR("[" << getId() << "] Result min size : " << m_minSize); } -void ewol::widget::Container::onRegenerateDisplay(void) { +void ewol::widget::Container::onRegenerateDisplay() { if (NULL!=m_subWidget) { m_subWidget->onRegenerateDisplay(); } diff --git a/sources/ewol/widget/Container.h b/sources/ewol/widget/Container.h index bfa9f03f..e830b8ea 100644 --- a/sources/ewol/widget/Container.h +++ b/sources/ewol/widget/Container.h @@ -30,13 +30,13 @@ namespace ewol { /** * @brief Destructor */ - ~Container(void); + ~Container(); public: /** * @brief get the main node widget * @return the requested pointer on the node */ - ewol::Widget* getSubWidget(void); + ewol::Widget* getSubWidget(); /** * @brief set the subWidget node widget. * @param[in] _newWidget The widget to add. @@ -45,18 +45,18 @@ namespace ewol { /** * @brief remove the subWidget node (async). */ - void subWidgetRemove(void); + void subWidgetRemove(); /** * @brief Unlink the subwidget Node. */ - void subWidgetUnLink(void); + void subWidgetUnLink(); public: // Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual void onObjectRemove(ewol::Object* _removeObject); virtual void calculateSize(const vec2& _availlable); - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); virtual ewol::Widget* getWidgetNamed(const std::string& _widgetName); virtual bool loadXML(exml::Element* _node); diff --git a/sources/ewol/widget/Container2.cpp b/sources/ewol/widget/Container2.cpp index 03099bb1..c39eb1b0 100644 --- a/sources/ewol/widget/Container2.cpp +++ b/sources/ewol/widget/Container2.cpp @@ -24,7 +24,7 @@ ewol::widget::Container2::Container2(ewol::Widget* _subElement, ewol::Widget* _s // nothing to do ... } -ewol::widget::Container2::~Container2(void) { +ewol::widget::Container2::~Container2() { subWidgetRemove(); subWidgetRemoveToggle(); } @@ -167,7 +167,7 @@ void ewol::widget::Container2::calculateMinMaxSizePadded(const ewol::Padding& _p markToRedraw(); } -void ewol::widget::Container2::onRegenerateDisplay(void) { +void ewol::widget::Container2::onRegenerateDisplay() { if (m_subWidget[m_idWidgetDisplayed] != NULL) { m_subWidget[m_idWidgetDisplayed]->onRegenerateDisplay(); } diff --git a/sources/ewol/widget/Container2.h b/sources/ewol/widget/Container2.h index a1cabe54..08f05f1a 100644 --- a/sources/ewol/widget/Container2.h +++ b/sources/ewol/widget/Container2.h @@ -34,7 +34,7 @@ namespace ewol { /** * @brief Destructor */ - ~Container2(void); + ~Container2(); private: /** * @brief Specify the current widget @@ -71,14 +71,14 @@ namespace ewol { * @brief get the current displayed composition * @return The base widget */ - ewol::Widget* getSubWidget(void) const { + ewol::Widget* getSubWidget() const { return getSubWidget(0); }; /** * @brief get the current displayed composition * @return The toggle widget */ - ewol::Widget* getSubWidgetToggle(void) const { + ewol::Widget* getSubWidgetToggle() const { return getSubWidget(1); }; private: @@ -91,13 +91,13 @@ namespace ewol { /** * @brief remove the subWidget node (async). */ - void subWidgetRemove(void) { + void subWidgetRemove() { subWidgetRemove(0); } /** * @brief remove the subWidget Toggle node (async). */ - void subWidgetRemoveToggle(void) { + void subWidgetRemoveToggle() { subWidgetRemove(1); } private: @@ -110,13 +110,13 @@ namespace ewol { /** * @brief Unlink the subwidget Node. */ - void subWidgetUnLink(void) { + void subWidgetUnLink() { subWidgetUnLink(0); } /** * @brief Unlink the subwidget Toggle Node. */ - void subWidgetUnLinkToggle(void) { + void subWidgetUnLinkToggle() { subWidgetUnLink(1); } protected: @@ -137,7 +137,7 @@ namespace ewol { /** * @brief Called when parsing a XML and detect the presence of a second Widget */ - virtual void onDetectPresenceToggleWidget(void) {} + virtual void onDetectPresenceToggleWidget() {} /** * @brief convert ID of the widget if not existed * @param[in] _id Id of the widget to display. @@ -151,12 +151,12 @@ namespace ewol { } public: // Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual void onObjectRemove(ewol::Object* _removeObject); virtual void calculateSize(const vec2& _availlable) { calculateSizePadded(_availlable); } - virtual void calculateMinMaxSize(void) { + virtual void calculateMinMaxSize() { calculateMinMaxSizePadded(); } //virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); diff --git a/sources/ewol/widget/ContainerN.cpp b/sources/ewol/widget/ContainerN.cpp index c172b4b7..aa9e96ff 100644 --- a/sources/ewol/widget/ContainerN.cpp +++ b/sources/ewol/widget/ContainerN.cpp @@ -15,19 +15,19 @@ #define __class__ "ContainerN" -ewol::widget::ContainerN::ContainerN(void) : +ewol::widget::ContainerN::ContainerN() : m_lockExpand(false,false), m_subExpend(false,false) { addObjectType("ewol::widget::ContainerN"); // nothing to do ... } -ewol::widget::ContainerN::~ContainerN(void) { +ewol::widget::ContainerN::~ContainerN() { subWidgetRemoveAll(); } -bvec2 ewol::widget::ContainerN::canExpand(void) { +bvec2 ewol::widget::ContainerN::canExpand() { bvec2 res = m_userExpand; if (false == m_lockExpand.x()) { if (true == m_subExpend.x()) { @@ -119,7 +119,7 @@ void ewol::widget::ContainerN::subWidgetUnLink(ewol::Widget* _newWidget) { } } -void ewol::widget::ContainerN::subWidgetRemoveAll(void) { +void ewol::widget::ContainerN::subWidgetRemoveAll() { size_t errorControl = m_subWidget.size(); // the size automaticly decrement with the auto call of the onObjectRemove function while (m_subWidget.size() > 0 ) { @@ -140,7 +140,7 @@ void ewol::widget::ContainerN::subWidgetRemoveAll(void) { m_subWidget.clear(); } -void ewol::widget::ContainerN::subWidgetRemoveAllDelayed(void) { +void ewol::widget::ContainerN::subWidgetRemoveAllDelayed() { // the size automaticly decrement with the auto call of the onObjectRemove function for (size_t iii=0; iiionRegenerateDisplay(); diff --git a/sources/ewol/widget/ContainerN.h b/sources/ewol/widget/ContainerN.h index 87a9186c..db01ec02 100644 --- a/sources/ewol/widget/ContainerN.h +++ b/sources/ewol/widget/ContainerN.h @@ -26,11 +26,11 @@ namespace ewol { /** * @brief Constructor */ - ContainerN(void); + ContainerN(); /** * @brief Destructor */ - ~ContainerN(void); + ~ContainerN(); protected: bvec2 m_lockExpand; //!< Lock the expend of the sub widget to this one == > this permit to limit bigger subWidget bvec2 m_subExpend; //!< reference of the sub element expention requested. @@ -41,16 +41,16 @@ namespace ewol { */ void lockExpand(const bvec2& _lockExpand); // herited function - virtual bvec2 canExpand(void); + virtual bvec2 canExpand(); public: /** * @brief remove all sub element from the widget. */ - virtual void subWidgetRemoveAll(void); + virtual void subWidgetRemoveAll(); /** * @brief remove all sub element from the widget (delayed to prevent remove in the callbback). */ - virtual void subWidgetRemoveAllDelayed(void); + virtual void subWidgetRemoveAllDelayed(); /** * @brief add at end position a Widget (note : This system use an inverted phylisophie (button to top, and left to right) * @param[in] _newWidget the element pointer @@ -87,10 +87,10 @@ namespace ewol { virtual void subWidgetUnLink(ewol::Widget* _newWidget); public:// Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual void onObjectRemove(ewol::Object* _removeObject); virtual void calculateSize(const vec2& _availlable); - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); virtual ewol::Widget* getWidgetNamed(const std::string& _widgetName); virtual bool loadXML(exml::Element* _node); diff --git a/sources/ewol/widget/ContextMenu.cpp b/sources/ewol/widget/ContextMenu.cpp index d61888ca..b6aac316 100644 --- a/sources/ewol/widget/ContextMenu.cpp +++ b/sources/ewol/widget/ContextMenu.cpp @@ -21,7 +21,7 @@ const char* const ewol::widget::ContextMenu::configArrowPosition = "arrow-positi const char* const ewol::widget::ContextMenu::configArrowMode = "arrow-mode"; const char* const ewol::widget::ContextMenu::configShaper = "shaper"; -static ewol::Widget* Create(void) { +static ewol::Widget* Create() { return new ewol::widget::ContextMenu(); } @@ -53,7 +53,7 @@ ewol::widget::ContextMenu::ContextMenu(const std::string& _shaperName) : setMouseLimit(1); } -ewol::widget::ContextMenu::~ContextMenu(void) { +ewol::widget::ContextMenu::~ContextMenu() { } @@ -131,7 +131,7 @@ void ewol::widget::ContextMenu::calculateSize(const vec2& _availlable) { } -void ewol::widget::ContextMenu::calculateMinMaxSize(void) { +void ewol::widget::ContextMenu::calculateMinMaxSize() { // call main class to calculate the min size... ewol::widget::Container::calculateMinMaxSize(); // add padding of the display @@ -142,13 +142,13 @@ void ewol::widget::ContextMenu::calculateMinMaxSize(void) { } -void ewol::widget::ContextMenu::onDraw(void) { +void ewol::widget::ContextMenu::onDraw() { m_compositing.draw(); m_shaper.draw(); } -void ewol::widget::ContextMenu::onRegenerateDisplay(void) { +void ewol::widget::ContextMenu::onRegenerateDisplay() { // call upper class : ewol::widget::Container::onRegenerateDisplay(); if (needRedraw() == false) { diff --git a/sources/ewol/widget/ContextMenu.h b/sources/ewol/widget/ContextMenu.h index 11a8e40a..8597a283 100644 --- a/sources/ewol/widget/ContextMenu.h +++ b/sources/ewol/widget/ContextMenu.h @@ -39,7 +39,7 @@ namespace ewol { static const char* const configShaper; public: ContextMenu(const std::string& _shaperName="THEME:GUI:ContextMenu.json"); - virtual ~ContextMenu(void); + virtual ~ContextMenu(); private: ewol::compositing::Shaper m_shaper; //!< Compositing theme. public: @@ -61,14 +61,14 @@ namespace ewol { public: void setPositionMark(enum markPosition position, vec2 arrowPos); protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; public: // Derived function - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual void calculateSize(const vec2& availlable); - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); virtual ewol::Widget* getWidgetAtPos(const vec2& pos); }; }; diff --git a/sources/ewol/widget/Entry.cpp b/sources/ewol/widget/Entry.cpp index 2b0330f7..958fb6b0 100644 --- a/sources/ewol/widget/Entry.cpp +++ b/sources/ewol/widget/Entry.cpp @@ -29,7 +29,7 @@ const char * const ewolEventEntrySelect = "ewol-widget-entry-event-internal-sele #define STATUS_HOVER (1) #define STATUS_SELECTED (2) -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Entry(); } @@ -83,7 +83,7 @@ ewol::widget::Entry::Entry(std::string _newData) : } -ewol::widget::Entry::~Entry(void) { +ewol::widget::Entry::~Entry() { } @@ -97,7 +97,7 @@ void ewol::widget::Entry::setMaxChar(int32_t _nbMax) { } -void ewol::widget::Entry::calculateMinMaxSize(void) { +void ewol::widget::Entry::calculateMinMaxSize() { // call main class ewol::Widget::calculateMinMaxSize(); // get generic padding @@ -129,13 +129,13 @@ void ewol::widget::Entry::setValue(const std::string& _newData) { } -void ewol::widget::Entry::onDraw(void) { +void ewol::widget::Entry::onDraw() { m_shaper.draw(); m_text.draw(); } -void ewol::widget::Entry::onRegenerateDisplay(void) { +void ewol::widget::Entry::onRegenerateDisplay() { if (true == needRedraw()) { m_shaper.clear(); m_text.clear(); @@ -229,7 +229,7 @@ void ewol::widget::Entry::updateCursorPosition(const vec2& _pos, bool _selection } -void ewol::widget::Entry::removeSelected(void) { +void ewol::widget::Entry::removeSelected() { if (m_displayCursorPosSelection == m_displayCursorPos) { // nothing to cut ... return; @@ -500,11 +500,11 @@ void ewol::widget::Entry::onReceiveMessage(const ewol::object::Message& _msg) { } } -void ewol::widget::Entry::markToUpdateTextPosition(void) { +void ewol::widget::Entry::markToUpdateTextPosition() { m_needUpdateTextPos=true; } -void ewol::widget::Entry::updateTextPosition(void) { +void ewol::widget::Entry::updateTextPosition() { if (false == m_needUpdateTextPos) { return; } @@ -539,14 +539,14 @@ void ewol::widget::Entry::updateTextPosition(void) { } } -void ewol::widget::Entry::onGetFocus(void) { +void ewol::widget::Entry::onGetFocus() { m_displayCursor = true; changeStatusIn(STATUS_SELECTED); showKeyboard(); markToRedraw(); } -void ewol::widget::Entry::onLostFocus(void) { +void ewol::widget::Entry::onLostFocus() { m_displayCursor = false; changeStatusIn(STATUS_NORMAL); hideKeyboard(); diff --git a/sources/ewol/widget/Entry.h b/sources/ewol/widget/Entry.h index fcedd7f3..a73c2501 100644 --- a/sources/ewol/widget/Entry.h +++ b/sources/ewol/widget/Entry.h @@ -60,7 +60,7 @@ namespace ewol { /** * @brief Destuctor */ - virtual ~Entry(void); + virtual ~Entry(); private: std::string m_data; //!< sting that must be displayed @@ -80,7 +80,7 @@ namespace ewol { * @brief get the current value in the entry * @return The current display value */ - std::string getValue(void) const { + std::string getValue() const { return m_data; }; @@ -96,7 +96,7 @@ namespace ewol { * @brief Limit the number of Unicode character in the entry * @return Number of max character set in the List. */ - int32_t getMaxChar(void) const { + int32_t getMaxChar() const { return m_maxCharacter; }; private: @@ -111,7 +111,7 @@ namespace ewol { * @brief get the regualar expression limitation * @param The regExp string */ - std::string getRegExp(void) const { + std::string getRegExp() const { return m_regExp.getRegExp(); }; private: @@ -124,12 +124,12 @@ namespace ewol { /** * @brief informe the system thet the text change and the start position change */ - virtual void markToUpdateTextPosition(void); + virtual void markToUpdateTextPosition(); /** * @brief update the display position start == > depending of the position of the Cursor and the size of the Data inside * @change m_displayStartPosition < == updated */ - virtual void updateTextPosition(void); + virtual void updateTextPosition(); /** * @brief change the cursor position with the curent position requested on the display * @param[in] _pos Absolute position of the event @@ -147,7 +147,7 @@ namespace ewol { * @brief remove the selected area * @note This request a regeneration of the display */ - virtual void removeSelected(void); + virtual void removeSelected(); private: std::string m_textWhenNothing; //!< Text to display when nothing in in the entry (decorated text...) public: @@ -160,20 +160,20 @@ namespace ewol { * @brief get The text displayed when nothing is in the entry. * @return Text display when nothing */ - const std::string& getEmptyText(void) const { + const std::string& getEmptyText() const { return m_textWhenNothing; }; public: // Derived function - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual bool onEventEntry(const ewol::event::Entry& _event); virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onEventClipboard(enum ewol::context::clipBoard::clipboardListe _clipboardID); - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); protected: // Derived function - virtual void onDraw(void); - virtual void onGetFocus(void); - virtual void onLostFocus(void); + virtual void onDraw(); + virtual void onGetFocus(); + virtual void onLostFocus(); virtual void changeStatusIn(int32_t _newStatusId); virtual void periodicCall(const ewol::event::Time& _event); virtual bool onSetConfig(const ewol::object::Config& _conf); diff --git a/sources/ewol/widget/Gird.cpp b/sources/ewol/widget/Gird.cpp index d79cd785..68e15f44 100644 --- a/sources/ewol/widget/Gird.cpp +++ b/sources/ewol/widget/Gird.cpp @@ -15,7 +15,7 @@ #define __class__ "Gird" -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Gird(); } @@ -34,7 +34,7 @@ ewol::widget::Gird::Gird(int32_t _colNumber) : requestUpdateSize(); } -ewol::widget::Gird::~Gird(void) { +ewol::widget::Gird::~Gird() { EWOL_DEBUG("[" << getId() << "]={" << getObjectType() << "} Gird : destroy"); subWidgetRemoveAll(); } @@ -91,7 +91,7 @@ void ewol::widget::Gird::calculateSize(const vec2& _availlable) { markToRedraw(); } -void ewol::widget::Gird::calculateMinMaxSize(void) { +void ewol::widget::Gird::calculateMinMaxSize() { for (size_t iii=0; iii 0 ) { @@ -350,7 +350,7 @@ void ewol::widget::Gird::systemDraw(const ewol::DrawProperty& _displayProp) { } } -void ewol::widget::Gird::onRegenerateDisplay(void) { +void ewol::widget::Gird::onRegenerateDisplay() { for (size_t iii=0; iiionRegenerateDisplay(); diff --git a/sources/ewol/widget/Gird.h b/sources/ewol/widget/Gird.h index 05966d28..3a177298 100644 --- a/sources/ewol/widget/Gird.h +++ b/sources/ewol/widget/Gird.h @@ -44,7 +44,7 @@ namespace ewol { /** * @brief Desstructor */ - virtual ~Gird(void); + virtual ~Gird(); /** * @brief set the number of colomn * @param[in] colNumber Nuber of colomn @@ -71,18 +71,18 @@ namespace ewol { * @brief get the size view of the lines. * @return The size of the lines. */ - int32_t getRowSize(void); + int32_t getRowSize(); /** * @brief set the gravity of the widget on the Button (index 0 is on buttom) */ - void setGravityButtom(void) { + void setGravityButtom() { m_gavityButtom = true; markToRedraw(); } /** * @brief set the gravity of the widget on the Top (index 0 is on top) */ - void setGravityTop(void) { + void setGravityTop() { m_gavityButtom = false; markToRedraw(); } @@ -90,7 +90,7 @@ namespace ewol { /** * @brief remove all sub element from the widget. */ - virtual void subWidgetRemoveAll(void); + virtual void subWidgetRemoveAll(); /** * @brief add at end position a Widget (note : This system use an inverted phylisophie (button to top, and left to right) * @param[in] _colId Id of the colomn [0..x]. @@ -132,14 +132,14 @@ namespace ewol { * @brief get the current border size of the current element: * @return the border size (0 if not used) */ - const ivec2& getBorderSize(void) { return m_borderSize; }; + const ivec2& getBorderSize() { return m_borderSize; }; public: // Derived function virtual void systemDraw(const ewol::DrawProperty& _displayProp); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual ewol::Widget* getWidgetAtPos(const vec2& pos); virtual void onObjectRemove(ewol::Object* _removeObject); virtual void calculateSize(const vec2& _availlable); - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); }; }; }; diff --git a/sources/ewol/widget/Image.cpp b/sources/ewol/widget/Image.cpp index a39fa937..09b06240 100644 --- a/sources/ewol/widget/Image.cpp +++ b/sources/ewol/widget/Image.cpp @@ -16,7 +16,7 @@ #undef __class__ #define __class__ "Image" -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Image(); } @@ -58,7 +58,7 @@ ewol::widget::Image::Image(const std::string& _file, const ewol::Dimension& _bor set(_file, _border); } -ewol::widget::Image::~Image(void) { +ewol::widget::Image::~Image() { ewol::resource::ColorFile::release(m_colorProperty); } @@ -139,11 +139,11 @@ void ewol::widget::Image::set(const std::string& _file, const ewol::Dimension& _ setFile(_file); } -void ewol::widget::Image::onDraw(void) { +void ewol::widget::Image::onDraw() { m_compositing.draw(); } -void ewol::widget::Image::onRegenerateDisplay(void) { +void ewol::widget::Image::onRegenerateDisplay() { if (true == needRedraw()) { // remove data of the previous composition : m_compositing.clear(); @@ -197,7 +197,7 @@ void ewol::widget::Image::onRegenerateDisplay(void) { } } -void ewol::widget::Image::calculateMinMaxSize(void) { +void ewol::widget::Image::calculateMinMaxSize() { vec2 imageBoder = m_border.getPixel()*2.0f; vec2 imageSize = m_imageSize.getPixel(); if (imageSize!=vec2(0,0)) { diff --git a/sources/ewol/widget/Image.h b/sources/ewol/widget/Image.h index 929910d9..e9aa273b 100644 --- a/sources/ewol/widget/Image.h +++ b/sources/ewol/widget/Image.h @@ -52,7 +52,7 @@ namespace ewol { /** * @brief */ - virtual ~Image(void); + virtual ~Image(); /** * @brief set All the configuration of the current image * @param[in] _file Filaneme of the new image @@ -71,7 +71,7 @@ namespace ewol { * @brief get the file displayed * @return the filename of the image */ - const std::string& getFile(void) const { + const std::string& getFile() const { return m_fileName; }; protected: @@ -86,7 +86,7 @@ namespace ewol { * @brief get the current border request at the image * @return the border size */ - const ewol::Dimension& getBorder(void) const { + const ewol::Dimension& getBorder() const { return m_border; }; protected: @@ -101,7 +101,7 @@ namespace ewol { * @brief get the current border request at the image * @return the border size */ - const ewol::Dimension& getImageSize(void) const { + const ewol::Dimension& getImageSize() const { return m_imageSize; }; protected: @@ -116,7 +116,7 @@ namespace ewol { * @brief get the current status of keeping ratio. * @return The status of keeping the ratio of this image. */ - bool getKeepRatio(void) const { + bool getKeepRatio() const { return m_keepRatio; }; protected: @@ -131,7 +131,7 @@ namespace ewol { * @brief get the current 'start' position in the image to display. * @return The Position of the display in image */ - vec2 getStartPos(void) const { + vec2 getStartPos() const { return m_posStart; }; protected: @@ -146,7 +146,7 @@ namespace ewol { * @brief get the current 'stop' position in the image to display. * @return The Position of the display in image */ - vec2 getStopPos(void) const { + vec2 getStopPos() const { return m_posStop; }; public: @@ -161,16 +161,16 @@ namespace ewol { * @brief Get the distance field render mode. * @return Status of the distance field render mode. */ - bool getDistanceField(void) const { + bool getDistanceField() const { return m_compositing.getDistanceFieldMode(); } protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; public: // Derived function - virtual void calculateMinMaxSize(void); - virtual void onRegenerateDisplay(void); + virtual void calculateMinMaxSize(); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual bool loadXML(exml::Element* _node); }; diff --git a/sources/ewol/widget/Joystick.cpp b/sources/ewol/widget/Joystick.cpp index 825d1e62..9ab44ae3 100644 --- a/sources/ewol/widget/Joystick.cpp +++ b/sources/ewol/widget/Joystick.cpp @@ -24,7 +24,7 @@ static float l_ratio(1.0/7.0); #undef __class__ #define __class__ "Joystick" -ewol::widget::Joystick::Joystick(void) { +ewol::widget::Joystick::Joystick() { addObjectType("ewol::widget::Joystick"); addEventId(eventEnable); addEventId(eventDisable); @@ -51,7 +51,7 @@ ewol::widget::Joystick::Joystick(void) { } -ewol::widget::Joystick::~Joystick(void) { +ewol::widget::Joystick::~Joystick() { } @@ -62,7 +62,7 @@ void ewol::widget::Joystick::calculateSize(const vec2& availlable) { markToRedraw(); } -void ewol::widget::Joystick::onRegenerateDisplay(void) { +void ewol::widget::Joystick::onRegenerateDisplay() { if (true == needRedraw()) { // clean the object list ... diff --git a/sources/ewol/widget/Joystick.h b/sources/ewol/widget/Joystick.h index 86ddd883..7d983f54 100644 --- a/sources/ewol/widget/Joystick.h +++ b/sources/ewol/widget/Joystick.h @@ -46,8 +46,8 @@ namespace ewol { std::string m_foreground; float m_ratio; public: - Joystick(void); - virtual ~Joystick(void); + Joystick(); + virtual ~Joystick(); public: void setLockMode(bool _lockWhenOut) { m_lock = _lockWhenOut; @@ -80,7 +80,7 @@ namespace ewol { public: // Derived function virtual void calculateSize(const vec2& _availlable); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); }; }; diff --git a/sources/ewol/widget/Label.cpp b/sources/ewol/widget/Label.cpp index 185f7844..fbff21cd 100644 --- a/sources/ewol/widget/Label.cpp +++ b/sources/ewol/widget/Label.cpp @@ -18,7 +18,7 @@ const char * const ewol::widget::Label::eventPressed = "pressed"; const char* const ewol::widget::Label::configValue = "value"; -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Label(); } @@ -43,11 +43,11 @@ ewol::widget::Label::Label(std::string _newLabel) : registerConfig(configValue, "string", NULL, "displayed value string"); // TODO : do not store in attibute... } -ewol::widget::Label::~Label(void) { +ewol::widget::Label::~Label() { ewol::resource::ColorFile::release(m_colorProperty); } -void ewol::widget::Label::calculateMinMaxSize(void) { +void ewol::widget::Label::calculateMinMaxSize() { vec2 tmpMax = m_userMaxSize.getPixel(); vec2 tmpMin = m_userMinSize.getPixel(); //EWOL_DEBUG("[" << getId() << "] {" << getObjectType() << "} tmpMax : " << tmpMax); @@ -69,15 +69,15 @@ void ewol::widget::Label::setLabel(const std::string& _newLabel) { requestUpdateSize(); } -std::string ewol::widget::Label::getLabel(void) const { +std::string ewol::widget::Label::getLabel() const { return std::to_string(m_label); } -void ewol::widget::Label::onDraw(void) { +void ewol::widget::Label::onDraw() { m_text.draw(); } -void ewol::widget::Label::onRegenerateDisplay(void) { +void ewol::widget::Label::onRegenerateDisplay() { if (needRedraw() == false) { return; } diff --git a/sources/ewol/widget/Label.h b/sources/ewol/widget/Label.h index 87c67035..7547d047 100644 --- a/sources/ewol/widget/Label.h +++ b/sources/ewol/widget/Label.h @@ -46,7 +46,7 @@ namespace ewol { /** * @brief destructor */ - virtual ~Label(void); + virtual ~Label(); /** * @brief change the label displayed * @param[in] _newLabel The displayed decorated text. @@ -60,18 +60,18 @@ namespace ewol { * @brief get the current displayed label * @return The displayed decorated text. */ - std::string getLabel(void) const; + std::string getLabel() const; //! @previous - inline std::string getValue(void) const { + inline std::string getValue() const { return getLabel(); }; protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; public: // Derived function - virtual void calculateMinMaxSize(void); - virtual void onRegenerateDisplay(void); + virtual void calculateMinMaxSize(); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual bool loadXML(exml::Element* _node); }; diff --git a/sources/ewol/widget/Layer.cpp b/sources/ewol/widget/Layer.cpp index 4b6f52a7..a1ea0b44 100644 --- a/sources/ewol/widget/Layer.cpp +++ b/sources/ewol/widget/Layer.cpp @@ -13,7 +13,7 @@ #undef __class__ #define __class__ "Layer" -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Layer(); } @@ -21,11 +21,11 @@ void ewol::widget::Layer::init(ewol::widget::Manager& _widgetManager) { _widgetManager.addWidgetCreator(__class__,&create); } -ewol::widget::Layer::Layer(void) { +ewol::widget::Layer::Layer() { addObjectType("ewol::widget::Layer"); } -ewol::widget::Layer::~Layer(void) { +ewol::widget::Layer::~Layer() { EWOL_DEBUG("[" << getId() << "] Layer : destroy"); } diff --git a/sources/ewol/widget/Layer.h b/sources/ewol/widget/Layer.h index 4596b526..687e10c0 100644 --- a/sources/ewol/widget/Layer.h +++ b/sources/ewol/widget/Layer.h @@ -29,11 +29,11 @@ namespace ewol { /** * @brief Constructor */ - Layer(void); + Layer(); /** * @brief Desstructor */ - virtual ~Layer(void); + virtual ~Layer(); public: // Derived function virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); }; diff --git a/sources/ewol/widget/List.cpp b/sources/ewol/widget/List.cpp index 2a3948f1..d97ea2bc 100644 --- a/sources/ewol/widget/List.cpp +++ b/sources/ewol/widget/List.cpp @@ -16,7 +16,7 @@ #define __class__ "List" -ewol::widget::List::List(void) { +ewol::widget::List::List() { addObjectType("ewol::widget::List"); m_paddingSizeX = 2; #ifdef __TARGET_OS__Android @@ -28,7 +28,7 @@ ewol::widget::List::List(void) { setCanHaveFocus(true); } -ewol::widget::List::~List(void) { +ewol::widget::List::~List() { //clean all the object for (size_t iii=0; iiidraw(); @@ -102,7 +102,7 @@ void ewol::widget::List::onDraw(void) { WidgetScrolled::onDraw(); } -void ewol::widget::List::onRegenerateDisplay(void) { +void ewol::widget::List::onRegenerateDisplay() { if (true == needRedraw()) { // clean the object list ... @@ -240,10 +240,10 @@ bool ewol::widget::List::onEventInput(const ewol::event::Input& _event) { return isUsed; } -void ewol::widget::List::onGetFocus(void) { +void ewol::widget::List::onGetFocus() { EWOL_DEBUG("Ewol::List get focus"); } -void ewol::widget::List::onLostFocus(void) { +void ewol::widget::List::onLostFocus() { EWOL_DEBUG("Ewol::List Lost focus"); } diff --git a/sources/ewol/widget/List.h b/sources/ewol/widget/List.h index af857a71..b2e06b55 100644 --- a/sources/ewol/widget/List.h +++ b/sources/ewol/widget/List.h @@ -22,9 +22,9 @@ namespace ewol { */ class List : public ewol::widget::WidgetScrolled { public: - List(void); - virtual ~List(void); - virtual void calculateMinMaxSize(void); + List(); + virtual ~List(); + virtual void calculateMinMaxSize(); void setLabel(std::string _newLabel); // drawing capabilities .... private: @@ -32,7 +32,7 @@ namespace ewol { std::vector m_lineSize; public: void addOObject(ewol::Compositing* _newObject, int32_t _pos=-1); - void clearOObjectList(void); + void clearOObjectList(); // list properties ... private: int32_t m_paddingSizeX; @@ -42,17 +42,17 @@ namespace ewol { int32_t m_nbVisibleRaw; // set the number of visible raw (calculate don display) protected: // function call to display the list : - virtual etk::Color<> getBasicBG(void) { + virtual etk::Color<> getBasicBG() { return etk::Color<>(0xFFFFFFFF); } - virtual uint32_t getNuberOfColomn(void) { + virtual uint32_t getNuberOfColomn() { return 1; }; virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<> &_fg, etk::Color<> &_bg) { _myTitle = ""; return false; }; - virtual uint32_t getNuberOfRaw(void) { + virtual uint32_t getNuberOfRaw() { return 0; }; virtual bool getElement(int32_t _colomn, int32_t _raw, std::string &_myTextToWrite, etk::Color<> &_fg, etk::Color<> &_bg) { @@ -75,11 +75,11 @@ namespace ewol { */ void setRawVisible(int32_t _id); protected: // Derived function - virtual void onGetFocus(void); - virtual void onLostFocus(void); - virtual void onDraw(void); + virtual void onGetFocus(); + virtual void onLostFocus(); + virtual void onDraw(); public: // Derived function - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); }; }; diff --git a/sources/ewol/widget/ListFileSystem.cpp b/sources/ewol/widget/ListFileSystem.cpp index e93f8254..9087bb78 100644 --- a/sources/ewol/widget/ListFileSystem.cpp +++ b/sources/ewol/widget/ListFileSystem.cpp @@ -15,7 +15,7 @@ #undef __class__ #define __class__ "ListFileSystem" -static ewol::Widget* Create(void) { +static ewol::Widget* Create() { return new ewol::widget::ListFileSystem(); } @@ -35,7 +35,7 @@ const char* const ewol::widget::ListFileSystem::configShowTemporary = "show-temp const char* const ewol::widget::ListFileSystem::configPath = "path"; const char* const ewol::widget::ListFileSystem::configSelect = "select"; -ewol::widget::ListFileSystem::ListFileSystem(void) : +ewol::widget::ListFileSystem::ListFileSystem() : m_selectedLine(-1), m_folder ("/"), m_showFile(true), @@ -68,12 +68,12 @@ ewol::widget::ListFileSystem::ListFileSystem(void) : setMouseLimit(1); }; -ewol::widget::ListFileSystem::~ListFileSystem(void) { +ewol::widget::ListFileSystem::~ListFileSystem() { clearList(); ewol::resource::ColorFile::release(m_colorProperty); }; -void ewol::widget::ListFileSystem::clearList(void) { +void ewol::widget::ListFileSystem::clearList() { for (size_t iii=0; iii ewol::widget::ListFileSystem::getBasicBG(void) { +etk::Color<> ewol::widget::ListFileSystem::getBasicBG() { return m_colorProperty->get(m_colorIdBackground1); } -void ewol::widget::ListFileSystem::regenerateView(void) { +void ewol::widget::ListFileSystem::regenerateView() { clearList(); m_selectedLine = -1; m_list.clear(); @@ -99,7 +99,7 @@ void ewol::widget::ListFileSystem::regenerateView(void) { markToRedraw(); } -std::string ewol::widget::ListFileSystem::getSelect(void) const { +std::string ewol::widget::ListFileSystem::getSelect() const { std::string tmpVal = ""; if (m_selectedLine >= 0) { if (m_list[m_selectedLine] != NULL) { @@ -126,7 +126,7 @@ void ewol::widget::ListFileSystem::setSelect(const std::string& _data) { markToRedraw(); } -uint32_t ewol::widget::ListFileSystem::getNuberOfColomn(void) { +uint32_t ewol::widget::ListFileSystem::getNuberOfColomn() { return 1; } @@ -135,7 +135,7 @@ bool ewol::widget::ListFileSystem::getTitle(int32_t _colomn, std::string &_myTit return true; } -uint32_t ewol::widget::ListFileSystem::getNuberOfRaw(void) { +uint32_t ewol::widget::ListFileSystem::getNuberOfRaw() { int32_t offset = 0; if (m_showFolder == true) { if (m_folder == "/") { diff --git a/sources/ewol/widget/ListFileSystem.h b/sources/ewol/widget/ListFileSystem.h index d67e7e56..cd983840 100644 --- a/sources/ewol/widget/ListFileSystem.h +++ b/sources/ewol/widget/ListFileSystem.h @@ -36,8 +36,8 @@ namespace ewol { static const char* const configSelect; // TODO : Add a standalone configuration .. public: - ListFileSystem(void); - ~ListFileSystem(void); + ListFileSystem(); + ~ListFileSystem(); protected: ewol::resource::ColorFile* m_colorProperty; //!< theme color property. int32_t m_colorIdText; //!< Color of the text. @@ -45,10 +45,10 @@ namespace ewol { int32_t m_colorIdBackground2; //!< Color of the Background 2. int32_t m_colorIdBackgroundSelected; //!< Color of line selected. protected : // Derived function from the List... - virtual etk::Color<> getBasicBG(void); - virtual uint32_t getNuberOfColomn(void); + virtual etk::Color<> getBasicBG(); + virtual uint32_t getNuberOfColomn(); virtual bool getTitle(int32_t _colomn, std::string& _myTitle, etk::Color<>& _fg, etk::Color<>& _bg); - virtual uint32_t getNuberOfRaw(void); + virtual uint32_t getNuberOfRaw(); virtual bool getElement(int32_t _colomn, int32_t _raw, std::string& _myTextToWrite, etk::Color<>& _fg, etk::Color<>& _bg); virtual bool onItemEvent(int32_t _IdInput, enum ewol::key::status _typeEvent, int32_t _colomn, int32_t _raw, float _x, float _y); protected: @@ -56,11 +56,11 @@ namespace ewol { /** * @brief Clean the list of element. */ - void clearList(void); + void clearList(); /** * @brief Regenerate the content of the view. this is actually not automation on the system update. */ - virtual void regenerateView(void); + virtual void regenerateView(); protected: int32_t m_selectedLine; //!< Current Line ID that is selected public: @@ -73,7 +73,7 @@ namespace ewol { * @brief Get the current selected file/folder/... in the list * @return the String of the element selected. */ - std::string getSelect(void) const ; + std::string getSelect() const ; protected: std::string m_folder; //!< Current folder that display point on. public: @@ -89,7 +89,7 @@ namespace ewol { * @brief Get the element current displaying folder path. * @return Path on the folder. */ - const std::string& getFolder(void) const { + const std::string& getFolder() const { return m_folder; }; protected: @@ -107,7 +107,7 @@ namespace ewol { * @brief Get the status of the displaying files or Not. * @return The status on displaying the 'file'. */ - bool getShowFiles(void) const { + bool getShowFiles() const { return m_showFile; }; protected: @@ -125,7 +125,7 @@ namespace ewol { * @brief Get the status of the displaying fodlers or Not. * @return The status on displaying the 'folder'. */ - bool getShowFolder(void) const { + bool getShowFolder() const { return m_showFile; }; protected: @@ -143,7 +143,7 @@ namespace ewol { * @brief Get the status of the displaying hidden files or folder or Not. * @return The status on displaying the hidden element. */ - bool getShowHidden(void) const { + bool getShowHidden() const { return m_showFile; }; protected: @@ -161,7 +161,7 @@ namespace ewol { * @brief Get the status of the displaying temporary file (xxx~, xxx.bck, xxx.pyc) or Not. * @return The status on displaying temporary files. */ - bool getShowTemporaryFiles(void) const { + bool getShowTemporaryFiles() const { return m_showFile; }; public: // glocal derived functions diff --git a/sources/ewol/widget/Manager.cpp b/sources/ewol/widget/Manager.cpp index a088ec87..263651f9 100644 --- a/sources/ewol/widget/Manager.cpp +++ b/sources/ewol/widget/Manager.cpp @@ -31,7 +31,7 @@ #undef __class__ #define __class__ "ewol::widget::Manager" -ewol::widget::Manager::Manager(void) : +ewol::widget::Manager::Manager() : m_focusWidgetDefault(NULL), m_focusWidgetCurrent(NULL), m_havePeriodic(false), @@ -62,7 +62,7 @@ ewol::widget::Manager::Manager(void) : ewol::widget::ListFileSystem::init(*this); } -ewol::widget::Manager::~Manager(void) { +ewol::widget::Manager::~Manager() { EWOL_DEBUG(" == > Un-Init Widget-Manager"); EWOL_INFO("Realease all FOCUS"); focusSetDefault(NULL); @@ -126,7 +126,7 @@ void ewol::widget::Manager::focusSetDefault(ewol::Widget * _newWidget) { m_focusWidgetDefault = _newWidget; } -void ewol::widget::Manager::focusRelease(void) { +void ewol::widget::Manager::focusRelease() { if (m_focusWidgetDefault == m_focusWidgetCurrent) { // nothink to do ... return; @@ -143,7 +143,7 @@ void ewol::widget::Manager::focusRelease(void) { } -ewol::Widget * ewol::widget::Manager::focusGet(void) { +ewol::Widget * ewol::widget::Manager::focusGet() { return m_focusWidgetCurrent; } @@ -228,15 +228,15 @@ void ewol::widget::Manager::periodicCall(int64_t _localTime) { } } -bool ewol::widget::Manager::periodicCallHave(void) { +bool ewol::widget::Manager::periodicCallHave() { return m_havePeriodic; } -void ewol::widget::Manager::markDrawingIsNeeded(void) { +void ewol::widget::Manager::markDrawingIsNeeded() { m_haveRedraw = true; } -bool ewol::widget::Manager::isDrawingNeeded(void) { +bool ewol::widget::Manager::isDrawingNeeded() { bool tmp = m_haveRedraw; m_haveRedraw = false; return tmp; @@ -276,7 +276,7 @@ bool ewol::widget::Manager::exist(const std::string& _name) { return m_creatorList.exist(nameLower); } -std::string ewol::widget::Manager::list(void) { +std::string ewol::widget::Manager::list() { std::string tmpVal; for (int32_t iii=0; iiim_localId; } -void ewol::widget::Menu::addSpacer(void) { +void ewol::widget::Menu::addSpacer() { EWOL_TODO("NOT now..."); } diff --git a/sources/ewol/widget/Menu.h b/sources/ewol/widget/Menu.h index 3a8e5424..565cae6d 100644 --- a/sources/ewol/widget/Menu.h +++ b/sources/ewol/widget/Menu.h @@ -20,7 +20,7 @@ namespace ewol { namespace widget { class MenuElement { public : - MenuElement(void) : m_widgetPointer(NULL) { }; + MenuElement() : m_widgetPointer(NULL) { }; int32_t m_localId; int32_t m_parentId; ewol::Object* m_widgetPointer; @@ -34,10 +34,10 @@ namespace ewol { */ class Menu :public ewol::widget::Sizer { public: - Menu(void); - virtual ~Menu(void); + Menu(); + virtual ~Menu(); private: - virtual void subWidgetRemoveAll(void); + virtual void subWidgetRemoveAll(); virtual int32_t subWidgetAdd(ewol::Widget* _newWidget); virtual void subWidgetRemove(ewol::Widget* _newWidget); virtual void subWidgetUnLink(ewol::Widget* _newWidget); @@ -46,10 +46,10 @@ namespace ewol { int32_t m_staticId; // unique ID for every element of the menu ... ewol::widget::ContextMenu* m_widgetContextMenu; public: - void clear(void); + void clear(); int32_t addTitle(std::string _label, std::string _image="", const char * _generateEvent = NULL, const std::string _message = ""); int32_t add(int32_t parent, std::string _label, std::string _image="", const char * _generateEvent = NULL, const std::string _message = ""); - void addSpacer(void); + void addSpacer(); // Derived function virtual void onReceiveMessage(const ewol::object::Message& _msg); virtual void onObjectRemove(ewol::Object * _removeObject); diff --git a/sources/ewol/widget/PopUp.cpp b/sources/ewol/widget/PopUp.cpp index 57d3facd..cb9016d9 100644 --- a/sources/ewol/widget/PopUp.cpp +++ b/sources/ewol/widget/PopUp.cpp @@ -22,7 +22,7 @@ const char* const ewol::widget::PopUp::configLockExpand="lock"; static const char* annimationIncrease = "increase"; -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::PopUp(); } @@ -46,7 +46,7 @@ ewol::widget::PopUp::PopUp(const std::string& _shaperName) : addAnnimationType(ewol::Widget::annimationModeEnableAdd, annimationIncrease); } -ewol::widget::PopUp::~PopUp(void) { +ewol::widget::PopUp::~PopUp() { } @@ -113,11 +113,11 @@ void ewol::widget::PopUp::systemDraw(const ewol::DrawProperty& _displayProp) { } } -void ewol::widget::PopUp::onDraw(void) { +void ewol::widget::PopUp::onDraw() { m_shaper.draw(); } -void ewol::widget::PopUp::onRegenerateDisplay(void) { +void ewol::widget::PopUp::onRegenerateDisplay() { if (true == needRedraw()) { m_shaper.clear(); ewol::Padding padding = m_shaper.getPadding(); @@ -231,7 +231,7 @@ bool ewol::widget::PopUp::onStartAnnimation(enum ewol::Widget::annimationMode _m return false; } -void ewol::widget::PopUp::onStopAnnimation(void) { +void ewol::widget::PopUp::onStopAnnimation() { periodicCallDisable(); } diff --git a/sources/ewol/widget/PopUp.h b/sources/ewol/widget/PopUp.h index fe1eae08..3ebbf881 100644 --- a/sources/ewol/widget/PopUp.h +++ b/sources/ewol/widget/PopUp.h @@ -41,7 +41,7 @@ namespace ewol { /** * @brief Destructor */ - virtual ~PopUp(void); + virtual ~PopUp(); /** * @brief set the shaper name (use the contructer one this permit to not noad unused shaper) * @param[in] _shaperName The new shaper filename @@ -69,23 +69,23 @@ namespace ewol { * @brief get the status of the request the Auto-remove when the event input is set outside the widget. * @return the status of the removing */ - bool getRemoveOnExternClick(void) const { + bool getRemoveOnExternClick() const { return m_closeOutEvent; }; protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; public: // Derived function virtual void periodicCall(const ewol::event::Time& _event); virtual void systemDraw(const ewol::DrawProperty& _displayProp); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual void calculateSize(const vec2& _available); virtual bool onEventInput(const ewol::event::Input& _event); virtual ewol::Widget* getWidgetAtPos(const vec2& pos); protected: virtual bool onStartAnnimation(enum ewol::Widget::annimationMode _mode); - virtual void onStopAnnimation(void); + virtual void onStopAnnimation(); }; }; }; diff --git a/sources/ewol/widget/ProgressBar.cpp b/sources/ewol/widget/ProgressBar.cpp index d82b12d1..d62fb8a2 100644 --- a/sources/ewol/widget/ProgressBar.cpp +++ b/sources/ewol/widget/ProgressBar.cpp @@ -14,7 +14,7 @@ #undef __class__ #define __class__ "ProgressBar" -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::ProgressBar(); } @@ -29,7 +29,7 @@ const char* const ewol::widget::ProgressBar::configValue = "value"; const int32_t dotRadius = 6; -ewol::widget::ProgressBar::ProgressBar(void) { +ewol::widget::ProgressBar::ProgressBar() { addObjectType("ewol::widget::ProgressBar"); m_value = 0.0; @@ -47,11 +47,11 @@ ewol::widget::ProgressBar::ProgressBar(void) { } -ewol::widget::ProgressBar::~ProgressBar(void) { +ewol::widget::ProgressBar::~ProgressBar() { } -void ewol::widget::ProgressBar::calculateMinMaxSize(void) { +void ewol::widget::ProgressBar::calculateMinMaxSize() { vec2 tmpMin = m_userMinSize.getPixel(); m_minSize.setValue( etk_max(tmpMin.x(), 40), etk_max(tmpMin.y(), dotRadius*2) ); @@ -63,11 +63,11 @@ void ewol::widget::ProgressBar::setValue(float _val) { markToRedraw(); } -void ewol::widget::ProgressBar::onDraw(void) { +void ewol::widget::ProgressBar::onDraw() { m_draw.draw(); } -void ewol::widget::ProgressBar::onRegenerateDisplay(void) { +void ewol::widget::ProgressBar::onRegenerateDisplay() { if (true == needRedraw()) { // clean the object list ... m_draw.clear(); diff --git a/sources/ewol/widget/ProgressBar.h b/sources/ewol/widget/ProgressBar.h index 681e71bc..ef894bde 100644 --- a/sources/ewol/widget/ProgressBar.h +++ b/sources/ewol/widget/ProgressBar.h @@ -32,10 +32,10 @@ namespace ewol { private: ewol::compositing::Drawing m_draw; // basic drawing element public: - ProgressBar(void); - virtual ~ProgressBar(void); + ProgressBar(); + virtual ~ProgressBar(); void setValue(float _val); - float getValue(void) const { + float getValue() const { return m_value; }; void setColor(etk::Color<> _newColor) { @@ -47,12 +47,12 @@ namespace ewol { etk::Color<> m_textColorBgOn; //!< bar color enable etk::Color<> m_textColorBgOff; //!< bar color disable protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; public: // Derived function - virtual void onRegenerateDisplay(void); - virtual void calculateMinMaxSize(void); + virtual void onRegenerateDisplay(); + virtual void calculateMinMaxSize(); }; }; }; diff --git a/sources/ewol/widget/Scroll.cpp b/sources/ewol/widget/Scroll.cpp index 5a17276f..281c29d4 100644 --- a/sources/ewol/widget/Scroll.cpp +++ b/sources/ewol/widget/Scroll.cpp @@ -14,7 +14,7 @@ #undef __class__ #define __class__ "Scroll" -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Scroll(); } @@ -37,7 +37,7 @@ ewol::widget::Scroll::Scroll(const std::string& _shaperName) : registerConfig(configLimit, "vec2", NULL, "Limit the scroll maximum position [0..1]% represent the free space in the scoll when arrive at the end"); } -ewol::widget::Scroll::~Scroll(void) { +ewol::widget::Scroll::~Scroll() { } @@ -48,7 +48,7 @@ void ewol::widget::Scroll::setLimit(const vec2& _limit) { #define SCROLL_BAR_SPACE (15) -void ewol::widget::Scroll::calculateMinMaxSize(void) { +void ewol::widget::Scroll::calculateMinMaxSize() { // call main class !! and not containter class ... ewol::Widget::calculateMinMaxSize(); // call sub classes @@ -69,12 +69,12 @@ void ewol::widget::Scroll::systemDraw(const ewol::DrawProperty& _displayProp) { ewol::Widget::systemDraw(_displayProp); } -void ewol::widget::Scroll::onDraw(void) { +void ewol::widget::Scroll::onDraw() { m_shaperH.draw(); m_shaperV.draw(); } -void ewol::widget::Scroll::onRegenerateDisplay(void) { +void ewol::widget::Scroll::onRegenerateDisplay() { // call upper class ewol::widget::Container::onRegenerateDisplay(); if (needRedraw() == false) { diff --git a/sources/ewol/widget/Scroll.h b/sources/ewol/widget/Scroll.h index 364363e3..4875feb7 100644 --- a/sources/ewol/widget/Scroll.h +++ b/sources/ewol/widget/Scroll.h @@ -49,7 +49,7 @@ namespace ewol { enum ewol::key::type m_highSpeedType; public: Scroll(const std::string& _shaperName="THEME:GUI:WidgetScrolled.json"); - virtual ~Scroll(void); + virtual ~Scroll(); /** * @brief set the limit of scrolling * @note This permit to scoll element upper the end of the display @@ -60,16 +60,16 @@ namespace ewol { * @brief get the limit of scrolling * @return scrolling limit */ - const vec2& getLimit(void) const { return m_limit; }; + const vec2& getLimit() const { return m_limit; }; public: // Derived function - void calculateMinMaxSize(void); - virtual void onRegenerateDisplay(void); + void calculateMinMaxSize(); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); virtual void systemDraw(const ewol::DrawProperty& _displayProp); virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); protected: // Derived function - virtual void onDraw(void); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; }; diff --git a/sources/ewol/widget/Sizer.cpp b/sources/ewol/widget/Sizer.cpp index b132f2ff..04990570 100644 --- a/sources/ewol/widget/Sizer.cpp +++ b/sources/ewol/widget/Sizer.cpp @@ -16,7 +16,7 @@ const char* const ewol::widget::Sizer::configMode = "mode"; #undef __class__ #define __class__ "Sizer" -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Sizer(); } @@ -36,7 +36,7 @@ ewol::widget::Sizer::Sizer(enum displayMode _mode): } -ewol::widget::Sizer::~Sizer(void) { +ewol::widget::Sizer::~Sizer() { // disable annimation to remore "remove" error m_animation = animationNone; m_animationTime = 0; @@ -129,7 +129,7 @@ void ewol::widget::Sizer::calculateSize(const vec2& _availlable) { markToRedraw(); } -void ewol::widget::Sizer::calculateMinMaxSize(void) { +void ewol::widget::Sizer::calculateMinMaxSize() { EWOL_VERBOSE("[" << getId() << "] update minimum size"); m_subExpend.setValue(false, false); m_minSize = m_userMinSize.getPixel(); diff --git a/sources/ewol/widget/Sizer.h b/sources/ewol/widget/Sizer.h index 90053440..6cb32636 100644 --- a/sources/ewol/widget/Sizer.h +++ b/sources/ewol/widget/Sizer.h @@ -44,7 +44,7 @@ namespace ewol { /** * @brief Desstructor */ - virtual ~Sizer(void); + virtual ~Sizer(); /** * @brief set the mode to display elements. * @param[in] _mode The mode to display the elements. @@ -54,7 +54,7 @@ namespace ewol { * @brief get the mode to display elements. * @return The current mode to display the elements. */ - enum displayMode getMode(void) const { + enum displayMode getMode() const { return m_mode; } private: @@ -69,7 +69,7 @@ namespace ewol { * @brief get the current border size of the current element: * @return the border size (0 if not used) */ - const ewol::Dimension& getBorderSize(void) const { + const ewol::Dimension& getBorderSize() const { return m_borderSize; }; public: @@ -95,7 +95,7 @@ namespace ewol { * @brief get the current animation mode. * @return The animation mode. */ - enum animation getAnimationMode(void) { + enum animation getAnimationMode() { return m_animation; }; private: @@ -112,12 +112,12 @@ namespace ewol { * @brief get the current animation time. * @return The time to produce the animation. */ - float getAnimationTime(void) { + float getAnimationTime() { return m_animationTime; }; public: // Derived function virtual void calculateSize(const vec2& _availlable); - virtual void calculateMinMaxSize(void); + virtual void calculateMinMaxSize(); // overwrite the set fuction to start annimations ... virtual int32_t subWidgetAdd(ewol::Widget* _newWidget); virtual int32_t subWidgetAddStart(ewol::Widget* _newWidget); diff --git a/sources/ewol/widget/Slider.cpp b/sources/ewol/widget/Slider.cpp index 8412178c..973fe1d3 100644 --- a/sources/ewol/widget/Slider.cpp +++ b/sources/ewol/widget/Slider.cpp @@ -15,7 +15,7 @@ const char * const ewol::widget::Slider::eventChange = "change"; #undef __class__ #define __class__ "Slider" -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Slider(); } @@ -25,7 +25,7 @@ void ewol::widget::Slider::init(ewol::widget::Manager& _widgetManager) { const int32_t dotRadius = 6; -ewol::widget::Slider::Slider(void) { +ewol::widget::Slider::Slider() { addObjectType("ewol::widget::Slider"); addEventId(eventChange); @@ -42,11 +42,11 @@ ewol::widget::Slider::Slider(void) { setMouseLimit(1); } -ewol::widget::Slider::~Slider(void) { +ewol::widget::Slider::~Slider() { } -void ewol::widget::Slider::calculateMinMaxSize(void) { +void ewol::widget::Slider::calculateMinMaxSize() { vec2 minTmp = m_userMinSize.getPixel(); m_minSize.setValue(etk_max(minTmp.x(), 40), etk_max(minTmp.y(), dotRadius*2) ); @@ -58,7 +58,7 @@ void ewol::widget::Slider::setValue(int32_t _val) { markToRedraw(); } -int32_t ewol::widget::Slider::getValue(void) { +int32_t ewol::widget::Slider::getValue() { return m_value; } @@ -74,11 +74,11 @@ void ewol::widget::Slider::setMax(int32_t _val) { markToRedraw(); } -void ewol::widget::Slider::onDraw(void) { +void ewol::widget::Slider::onDraw() { m_draw.draw(); } -void ewol::widget::Slider::onRegenerateDisplay(void) { +void ewol::widget::Slider::onRegenerateDisplay() { if (needRedraw() == false) { return; } diff --git a/sources/ewol/widget/Slider.h b/sources/ewol/widget/Slider.h index e7f2e255..655d429f 100644 --- a/sources/ewol/widget/Slider.h +++ b/sources/ewol/widget/Slider.h @@ -27,10 +27,10 @@ namespace ewol { public: static void init(ewol::widget::Manager& _widgetManager); public: - Slider(void); - virtual ~Slider(void); + Slider(); + virtual ~Slider(); void setValue(int32_t _val); - int32_t getValue(void); + int32_t getValue(); void setMin(int32_t _val); void setMax(int32_t _val); void setColor(etk::Color<> _newColor) { @@ -44,9 +44,9 @@ namespace ewol { etk::Color<> m_textColorFg; //!< Text color etk::Color<> m_textColorBg; //!< Background color public: // Derived function - virtual void onDraw(void); - virtual void calculateMinMaxSize(void); - virtual void onRegenerateDisplay(void); + virtual void onDraw(); + virtual void calculateMinMaxSize(); + virtual void onRegenerateDisplay(); virtual bool onEventInput(const ewol::event::Input& _event); }; }; diff --git a/sources/ewol/widget/Spacer.cpp b/sources/ewol/widget/Spacer.cpp index 03d0bc72..1a54c861 100644 --- a/sources/ewol/widget/Spacer.cpp +++ b/sources/ewol/widget/Spacer.cpp @@ -16,7 +16,7 @@ const char* const ewol::widget::Spacer::configColor = "color"; -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::Spacer(); } @@ -24,7 +24,7 @@ void ewol::widget::Spacer::init(ewol::widget::Manager& _widgetManager) { _widgetManager.addWidgetCreator(__class__,&create); } -ewol::widget::Spacer::Spacer(void) { +ewol::widget::Spacer::Spacer() { addObjectType("ewol::widget::Spacer"); m_userMinSize = ewol::Dimension(vec2(10,10)); setCanHaveFocus(false); @@ -33,16 +33,16 @@ ewol::widget::Spacer::Spacer(void) { registerConfig(configColor, "color", NULL, "background of the spacer"); } -ewol::widget::Spacer::~Spacer(void) { +ewol::widget::Spacer::~Spacer() { } -void ewol::widget::Spacer::onDraw(void) { +void ewol::widget::Spacer::onDraw() { m_draw.draw(); } #define BORDER_SIZE_TMP (4) -void ewol::widget::Spacer::onRegenerateDisplay(void) { +void ewol::widget::Spacer::onRegenerateDisplay() { if (false == needRedraw()) { return; } diff --git a/sources/ewol/widget/Spacer.h b/sources/ewol/widget/Spacer.h index 6f1aa851..cd8566a2 100644 --- a/sources/ewol/widget/Spacer.h +++ b/sources/ewol/widget/Spacer.h @@ -32,11 +32,11 @@ namespace ewol { /** * @brief Main constructer */ - Spacer(void); + Spacer(); /** * @brief Main destructer */ - virtual ~Spacer(void); + virtual ~Spacer(); protected: etk::Color<> m_color; //!< Background color public: @@ -47,8 +47,8 @@ namespace ewol { void setColor(etk::Color<> _newColor) { m_color = _newColor; markToRedraw(); }; public: // Derived function virtual ewol::Widget * getWidgetAtPos(const vec2& _pos) { return NULL; }; - virtual void onRegenerateDisplay(void); - virtual void onDraw(void); + virtual void onRegenerateDisplay(); + virtual void onDraw(); virtual bool onSetConfig(const ewol::object::Config& _conf); virtual bool onGetConfig(const char* _config, std::string& _result) const; }; diff --git a/sources/ewol/widget/WSlider.cpp b/sources/ewol/widget/WSlider.cpp index c44ca249..95dda582 100644 --- a/sources/ewol/widget/WSlider.cpp +++ b/sources/ewol/widget/WSlider.cpp @@ -30,7 +30,7 @@ const char* const ewol::widget::WSlider::eventStopSlide = "ewol-widget-wslider-e const char* const ewol::widget::WSlider::configMode = "mode"; const char* const ewol::widget::WSlider::configSpeed = "speed"; -static ewol::Widget* create(void) { +static ewol::Widget* create() { return new ewol::widget::WSlider(); } @@ -38,7 +38,7 @@ void ewol::widget::WSlider::init(ewol::widget::Manager& _widgetManager) { _widgetManager.addWidgetCreator(__class__,&create); } -ewol::widget::WSlider::WSlider(void) : +ewol::widget::WSlider::WSlider() : m_windowsSources(0), m_windowsDestination(0), m_windowsRequested(-1), @@ -53,7 +53,7 @@ ewol::widget::WSlider::WSlider(void) : registerConfig(configSpeed, "float", NULL, "Transition speed of the slider"); } -ewol::widget::WSlider::~WSlider(void) { +ewol::widget::WSlider::~WSlider() { } @@ -247,7 +247,7 @@ void ewol::widget::WSlider::systemDraw(const ewol::DrawProperty& _displayProp) { } } -void ewol::widget::WSlider::onRegenerateDisplay(void) { +void ewol::widget::WSlider::onRegenerateDisplay() { if (m_windowsDestination == m_windowsSources) { int32_t iii = m_windowsDestination; if (iii >= 0 || (size_t)iii < m_subWidget.size()) { diff --git a/sources/ewol/widget/WSlider.h b/sources/ewol/widget/WSlider.h index e14e738c..2a1b57f4 100644 --- a/sources/ewol/widget/WSlider.h +++ b/sources/ewol/widget/WSlider.h @@ -35,8 +35,8 @@ namespace ewol { sladingTransition_count, }; public: - WSlider(void); - virtual ~WSlider(void); + WSlider(); + virtual ~WSlider(); private: int32_t m_windowsSources; //!< widget source viewed int32_t m_windowsDestination; //!< widget destinated viewed @@ -78,7 +78,7 @@ namespace ewol { * @brief get transition speed element. * @return number of second needed to do the transition. */ - float getTransitionSpeed(void) const { + float getTransitionSpeed() const { return m_transitionSpeed; }; private: @@ -93,13 +93,13 @@ namespace ewol { * @brief get a new mode of sliding element * @return The current sliding mode */ - enum sladingMode getTransitionMode(void) { + enum sladingMode getTransitionMode() { return m_transitionSlide; }; public: // Derived function virtual void calculateSize(const vec2& _availlable); virtual void systemDraw(const ewol::DrawProperty& _displayProp); - virtual void onRegenerateDisplay(void); + virtual void onRegenerateDisplay(); virtual ewol::Widget* getWidgetAtPos(const vec2& _pos); virtual void periodicCall(const ewol::event::Time& _event); virtual bool onSetConfig(const ewol::object::Config& _conf); diff --git a/sources/ewol/widget/Widget.cpp b/sources/ewol/widget/Widget.cpp index 25425d98..ea1547fd 100644 --- a/sources/ewol/widget/Widget.cpp +++ b/sources/ewol/widget/Widget.cpp @@ -104,7 +104,7 @@ const char* const ewol::Widget::eventAnnimationStart = "annimation-start"; const char* const ewol::Widget::eventAnnimationRatio = "annimation-ratio"; const char* const ewol::Widget::eventAnnimationStop = "annimation-stop"; -ewol::Widget::Widget(void) : +ewol::Widget::Widget() : m_up(NULL), m_size(10,10), m_minSize(0,0), @@ -152,7 +152,7 @@ ewol::Widget::Widget(void) : } -ewol::Widget::~Widget(void) { +ewol::Widget::~Widget() { // remove his own focus... getWidgetManager().rm(this); // clean all the short-cut ... @@ -178,7 +178,7 @@ void ewol::Widget::onObjectRemove(ewol::Object* _removeObject) { } } -void ewol::Widget::hide(void) { +void ewol::Widget::hide() { if (m_hide == false) { EWOL_WARNING("HIDE widget: '" << getName() << "'"); m_hide = true; @@ -187,7 +187,7 @@ void ewol::Widget::hide(void) { } } -void ewol::Widget::show(void) { +void ewol::Widget::show() { if (m_hide == true) { EWOL_WARNING("SHOW widget: '" << getName() << "'"); m_hide = false; @@ -202,7 +202,7 @@ void ewol::Widget::calculateSize(const vec2& _available) { markToRedraw(); } -bool ewol::Widget::setFocus(void) { +bool ewol::Widget::setFocus() { if (m_canFocus == true) { if (m_hasFocus == false) { m_hasFocus = true; @@ -213,7 +213,7 @@ bool ewol::Widget::setFocus(void) { return false; } -bool ewol::Widget::rmFocus(void) { +bool ewol::Widget::rmFocus() { if (m_canFocus == true) { if (m_hasFocus == true) { m_hasFocus = false; @@ -228,12 +228,12 @@ void ewol::Widget::setCanHaveFocus(bool _canFocusState) { if (m_canFocus != _canFocusState) { m_canFocus = _canFocusState; if (m_hasFocus == true) { - (void)rmFocus(); + rmFocus(); } } } -void ewol::Widget::keepFocus(void) { +void ewol::Widget::keepFocus() { getWidgetManager().focusKeep(this); } @@ -367,7 +367,7 @@ void ewol::Widget::systemDraw(const ewol::DrawProperty& _displayProp) { return; } -void ewol::Widget::periodicCallDisable(void) { +void ewol::Widget::periodicCallDisable() { m_periodicCallDeltaTime=0; m_periodicCallTime=-1; getWidgetManager().periodicCallRm(this); @@ -383,7 +383,7 @@ void ewol::Widget::periodicCallEnable(float _callInSecond) { } } -void ewol::Widget::markToRedraw(void) { +void ewol::Widget::markToRedraw() { if (m_needRegenerateDisplay == true) { return; } @@ -399,7 +399,7 @@ void ewol::Widget::setZoom(float _newVal) { markToRedraw(); } -float ewol::Widget::getZoom(void) { +float ewol::Widget::getZoom() { return m_zoom; } @@ -413,7 +413,7 @@ void ewol::Widget::setOrigin(const vec2& _pos) { m_origin = _pos; } -vec2 ewol::Widget::getOrigin(void) { +vec2 ewol::Widget::getOrigin() { return m_origin; } @@ -421,21 +421,21 @@ vec2 ewol::Widget::relativePosition(const vec2& _pos) { return _pos - m_origin; } -void ewol::Widget::calculateMinMaxSize(void) { +void ewol::Widget::calculateMinMaxSize() { m_minSize = m_userMinSize.getPixel(); //EWOL_ERROR("[" << getId() << "] convert in min size : " << m_userMinSize << " out=" << m_minSize); m_maxSize = m_userMaxSize.getPixel(); markToRedraw(); } -vec2 ewol::Widget::getCalculateMinSize(void) { +vec2 ewol::Widget::getCalculateMinSize() { if (false == isHide()) { return m_minSize; } return vec2(0,0); } -vec2 ewol::Widget::getCalculateMaxSize(void) { +vec2 ewol::Widget::getCalculateMaxSize() { if (false == isHide()) { return m_maxSize; } @@ -461,11 +461,11 @@ void ewol::Widget::setMinSize(const ewol::Dimension& _size) { requestUpdateSize(); } -void ewol::Widget::setNoMinSize(void) { +void ewol::Widget::setNoMinSize() { m_userMinSize.set(vec2(0,0),ewol::Dimension::Pixel); } -void ewol::Widget::checkMinSize(void) { +void ewol::Widget::checkMinSize() { vec2 pixelSize = m_userMinSize.getPixel(); m_minSize.setX(etk_max(m_minSize.x(), pixelSize.x())); m_minSize.setY(etk_max(m_minSize.y(), pixelSize.y())); @@ -490,17 +490,17 @@ void ewol::Widget::setMaxSize(const ewol::Dimension& _size) { requestUpdateSize(); } -void ewol::Widget::setNoMaxSize(void) { +void ewol::Widget::setNoMaxSize() { m_userMaxSize.set(vec2(ULTIMATE_MAX_SIZE,ULTIMATE_MAX_SIZE),ewol::Dimension::Pixel); } -void ewol::Widget::checkMaxSize(void) { +void ewol::Widget::checkMaxSize() { vec2 pixelSize = m_userMaxSize.getPixel(); m_maxSize.setX(etk_min(m_maxSize.x(), pixelSize.x())); m_maxSize.setY(etk_min(m_maxSize.y(), pixelSize.y())); } -vec2 ewol::Widget::getSize(void) { +vec2 ewol::Widget::getSize() { if (false == isHide()) { return m_size; } @@ -516,7 +516,7 @@ void ewol::Widget::setExpand(const bvec2& _newExpand) { } } -bvec2 ewol::Widget::canExpand(void) { +bvec2 ewol::Widget::canExpand() { if (false == isHide()) { return m_userExpand; } @@ -532,7 +532,7 @@ void ewol::Widget::setFill(const bvec2& _newFill) { } } -const bvec2& ewol::Widget::canFill(void) { +const bvec2& ewol::Widget::canFill() { return m_userFill; } @@ -636,7 +636,7 @@ void ewol::Widget::shortCutAdd(const char * _descriptiveString, m_localShortcut.push_back(tmpElement); } -void ewol::Widget::shortCutClean(void) { +void ewol::Widget::shortCutClean() { for (size_t iii=0; iii