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

[STYLE] remove (void) in () to be c++ coherent

Browse Source
This commit is contained in:
Edouard DUPIN 2014-05-15 21:37:39 +02:00
parent 467a412ccd
commit a6c50c8f94
25 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
esvg/Base.h
View File

@ -35,9 +35,9 @@ namespace esvg {
agg::trans_affine m_transformMatrix; //!< specific render of the curent element agg::trans_affine m_transformMatrix; //!< specific render of the curent element
const char * spacingDist(int32_t _spacing); const char * spacingDist(int32_t _spacing);
public: public:
Base(void) {}; Base() {};
Base(PaintState _parentPaintState); Base(PaintState _parentPaintState);
virtual ~Base(void) { }; virtual ~Base() { };
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
//specific drawing for AAG librairy ... //specific drawing for AAG librairy ...
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { }; virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { };

2
esvg/Circle.cpp
View File

@ -18,7 +18,7 @@ esvg::Circle::Circle(PaintState _parentPaintState) : esvg::Base(_parentPaintStat
} }
esvg::Circle::~Circle(void) { esvg::Circle::~Circle() {
} }

2
esvg/Circle.h
View File

@ -18,7 +18,7 @@ namespace esvg {
float m_radius; //!< Radius of the Circle float m_radius; //!< Radius of the Circle
public: public:
Circle(PaintState _parentPaintState); Circle(PaintState _parentPaintState);
~Circle(void); ~Circle();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t _spacing); virtual void display(int32_t _spacing);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);

2
esvg/Ellipse.cpp
View File

@ -18,7 +18,7 @@ esvg::Ellipse::Ellipse(PaintState _parentPaintState) : esvg::Base(_parentPaintSt
} }
esvg::Ellipse::~Ellipse(void) { esvg::Ellipse::~Ellipse() {
} }

2
esvg/Ellipse.h
View File

@ -18,7 +18,7 @@ namespace esvg {
etk::Vector2D<float> m_r; //!< Radius property of the ellipse etk::Vector2D<float> m_r; //!< Radius property of the ellipse
public: public:
Ellipse(PaintState _parentPaintState); Ellipse(PaintState _parentPaintState);
~Ellipse(void); ~Ellipse();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t _spacing); virtual void display(int32_t _spacing);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);

2
esvg/Group.cpp
View File

@ -27,7 +27,7 @@ esvg::Group::Group(PaintState _parentPaintState) : esvg::Base(_parentPaintState)
} }
esvg::Group::~Group(void) { esvg::Group::~Group() {
} }

2
esvg/Group.h
View File

@ -18,7 +18,7 @@ namespace esvg {
std::vector<esvg::Base *> m_subElementList; //!< group sub elements ... std::vector<esvg::Base *> m_subElementList; //!< group sub elements ...
public: public:
Group(PaintState _parentPaintState); Group(PaintState _parentPaintState);
~Group(void); ~Group();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t spacing); virtual void display(int32_t spacing);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);

2
esvg/Line.cpp
View File

@ -19,7 +19,7 @@ esvg::Line::Line(PaintState _parentPaintState) : esvg::Base(_parentPaintState) {
m_stopPos.setValue(0,0); m_stopPos.setValue(0,0);
} }
esvg::Line::~Line(void) { esvg::Line::~Line() {
} }

2
esvg/Line.h
View File

@ -18,7 +18,7 @@ namespace esvg {
etk::Vector2D<float> m_stopPos; //!< Stop line position etk::Vector2D<float> m_stopPos; //!< Stop line position
public: public:
Line(PaintState _parentPaintState); Line(PaintState _parentPaintState);
~Line(void); ~Line();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t _spacing); virtual void display(int32_t _spacing);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);

2
esvg/Path.cpp
View File

@ -21,7 +21,7 @@ esvg::Path::Path(PaintState _parentPaintState) : esvg::Base(_parentPaintState) {
} }
esvg::Path::~Path(void) { esvg::Path::~Path() {
} }

4
esvg/Path.h
View File

