diff --git a/esvg/Base.h b/esvg/Base.h index 87b58fd..c16aaa1 100644 --- a/esvg/Base.h +++ b/esvg/Base.h @@ -35,9 +35,9 @@ namespace esvg { agg::trans_affine m_transformMatrix; //!< specific render of the curent element const char * spacingDist(int32_t _spacing); public: - Base(void) {}; + Base() {}; Base(PaintState _parentPaintState); - virtual ~Base(void) { }; + virtual ~Base() { }; virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); //specific drawing for AAG librairy ... virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { }; diff --git a/esvg/Circle.cpp b/esvg/Circle.cpp index 455c014..e708fa6 100644 --- a/esvg/Circle.cpp +++ b/esvg/Circle.cpp @@ -18,7 +18,7 @@ esvg::Circle::Circle(PaintState _parentPaintState) : esvg::Base(_parentPaintStat } -esvg::Circle::~Circle(void) { +esvg::Circle::~Circle() { } diff --git a/esvg/Circle.h b/esvg/Circle.h index 1225161..ba79c3b 100644 --- a/esvg/Circle.h +++ b/esvg/Circle.h @@ -18,7 +18,7 @@ namespace esvg { float m_radius; //!< Radius of the Circle public: Circle(PaintState _parentPaintState); - ~Circle(void); + ~Circle(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t _spacing); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); diff --git a/esvg/Ellipse.cpp b/esvg/Ellipse.cpp index daa9994..c7086f4 100644 --- a/esvg/Ellipse.cpp +++ b/esvg/Ellipse.cpp @@ -18,7 +18,7 @@ esvg::Ellipse::Ellipse(PaintState _parentPaintState) : esvg::Base(_parentPaintSt } -esvg::Ellipse::~Ellipse(void) { +esvg::Ellipse::~Ellipse() { } diff --git a/esvg/Ellipse.h b/esvg/Ellipse.h index 340a049..02ed605 100644 --- a/esvg/Ellipse.h +++ b/esvg/Ellipse.h @@ -18,7 +18,7 @@ namespace esvg { etk::Vector2D m_r; //!< Radius property of the ellipse public: Ellipse(PaintState _parentPaintState); - ~Ellipse(void); + ~Ellipse(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t _spacing); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); diff --git a/esvg/Group.cpp b/esvg/Group.cpp index ff68ae9..1a5c78a 100644 --- a/esvg/Group.cpp +++ b/esvg/Group.cpp @@ -27,7 +27,7 @@ esvg::Group::Group(PaintState _parentPaintState) : esvg::Base(_parentPaintState) } -esvg::Group::~Group(void) { +esvg::Group::~Group() { } diff --git a/esvg/Group.h b/esvg/Group.h index bfdd5c0..4caf51d 100644 --- a/esvg/Group.h +++ b/esvg/Group.h @@ -18,7 +18,7 @@ namespace esvg { std::vector m_subElementList; //!< group sub elements ... public: Group(PaintState _parentPaintState); - ~Group(void); + ~Group(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t spacing); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); diff --git a/esvg/Line.cpp b/esvg/Line.cpp index 7b80b6a..4d4f282 100644 --- a/esvg/Line.cpp +++ b/esvg/Line.cpp @@ -19,7 +19,7 @@ esvg::Line::Line(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { m_stopPos.setValue(0,0); } -esvg::Line::~Line(void) { +esvg::Line::~Line() { } diff --git a/esvg/Line.h b/esvg/Line.h index 919796f..234ba63 100644 --- a/esvg/Line.h +++ b/esvg/Line.h @@ -18,7 +18,7 @@ namespace esvg { etk::Vector2D m_stopPos; //!< Stop line position public: Line(PaintState _parentPaintState); - ~Line(void); + ~Line(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t _spacing); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); diff --git a/esvg/Path.cpp b/esvg/Path.cpp index fa79a4b..3742d3c 100644 --- a/esvg/Path.cpp +++ b/esvg/Path.cpp @@ -21,7 +21,7 @@ esvg::Path::Path(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Path::~Path(void) { +esvg::Path::~Path() { } diff --git a/esvg/Path.h b/esvg/Path.h index 66e8d6a..e401872 100644 --- a/esvg/Path.h +++ b/esvg/Path.h @@ -27,7 +27,7 @@ namespace esvg { }; class PathBasic { public: - PathBasic(void) : m_cmd(esvg::pathStop), m_relative(false) { + PathBasic() : m_cmd(esvg::pathStop), m_relative(false) { for(int32_t iii=0; iii<7; ++iii) { m_element[iii] = 0; } @@ -41,7 +41,7 @@ namespace esvg { std::vector m_listElement; public: Path(PaintState _parentPaintState); - ~Path(void); + ~Path(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t _spacing); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); diff --git a/esvg/Polygon.cpp b/esvg/Polygon.cpp index 8c49f0d..224bf79 100644 --- a/esvg/Polygon.cpp +++ b/esvg/Polygon.cpp @@ -18,7 +18,7 @@ esvg::Polygon::Polygon(PaintState parentPaintState) : esvg::Base(parentPaintStat } -esvg::Polygon::~Polygon(void) { +esvg::Polygon::~Polygon() { } diff --git a/esvg/Polygon.h b/esvg/Polygon.h index 922db8f..2a7aada 100644 --- a/esvg/Polygon.h +++ b/esvg/Polygon.h @@ -25,7 +25,7 @@ namespace esvg { //enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode public: Polygon(PaintState parentPaintState); - ~Polygon(void); + ~Polygon(); virtual bool parse(exml::Element * _element, agg::trans_affine& parentTrans, etk::Vector2D& sizeMax); virtual void display(int32_t spacing); virtual void aggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basicTrans); diff --git a/esvg/Polyline.cpp b/esvg/Polyline.cpp index 50a46e5..e625244 100644 --- a/esvg/Polyline.cpp +++ b/esvg/Polyline.cpp @@ -15,7 +15,7 @@ esvg::Polyline::Polyline(PaintState _parentPaintState) : esvg::Base(_parentPaint } -esvg::Polyline::~Polyline(void) { +esvg::Polyline::~Polyline() { } diff --git a/esvg/Polyline.h b/esvg/Polyline.h index 8019d27..6933faf 100644 --- a/esvg/Polyline.h +++ b/esvg/Polyline.h @@ -18,7 +18,7 @@ namespace esvg { std::vector > m_listPoint; //!< list of all point of the polyline public: Polyline(PaintState _parentPaintState); - ~Polyline(void); + ~Polyline(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t _spacing); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); diff --git a/esvg/Rectangle.cpp b/esvg/Rectangle.cpp index 7e42b5f..52ded60 100644 --- a/esvg/Rectangle.cpp +++ b/esvg/Rectangle.cpp @@ -21,7 +21,7 @@ esvg::Rectangle::Rectangle(PaintState _parentPaintState) : esvg::Base(_parentPai m_roundedCorner.setValue(0,0); } -esvg::Rectangle::~Rectangle(void) { +esvg::Rectangle::~Rectangle() { } diff --git a/esvg/Rectangle.h b/esvg/Rectangle.h index 3365352..a139a40 100644 --- a/esvg/Rectangle.h +++ b/esvg/Rectangle.h @@ -19,7 +19,7 @@ namespace esvg { etk::Vector2D m_roundedCorner; //!< property of the rounded corner public: Rectangle(PaintState _parentPaintState); - ~Rectangle(void); + ~Rectangle(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t _spacing); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); diff --git a/esvg/Renderer.cpp b/esvg/Renderer.cpp index 20a3f1c..54fc1e4 100644 --- a/esvg/Renderer.cpp +++ b/esvg/Renderer.cpp @@ -65,7 +65,7 @@ esvg::Renderer::Renderer(uint32_t width, uint32_t height) { //m_basicMatrix *= agg::trans_affine_translation(m_size.x*0.7, m_size.y/2); } -esvg::Renderer::~Renderer(void) { +esvg::Renderer::~Renderer() { if (NULL != m_buffer) { delete[] m_buffer; m_buffer = NULL; diff --git a/esvg/Renderer.h b/esvg/Renderer.h index 147e5e2..244413d 100644 --- a/esvg/Renderer.h +++ b/esvg/Renderer.h @@ -57,7 +57,7 @@ namespace esvg { uint32_t m_allocatedSize; public: Renderer(uint32_t width, uint32_t height); - ~Renderer(void); + ~Renderer(); void writePpm(std::string fileName); etk::Vector2D m_size; agg::rendering_buffer * m_renderingBuffer; @@ -66,8 +66,8 @@ namespace esvg { rendererSolid_t * m_renderArea; agg::rasterizer_scanline_aa<> m_rasterizer; //!< AGG renderer system agg::scanline_p8 m_scanLine; //!< - uint8_t* getDataPointer(void) { return m_buffer; }; - uint32_t getDataSize(void) { return m_allocatedSize; }; + uint8_t* getDataPointer() { return m_buffer; }; + uint32_t getDataSize() { return m_allocatedSize; }; }; }; diff --git a/esvg/Text.cpp b/esvg/Text.cpp index f6832fb..efaaabc 100644 --- a/esvg/Text.cpp +++ b/esvg/Text.cpp @@ -16,7 +16,7 @@ esvg::Text::Text(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Text::~Text(void) { +esvg::Text::~Text() { } diff --git a/esvg/Text.h b/esvg/Text.h index ded1ff7..035308c 100644 --- a/esvg/Text.h +++ b/esvg/Text.h @@ -15,7 +15,7 @@ namespace esvg { class Text : public esvg::Base { public: Text(PaintState _parentPaintState); - ~Text(void); + ~Text(); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); virtual void display(int32_t _spacing); }; diff --git a/esvg/debug.cpp b/esvg/debug.cpp index 02da2a3..0f7b5dd 100644 --- a/esvg/debug.cpp +++ b/esvg/debug.cpp @@ -8,7 +8,7 @@ #include -int32_t esvg::getLogId(void) { +int32_t esvg::getLogId() { static int32_t g_val = etk::log::registerInstance("esvg"); return g_val; } diff --git a/esvg/debug.h b/esvg/debug.h index 3ae2399..8182c07 100644 --- a/esvg/debug.h +++ b/esvg/debug.h @@ -12,7 +12,7 @@ #include namespace esvg { - int32_t getLogId(void); + int32_t getLogId(); }; // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define SVG_BASE(info,data) \ diff --git a/esvg/esvg.cpp b/esvg/esvg.cpp index e6b7c3a..7099888 100644 --- a/esvg/esvg.cpp +++ b/esvg/esvg.cpp @@ -150,7 +150,7 @@ esvg::Document::Document(const std::string& _fileName) : //DisplayDebug(); } -esvg::Document::~Document(void) { +esvg::Document::~Document() { if(NULL != m_renderedElement) { delete(m_renderedElement); m_renderedElement = NULL; @@ -159,7 +159,7 @@ esvg::Document::~Document(void) { -void esvg::Document::displayDebug(void) { +void esvg::Document::displayDebug() { SVG_DEBUG("Main SVG node : size=" << m_size); for (int32_t iii=0; iiigetDataPointer(); } -uint32_t esvg::Document::getSizeOnData(void) +uint32_t esvg::Document::getSizeOnData() { if(NULL == m_renderedElement) { return 0; diff --git a/esvg/esvg.h b/esvg/esvg.h index 2da6a30..9f371b7 100644 --- a/esvg/esvg.h +++ b/esvg/esvg.h @@ -29,17 +29,17 @@ namespace esvg { esvg::Renderer* m_renderedElement; public: Document(const std::string& _fileName); - ~Document(void); - bool isLoadOk(void) { return m_loadOK; }; - void displayDebug(void); - void generateTestFile(void); + ~Document(); + bool isLoadOk() { return m_loadOK; }; + void displayDebug(); + void generateTestFile(); void generateAnImage(int32_t _sizeX, int32_t _sizeY); void generateAnImage(ivec2 _size, draw::Image& _output); void generateAnImage(draw::Image& _output); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); - uint8_t* getPointerOnData(void); - uint32_t getSizeOnData(void); - vec2 getDefinedSize(void) { return m_size;}; + uint8_t* getPointerOnData(); + uint32_t getSizeOnData(); + vec2 getDefinedSize() { return m_size;}; }; };