@ -27,7 +27,7 @@ namespace esvg {
}; };
class PathBasic { class PathBasic {
public: 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) { for(int32_t iii=0; iii<7; ++iii) {
m_element[iii] = 0; m_element[iii] = 0;
} }
@ -41,7 +41,7 @@ namespace esvg {
std::vector<PathBasic> m_listElement; std::vector<PathBasic> m_listElement;
public: public:
Path(PaintState _parentPaintState); Path(PaintState _parentPaintState);
~Path(void); ~Path();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t _spacing); virtual void display(int32_t _spacing);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);

2
esvg/Polygon.cpp
View File

@ -18,7 +18,7 @@ esvg::Polygon::Polygon(PaintState parentPaintState) : esvg::Base(parentPaintStat
} }
esvg::Polygon::~Polygon(void) { esvg::Polygon::~Polygon() {
} }

2
esvg/Polygon.h
View File

@ -25,7 +25,7 @@ namespace esvg {
//enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode //enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode
public: public:
Polygon(PaintState parentPaintState); Polygon(PaintState parentPaintState);
~Polygon(void); ~Polygon();
virtual bool parse(exml::Element * _element, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& parentTrans, etk::Vector2D<float>& sizeMax);
virtual void display(int32_t spacing); virtual void display(int32_t spacing);
virtual void aggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basicTrans); virtual void aggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basicTrans);

2
esvg/Polyline.cpp
View File

@ -15,7 +15,7 @@ esvg::Polyline::Polyline(PaintState _parentPaintState) : esvg::Base(_parentPaint
} }
esvg::Polyline::~Polyline(void) { esvg::Polyline::~Polyline() {
} }

2
esvg/Polyline.h
View File

@ -18,7 +18,7 @@ namespace esvg {
std::vector<etk::Vector2D<float> > m_listPoint; //!< list of all point of the polyline std::vector<etk::Vector2D<float> > m_listPoint; //!< list of all point of the polyline
public: public:
Polyline(PaintState _parentPaintState); Polyline(PaintState _parentPaintState);
~Polyline(void); ~Polyline();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t _spacing); virtual void display(int32_t _spacing);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);

2
esvg/Rectangle.cpp
View File

@ -21,7 +21,7 @@ esvg::Rectangle::Rectangle(PaintState _parentPaintState) : esvg::Base(_parentPai
m_roundedCorner.setValue(0,0); m_roundedCorner.setValue(0,0);
} }
esvg::Rectangle::~Rectangle(void) { esvg::Rectangle::~Rectangle() {
} }

2
esvg/Rectangle.h
View File

@ -19,7 +19,7 @@ namespace esvg {
etk::Vector2D<float> m_roundedCorner; //!< property of the rounded corner etk::Vector2D<float> m_roundedCorner; //!< property of the rounded corner
public: public:
Rectangle(PaintState _parentPaintState); Rectangle(PaintState _parentPaintState);
~Rectangle(void); ~Rectangle();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t _spacing); virtual void display(int32_t _spacing);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);

2
esvg/Renderer.cpp
View File

@ -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); //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) { if (NULL != m_buffer) {
delete[] m_buffer; delete[] m_buffer;
m_buffer = NULL; m_buffer = NULL;

6
esvg/Renderer.h
View File

@ -57,7 +57,7 @@ namespace esvg {
uint32_t m_allocatedSize; uint32_t m_allocatedSize;
public: public:
Renderer(uint32_t width, uint32_t height); Renderer(uint32_t width, uint32_t height);
~Renderer(void); ~Renderer();
void writePpm(std::string fileName); void writePpm(std::string fileName);
etk::Vector2D<float> m_size; etk::Vector2D<float> m_size;
agg::rendering_buffer * m_renderingBuffer; agg::rendering_buffer * m_renderingBuffer;
@ -66,8 +66,8 @@ namespace esvg {
rendererSolid_t * m_renderArea; rendererSolid_t * m_renderArea;
agg::rasterizer_scanline_aa<> m_rasterizer; //!< AGG renderer system agg::rasterizer_scanline_aa<> m_rasterizer; //!< AGG renderer system
agg::scanline_p8 m_scanLine; //!< agg::scanline_p8 m_scanLine; //!<
uint8_t* getDataPointer(void) { return m_buffer; }; uint8_t* getDataPointer() { return m_buffer; };
uint32_t getDataSize(void) { return m_allocatedSize; }; uint32_t getDataSize() { return m_allocatedSize; };
}; };
}; };

2
esvg/Text.cpp
View File

@ -16,7 +16,7 @@ esvg::Text::Text(PaintState _parentPaintState) : esvg::Base(_parentPaintState) {
} }
esvg::Text::~Text(void) { esvg::Text::~Text() {
} }

2
esvg/Text.h
View File

@ -15,7 +15,7 @@ namespace esvg {
class Text : public esvg::Base { class Text : public esvg::Base {
public: public:
Text(PaintState _parentPaintState); Text(PaintState _parentPaintState);
~Text(void); ~Text();
virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D<float>& _sizeMax);
virtual void display(int32_t _spacing); virtual void display(int32_t _spacing);
}; };

2
esvg/debug.cpp
View File

@ -8,7 +8,7 @@
#include <esvg/debug.h> #include <esvg/debug.h>
int32_t esvg::getLogId(void) { int32_t esvg::getLogId() {
static int32_t g_val = etk::log::registerInstance("esvg"); static int32_t g_val = etk::log::registerInstance("esvg");
return g_val; return g_val;
} }

2
esvg/debug.h
View File

@ -12,7 +12,7 @@
#include <etk/log.h> #include <etk/log.h>
namespace esvg { namespace esvg {
int32_t getLogId(void); int32_t getLogId();
}; };
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" // TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define SVG_BASE(info,data) \ #define SVG_BASE(info,data) \

10
esvg/esvg.cpp
View File

@ -150,7 +150,7 @@ esvg::Document::Document(const std::string& _fileName) :
//DisplayDebug(); //DisplayDebug();
} }
esvg::Document::~Document(void) { esvg::Document::~Document() {
if(NULL != m_renderedElement) { if(NULL != m_renderedElement) {
delete(m_renderedElement); delete(m_renderedElement);
m_renderedElement = NULL; 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); SVG_DEBUG("Main SVG node : size=" << m_size);
for (int32_t iii=0; iii<m_subElementList.size(); iii++) { for (int32_t iii=0; iii<m_subElementList.size(); iii++) {
if (NULL != m_subElementList[iii]) { if (NULL != m_subElementList[iii]) {
@ -179,7 +179,7 @@ void esvg::Document::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _ba
} }
void esvg::Document::generateTestFile(void) void esvg::Document::generateTestFile()
{ {
int32_t sizeX = m_size.x(); int32_t sizeX = m_size.x();
if (sizeX == 0) { if (sizeX == 0) {
@ -269,7 +269,7 @@ void esvg::Document::generateAnImage(ivec2 _size, draw::Image& _output)
} }
} }
uint8_t* esvg::Document::getPointerOnData(void) uint8_t* esvg::Document::getPointerOnData()
{ {
if(NULL == m_renderedElement) { if(NULL == m_renderedElement) {
return NULL; return NULL;
@ -277,7 +277,7 @@ uint8_t* esvg::Document::getPointerOnData(void)
return m_renderedElement->getDataPointer(); return m_renderedElement->getDataPointer();
} }
uint32_t esvg::Document::getSizeOnData(void) uint32_t esvg::Document::getSizeOnData()
{ {
if(NULL == m_renderedElement) { if(NULL == m_renderedElement) {
return 0; return 0;

14
esvg/esvg.h
View File

@ -29,17 +29,17 @@ namespace esvg {
esvg::Renderer* m_renderedElement; esvg::Renderer* m_renderedElement;
public: public:
Document(const std::string& _fileName); Document(const std::string& _fileName);
~Document(void); ~Document();
bool isLoadOk(void) { return m_loadOK; }; bool isLoadOk() { return m_loadOK; };
void displayDebug(void); void displayDebug();
void generateTestFile(void); void generateTestFile();
void generateAnImage(int32_t _sizeX, int32_t _sizeY); void generateAnImage(int32_t _sizeX, int32_t _sizeY);
void generateAnImage(ivec2 _size, draw::Image& _output); void generateAnImage(ivec2 _size, draw::Image& _output);
void generateAnImage(draw::Image& _output); void generateAnImage(draw::Image& _output);
virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans);
uint8_t* getPointerOnData(void); uint8_t* getPointerOnData();
uint32_t getSizeOnData(void); uint32_t getSizeOnData();
vec2 getDefinedSize(void) { return m_size;}; vec2 getDefinedSize() { return m_size;};
}; };
}; };