diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-19 13:55:58 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-19 13:55:58 +0000 |
| commit | 884fe02952017ac219cd23f9407d27ed4d8a8620 (patch) | |
| tree | a86d66e240ae1e72007ba75b23757c71d5a9a28c /src/extension/internal | |
| parent | Run clang-tidy’s modernize-use-emplace pass. (diff) | |
| download | inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.tar.gz inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.zip | |
Run clang-tidy’s modernize-redundant-void-arg pass.
Diffstat (limited to 'src/extension/internal')
61 files changed, 160 insertions, 160 deletions
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp index 808023c7c..150dce195 100644 --- a/src/extension/internal/bluredge.cpp +++ b/src/extension/internal/bluredge.cpp @@ -125,7 +125,7 @@ BlurEdge::prefs_effect(Inkscape::Extension::Effect * module, Inkscape::UI::View: #include "clear-n_.h" void -BlurEdge::init (void) +BlurEdge::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/bluredge.h b/src/extension/internal/bluredge.h index c30372d99..ceeace555 100644 --- a/src/extension/internal/bluredge.h +++ b/src/extension/internal/bluredge.h @@ -27,7 +27,7 @@ public: void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; Gtk::Widget * prefs_effect(Inkscape::Extension::Effect * module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; - static void init (void); + static void init (); }; }; /* namespace Internal */ diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp index c3261fdce..6ff8943e8 100644 --- a/src/extension/internal/cairo-png-out.cpp +++ b/src/extension/internal/cairo-png-out.cpp @@ -103,7 +103,7 @@ void CairoRendererOutput::save(Inkscape::Extension::Output * /*mod*/, SPDocument describes the data. */ void -CairoRendererOutput::init (void) +CairoRendererOutput::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp index 9815088de..16340fe2e 100644 --- a/src/extension/internal/cairo-ps-out.cpp +++ b/src/extension/internal/cairo-ps-out.cpp @@ -321,7 +321,7 @@ CairoEpsOutput::textToPath(Inkscape::Extension::Print * ext) describes the data. */ void -CairoPsOutput::init (void) +CairoPsOutput::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" @@ -363,7 +363,7 @@ CairoPsOutput::init (void) describes the data. */ void -CairoEpsOutput::init (void) +CairoEpsOutput::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index 969fff4f9..d420f5c2a 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -135,7 +135,7 @@ CairoRenderContext::CairoRenderContext(CairoRenderer *parent) : { } -CairoRenderContext::~CairoRenderContext(void) +CairoRenderContext::~CairoRenderContext() { for (std::map<gpointer, cairo_font_face_t *>::const_iterator iter = font_table.begin(); iter != font_table.end(); ++iter) font_data_free(iter->second); @@ -152,17 +152,17 @@ void CairoRenderContext::font_data_free(gpointer data) } } -CairoRenderer* CairoRenderContext::getRenderer(void) const +CairoRenderer* CairoRenderContext::getRenderer() const { return _renderer; } -CairoRenderState* CairoRenderContext::getCurrentState(void) const +CairoRenderState* CairoRenderContext::getCurrentState() const { return _state; } -CairoRenderState* CairoRenderContext::getParentState(void) const +CairoRenderState* CairoRenderContext::getParentState() const { // if this is the root node just return it if (_state_stack.size() == 1) { @@ -213,7 +213,7 @@ CairoRenderContext::cloneMe(double width, double height) const return new_context; } -CairoRenderContext* CairoRenderContext::cloneMe(void) const +CairoRenderContext* CairoRenderContext::cloneMe() const { g_assert( _is_valid ); @@ -416,7 +416,7 @@ void CairoRenderContext::setEPS(bool eps) _eps = eps; } -unsigned int CairoRenderContext::getPSLevel(void) +unsigned int CairoRenderContext::getPSLevel() { return _ps_level; } @@ -436,7 +436,7 @@ void CairoRenderContext::setOmitText(bool omittext) _is_omittext = omittext; } -bool CairoRenderContext::getOmitText(void) +bool CairoRenderContext::getOmitText() { return _is_omittext; } @@ -446,7 +446,7 @@ void CairoRenderContext::setFilterToBitmap(bool filtertobitmap) _is_filtertobitmap = filtertobitmap; } -bool CairoRenderContext::getFilterToBitmap(void) +bool CairoRenderContext::getFilterToBitmap() { return _is_filtertobitmap; } @@ -456,13 +456,13 @@ void CairoRenderContext::setBitmapResolution(int resolution) _bitmapresolution = resolution; } -int CairoRenderContext::getBitmapResolution(void) +int CairoRenderContext::getBitmapResolution() { return _bitmapresolution; } cairo_surface_t* -CairoRenderContext::getSurface(void) +CairoRenderContext::getSurface() { g_assert( _is_valid ); @@ -494,7 +494,7 @@ CairoRenderContext::setRenderMode(CairoRenderMode mode) } CairoRenderContext::CairoRenderMode -CairoRenderContext::getRenderMode(void) const +CairoRenderContext::getRenderMode() const { return _render_mode; } @@ -514,12 +514,12 @@ CairoRenderContext::setClipMode(CairoClipMode mode) } CairoRenderContext::CairoClipMode -CairoRenderContext::getClipMode(void) const +CairoRenderContext::getClipMode() const { return _clip_mode; } -CairoRenderState* CairoRenderContext::_createState(void) +CairoRenderState* CairoRenderContext::_createState() { CairoRenderState *state = static_cast<CairoRenderState*>(g_try_malloc(sizeof(CairoRenderState))); g_assert( state != nullptr ); @@ -536,7 +536,7 @@ CairoRenderState* CairoRenderContext::_createState(void) return state; } -void CairoRenderContext::pushLayer(void) +void CairoRenderContext::pushLayer() { g_assert( _is_valid ); @@ -553,7 +553,7 @@ void CairoRenderContext::pushLayer(void) } void -CairoRenderContext::popLayer(void) +CairoRenderContext::popLayer() { g_assert( _is_valid ); @@ -1007,7 +1007,7 @@ Geom::Affine CairoRenderContext::getParentTransform() const return parent_state->transform; } -void CairoRenderContext::pushState(void) +void CairoRenderContext::pushState() { g_assert( _is_valid ); @@ -1020,7 +1020,7 @@ void CairoRenderContext::pushState(void) _state = new_state; } -void CairoRenderContext::popState(void) +void CairoRenderContext::popState() { g_assert( _is_valid ); diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h index 2cefb297d..d58c78c73 100644 --- a/src/extension/internal/cairo-render-context.h +++ b/src/extension/internal/cairo-render-context.h @@ -70,12 +70,12 @@ struct CairoRenderState { class CairoRenderContext { friend class CairoRenderer; public: - CairoRenderContext *cloneMe(void) const; + CairoRenderContext *cloneMe() const; CairoRenderContext *cloneMe(double width, double height) const; bool finish(bool finish_surface = true); - CairoRenderer *getRenderer(void) const; - cairo_t *getCairoContext(void) const; + CairoRenderer *getRenderer() const; + cairo_t *getCairoContext() const; enum CairoRenderMode { RENDER_MODE_NORMAL, @@ -95,47 +95,47 @@ public: void setPSLevel(unsigned int level); void setEPS(bool eps); - unsigned int getPSLevel(void); + unsigned int getPSLevel(); void setPDFLevel(unsigned int level); void setTextToPath(bool texttopath); - bool getTextToPath(void); + bool getTextToPath(); void setOmitText(bool omittext); - bool getOmitText(void); + bool getOmitText(); void setFilterToBitmap(bool filtertobitmap); - bool getFilterToBitmap(void); + bool getFilterToBitmap(); void setBitmapResolution(int resolution); - int getBitmapResolution(void); + int getBitmapResolution(); /** Creates the cairo_surface_t for the context with the given width, height and with the currently set target surface type. */ bool setupSurface(double width, double height); - cairo_surface_t *getSurface(void); + cairo_surface_t *getSurface(); /** Saves the contents of the context to a PNG file. */ bool saveAsPng(const char *file_name); /** On targets supporting multiple pages, sends subsequent rendering to a new page*/ - void newPage(void); + void newPage(); /* Render/clip mode setting/query */ void setRenderMode(CairoRenderMode mode); - CairoRenderMode getRenderMode(void) const; + CairoRenderMode getRenderMode() const; void setClipMode(CairoClipMode mode); - CairoClipMode getClipMode(void) const; + CairoClipMode getClipMode() const; void addPathVector(Geom::PathVector const &pv); void setPathVector(Geom::PathVector const &pv); - void pushLayer(void); - void popLayer(void); + void pushLayer(); + void popLayer(); /* Graphics state manipulation */ - void pushState(void); - void popState(void); - CairoRenderState *getCurrentState(void) const; - CairoRenderState *getParentState(void) const; + void pushState(); + void popState(); + CairoRenderState *getCurrentState() const; + CairoRenderState *getParentState() const; void setStateForStyle(SPStyle const *style); void transform(Geom::Affine const &transform); @@ -165,7 +165,7 @@ public: protected: CairoRenderContext(CairoRenderer *renderer); - virtual ~CairoRenderContext(void); + virtual ~CairoRenderContext(); enum CairoOmitTextPageState { EMPTY, @@ -223,13 +223,13 @@ protected: void _concatTransform(cairo_t *cr, double xx, double yx, double xy, double yy, double x0, double y0); void _concatTransform(cairo_t *cr, Geom::Affine const &transform); - void _prepareRenderGraphic(void); - void _prepareRenderText(void); + void _prepareRenderGraphic(); + void _prepareRenderText(); std::map<gpointer, cairo_font_face_t *> font_table; static void font_data_free(gpointer data); - CairoRenderState *_createState(void); + CairoRenderState *_createState(); }; } /* namespace Internal */ diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp index 333c0eb42..3ad891ed1 100644 --- a/src/extension/internal/cairo-renderer-pdf-out.cpp +++ b/src/extension/internal/cairo-renderer-pdf-out.cpp @@ -238,7 +238,7 @@ CairoRendererPdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, describes the data. */ void -CairoRendererPdfOutput::init (void) +CairoRendererPdfOutput::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp index c06119391..b21505431 100644 --- a/src/extension/internal/cairo-renderer.cpp +++ b/src/extension/internal/cairo-renderer.cpp @@ -103,7 +103,7 @@ namespace Internal { CairoRenderer::CairoRenderer(void) = default; -CairoRenderer::~CairoRenderer(void) +CairoRenderer::~CairoRenderer() { /* restore default signal handling for SIGPIPE */ #if !defined(_WIN32) && !defined(__WIN32__) @@ -114,7 +114,7 @@ CairoRenderer::~CairoRenderer(void) } CairoRenderContext* -CairoRenderer::createContext(void) +CairoRenderer::createContext() { CairoRenderContext *new_context = new CairoRenderContext(this); g_assert( new_context != nullptr ); diff --git a/src/extension/internal/cairo-renderer.h b/src/extension/internal/cairo-renderer.h index b069e5bfe..03ffe2a1c 100644 --- a/src/extension/internal/cairo-renderer.h +++ b/src/extension/internal/cairo-renderer.h @@ -39,10 +39,10 @@ class CairoRenderContext; class CairoRenderer { public: - CairoRenderer(void); - virtual ~CairoRenderer(void); + CairoRenderer(); + virtual ~CairoRenderer(); - CairoRenderContext *createContext(void); + CairoRenderContext *createContext(); void destroyContext(CairoRenderContext *ctx); void setStateForItem(CairoRenderContext *ctx, SPItem const *item); diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp index 5f42c1a94..7848927ca 100644 --- a/src/extension/internal/cdr-input.cpp +++ b/src/extension/internal/cdr-input.cpp @@ -304,7 +304,7 @@ SPDocument *CdrInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u #include "clear-n_.h" -void CdrInput::init(void) +void CdrInput::init() { /* CDR */ Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/cdr-input.h b/src/extension/internal/cdr-input.h index 25b9e8425..a0fc69cd6 100644 --- a/src/extension/internal/cdr-input.h +++ b/src/extension/internal/cdr-input.h @@ -32,7 +32,7 @@ class CdrInput : public Inkscape::Extension::Implementation::Implementation { public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; - static void init( void ); + static void init( ); }; diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp index e34d73cca..fa15f8eb5 100644 --- a/src/extension/internal/emf-inout.cpp +++ b/src/extension/internal/emf-inout.cpp @@ -65,13 +65,13 @@ static uint32_t ICMmode = 0; // not used yet, but code to read it from EMF impl static uint32_t BLTmode = 0; float faraway = 10000000; // used in "exclude" clips, hopefully well outside any real drawing! -Emf::Emf (void) // The null constructor +Emf::Emf () // The null constructor { return; } -Emf::~Emf (void) //The destructor +Emf::~Emf () //The destructor { return; } @@ -3609,7 +3609,7 @@ Emf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri ) void -Emf::init (void) +Emf::init () { /* EMF in */ Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h index bef58b612..8c732404c 100644 --- a/src/extension/internal/emf-inout.h +++ b/src/extension/internal/emf-inout.h @@ -190,7 +190,7 @@ public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; - static void init(void);//Initialize the class + static void init();//Initialize the class private: diff --git a/src/extension/internal/emf-print.cpp b/src/extension/internal/emf-print.cpp index add2f0d37..9320e3ce9 100644 --- a/src/extension/internal/emf-print.cpp +++ b/src/extension/internal/emf-print.cpp @@ -2181,7 +2181,7 @@ unsigned int PrintEmf::text(Inkscape::Extension::Print * /*mod*/, char const *te return 0; } -void PrintEmf::init(void) +void PrintEmf::init() { _load_ppt_fontfix_data(); diff --git a/src/extension/internal/emf-print.h b/src/extension/internal/emf-print.h index 43267dd2d..205db202e 100644 --- a/src/extension/internal/emf-print.h +++ b/src/extension/internal/emf-print.h @@ -64,7 +64,7 @@ public: unsigned int text(Inkscape::Extension::Print *module, char const *text, Geom::Point const &p, SPStyle const *style) override; - static void init (void); + static void init (); protected: static void smuggle_adxkyrtl_out(const char *string, uint32_t **adx, double *ky, int *rtl, int *ndx, float scale); diff --git a/src/extension/internal/filter/bevels.h b/src/extension/internal/filter/bevels.h index 4c2ddc719..3670fc6c5 100644 --- a/src/extension/internal/filter/bevels.h +++ b/src/extension/internal/filter/bevels.h @@ -47,7 +47,7 @@ public: DiffuseLight ( ) : Filter() { }; ~DiffuseLight ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Diffuse Light") "</name>\n" @@ -127,7 +127,7 @@ public: MatteJelly ( ) : Filter() { }; ~MatteJelly ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Matte Jelly") "</name>\n" @@ -211,7 +211,7 @@ public: SpecularLight ( ) : Filter() { }; ~SpecularLight ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Specular Light") "</name>\n" diff --git a/src/extension/internal/filter/blurs.h b/src/extension/internal/filter/blurs.h index c99b9efac..ac87bc539 100644 --- a/src/extension/internal/filter/blurs.h +++ b/src/extension/internal/filter/blurs.h @@ -48,7 +48,7 @@ public: Blur ( ) : Filter() { }; ~Blur ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Blur") "</name>\n" @@ -119,7 +119,7 @@ public: CleanEdges ( ) : Filter() { }; ~CleanEdges ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Clean Edges") "</name>\n" @@ -179,7 +179,7 @@ public: CrossBlur ( ) : Filter() { }; ~CrossBlur ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Cross Blur") "</name>\n" @@ -254,7 +254,7 @@ public: Feather ( ) : Filter() { }; ~Feather ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Feather") "</name>\n" @@ -319,7 +319,7 @@ public: ImageBlur ( ) : Filter() { }; ~ImageBlur ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Out of Focus") "</name>\n" diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h index 0eaee7a5f..b8e887c26 100644 --- a/src/extension/internal/filter/bumps.h +++ b/src/extension/internal/filter/bumps.h @@ -74,7 +74,7 @@ public: Bump ( ) : Filter() { }; ~Bump ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Bump") "</name>\n" @@ -303,7 +303,7 @@ public: WaxBump ( ) : Filter() { }; ~WaxBump ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Wax Bump") "</name>\n" diff --git a/src/extension/internal/filter/color.h b/src/extension/internal/filter/color.h index ae6bc718c..fc1948853 100644 --- a/src/extension/internal/filter/color.h +++ b/src/extension/internal/filter/color.h @@ -68,7 +68,7 @@ public: Brilliance ( ) : Filter() { }; ~Brilliance ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Brilliance") "</name>\n" @@ -148,7 +148,7 @@ public: ChannelPaint ( ) : Filter() { }; ~ChannelPaint ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Channel Painting") "</name>\n" @@ -249,7 +249,7 @@ public: ColorBlindness ( ) : Filter() { }; ~ColorBlindness ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Color Blindness") "</name>\n" @@ -324,7 +324,7 @@ public: ColorShift ( ) : Filter() { }; ~ColorShift ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Color Shift") "</name>\n" @@ -387,7 +387,7 @@ public: Colorize ( ) : Filter() { }; ~Colorize ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Colorize") "</name>\n" @@ -494,7 +494,7 @@ public: ComponentTransfer ( ) : Filter() { }; ~ComponentTransfer ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Component Transfer") "</name>\n" @@ -579,7 +579,7 @@ public: Duochrome ( ) : Filter() { }; ~Duochrome ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Duochrome") "</name>\n" @@ -704,7 +704,7 @@ public: ExtractChannel ( ) : Filter() { }; ~ExtractChannel ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Extract Channel") "</name>\n" @@ -810,7 +810,7 @@ public: FadeToBW ( ) : Filter() { }; ~FadeToBW ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Fade to Black or White") "</name>\n" @@ -889,7 +889,7 @@ public: Greyscale ( ) : Filter() { }; ~Greyscale ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Greyscale") "</name>\n" @@ -975,7 +975,7 @@ public: Invert ( ) : Filter() { }; ~Invert ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Invert") "</name>\n" @@ -1110,7 +1110,7 @@ public: Lighting ( ) : Filter() { }; ~Lighting ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Lighting") "</name>\n" @@ -1181,7 +1181,7 @@ public: LightnessContrast ( ) : Filter() { }; ~LightnessContrast ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Lightness-Contrast") "</name>\n" @@ -1260,7 +1260,7 @@ public: NudgeRGB ( ) : Filter() { }; ~NudgeRGB ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Nudge RGB") "</name>\n" @@ -1372,7 +1372,7 @@ public: NudgeCMY ( ) : Filter() { }; ~NudgeCMY ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Nudge CMY") "</name>\n" @@ -1478,7 +1478,7 @@ public: Quadritone ( ) : Filter() { }; ~Quadritone ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Quadritone Fantasy") "</name>\n" @@ -1561,7 +1561,7 @@ public: SimpleBlend ( ) : Filter() { }; ~SimpleBlend ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Simple blend") "</name>\n" @@ -1647,7 +1647,7 @@ public: Solarize ( ) : Filter() { }; ~Solarize ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Solarize") "</name>\n" @@ -1734,7 +1734,7 @@ public: Tritone ( ) : Filter() { }; ~Tritone ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Tritone") "</name>\n" diff --git a/src/extension/internal/filter/distort.h b/src/extension/internal/filter/distort.h index f1654d075..f677e334a 100644 --- a/src/extension/internal/filter/distort.h +++ b/src/extension/internal/filter/distort.h @@ -61,7 +61,7 @@ public: FeltFeather ( ) : Filter() { }; ~FeltFeather ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Felt Feather") "</name>\n" @@ -184,7 +184,7 @@ public: Roughen ( ) : Filter() { }; ~Roughen ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Roughen") "</name>\n" diff --git a/src/extension/internal/filter/filter-all.cpp b/src/extension/internal/filter/filter-all.cpp index 83da6ea2b..3f1d2fb97 100644 --- a/src/extension/internal/filter/filter-all.cpp +++ b/src/extension/internal/filter/filter-all.cpp @@ -29,7 +29,7 @@ namespace Filter { void -Filter::filters_all (void ) +Filter::filters_all ( ) { // Here come the filters which are coded in C++ in order to present a parameters dialog diff --git a/src/extension/internal/filter/filter-file.cpp b/src/extension/internal/filter/filter-file.cpp index 241f0f52c..023643deb 100644 --- a/src/extension/internal/filter/filter-file.cpp +++ b/src/extension/internal/filter/filter-file.cpp @@ -62,7 +62,7 @@ filters_load_file (Glib::ustring filename, gchar * menuname) return; } -void Filter::filters_all_files(void) +void Filter::filters_all_files() { for(auto &filename: get_filenames(USER, FILTERS, {".svg"})) { filters_load_file(filename, _("Personal")); @@ -78,14 +78,14 @@ void Filter::filters_all_files(void) class mywriter : public Inkscape::IO::BasicWriter { Glib::ustring _str; public: - void close(void) override; - void flush(void) override; + void close() override; + void flush() override; void put (gunichar ch) override; - gchar const * c_str (void) { return _str.c_str(); } + gchar const * c_str () { return _str.c_str(); } }; -void mywriter::close (void) { return; } -void mywriter::flush (void) { return; } +void mywriter::close () { return; } +void mywriter::flush () { return; } void mywriter::put (gunichar ch) { _str += ch; } diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp index 8e32bc05d..b869561cd 100644 --- a/src/extension/internal/filter/filter.cpp +++ b/src/extension/internal/filter/filter.cpp @@ -37,7 +37,7 @@ Filter::Filter(gchar const * filter) : return; } -Filter::~Filter (void) { +Filter::~Filter () { if (_filter != nullptr) { _filter = nullptr; } diff --git a/src/extension/internal/filter/filter.h b/src/extension/internal/filter/filter.h index 3a5b8a811..ba9f63d04 100644 --- a/src/extension/internal/filter/filter.h +++ b/src/extension/internal/filter/filter.h @@ -49,10 +49,10 @@ public: void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; static void filter_init(gchar const * id, gchar const * name, gchar const * submenu, gchar const * tip, gchar const * filter); - static void filters_all(void); + static void filters_all(); /* File loader related */ - static void filters_all_files(void); + static void filters_all_files(); static void filters_load_node(Inkscape::XML::Node * node, gchar * menuname); }; diff --git a/src/extension/internal/filter/image.h b/src/extension/internal/filter/image.h index 592e41b9f..2c715768c 100644 --- a/src/extension/internal/filter/image.h +++ b/src/extension/internal/filter/image.h @@ -43,7 +43,7 @@ public: EdgeDetect ( ) : Filter() { }; ~EdgeDetect ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Edge Detect") "</name>\n" diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h index 905e71e67..49df9c2a6 100644 --- a/src/extension/internal/filter/morphology.h +++ b/src/extension/internal/filter/morphology.h @@ -52,7 +52,7 @@ public: Crosssmooth ( ) : Filter() { }; ~Crosssmooth ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Cross-smooth") "</name>\n" @@ -160,7 +160,7 @@ public: Outline ( ) : Filter() { }; ~Outline ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Outline") "</name>\n" diff --git a/src/extension/internal/filter/overlays.h b/src/extension/internal/filter/overlays.h index e0f78be9c..b451ec65d 100644 --- a/src/extension/internal/filter/overlays.h +++ b/src/extension/internal/filter/overlays.h @@ -50,7 +50,7 @@ public: NoiseFill ( ) : Filter() { }; ~NoiseFill ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Noise Fill") "</name>\n" diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h index aae71fcf3..afa3b5b12 100644 --- a/src/extension/internal/filter/paint.h +++ b/src/extension/internal/filter/paint.h @@ -65,7 +65,7 @@ public: Chromolitho ( ) : Filter() { }; ~Chromolitho ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Chromolitho") "</name>\n" @@ -226,7 +226,7 @@ public: CrossEngraving ( ) : Filter() { }; ~CrossEngraving ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Cross Engraving") "</name>\n" @@ -325,7 +325,7 @@ public: Drawing ( ) : Filter() { }; ~Drawing ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Drawing") "</name>\n" @@ -488,7 +488,7 @@ public: Electrize ( ) : Filter() { }; ~Electrize ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Electrize") "</name>\n" @@ -578,7 +578,7 @@ public: NeonDraw ( ) : Filter() { }; ~NeonDraw ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Neon Draw") "</name>\n" @@ -681,7 +681,7 @@ public: PointEngraving ( ) : Filter() { }; ~PointEngraving ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Point Engraving") "</name>\n" @@ -844,7 +844,7 @@ public: Posterize ( ) : Filter() { }; ~Posterize ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Poster Paint") "</name>\n" @@ -967,7 +967,7 @@ public: PosterizeBasic ( ) : Filter() { }; ~PosterizeBasic ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Posterize Basic") "</name>\n" diff --git a/src/extension/internal/filter/protrusions.h b/src/extension/internal/filter/protrusions.h index 0abac91e7..8df7924ca 100644 --- a/src/extension/internal/filter/protrusions.h +++ b/src/extension/internal/filter/protrusions.h @@ -42,7 +42,7 @@ public: ~Snow ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } public: - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Snow Crest") "</name>\n" diff --git a/src/extension/internal/filter/shadows.h b/src/extension/internal/filter/shadows.h index 19cfdaba7..18ee53158 100644 --- a/src/extension/internal/filter/shadows.h +++ b/src/extension/internal/filter/shadows.h @@ -51,7 +51,7 @@ public: ColorizableDropShadow ( ) : Filter() { }; ~ColorizableDropShadow ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Drop Shadow") "</name>\n" diff --git a/src/extension/internal/filter/textures.h b/src/extension/internal/filter/textures.h index 3340643a5..d7108c552 100644 --- a/src/extension/internal/filter/textures.h +++ b/src/extension/internal/filter/textures.h @@ -56,7 +56,7 @@ public: ~InkBlot ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } public: - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Ink Blot") "</name>\n" diff --git a/src/extension/internal/filter/transparency.h b/src/extension/internal/filter/transparency.h index 1239c1fac..68388fc06 100644 --- a/src/extension/internal/filter/transparency.h +++ b/src/extension/internal/filter/transparency.h @@ -47,7 +47,7 @@ public: Blend ( ) : Filter() { }; ~Blend ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Blend") "</name>\n" @@ -124,7 +124,7 @@ public: ChannelTransparency ( ) : Filter() { }; ~ChannelTransparency ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Channel Transparency") "</name>\n" @@ -199,7 +199,7 @@ public: LightEraser ( ) : Filter() { }; ~LightEraser ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Light Eraser") "</name>\n" @@ -273,7 +273,7 @@ public: Opacity ( ) : Filter() { }; ~Opacity ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Opacity") "</name>\n" @@ -335,7 +335,7 @@ public: Silhouette ( ) : Filter() { }; ~Silhouette ( ) override { if (_filter != nullptr) g_free((void *)_filter); return; } - static void init (void) { + static void init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("Silhouette") "</name>\n" diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp index ba90c747e..02ca5af1a 100644 --- a/src/extension/internal/gdkpixbuf-input.cpp +++ b/src/extension/internal/gdkpixbuf-input.cpp @@ -163,7 +163,7 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri) #include "clear-n_.h" void -GdkpixbufInput::init(void) +GdkpixbufInput::init() { static std::vector< Gdk::PixbufFormat > formatlist = Gdk::Pixbuf::get_formats(); for (auto i: formatlist) { diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp index 1323ca7bc..bb6748c9c 100644 --- a/src/extension/internal/gimpgrad.cpp +++ b/src/extension/internal/gimpgrad.cpp @@ -265,7 +265,7 @@ error: #include "clear-n_.h" -void GimpGrad::init (void) +void GimpGrad::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp index 5347eaa86..9e05ecd29 100644 --- a/src/extension/internal/grid.cpp +++ b/src/extension/internal/grid.cpp @@ -151,7 +151,7 @@ public: return; }; - void val_changed (void); + void val_changed (); }; /* class PrefAdjustment */ /** \brief A function to respond to the value_changed signal from the @@ -161,7 +161,7 @@ public: it to the parameter. Very simple, but yet beautiful. */ void -PrefAdjustment::val_changed (void) +PrefAdjustment::val_changed () { // std::cout << "Value Changed to: " << this->get_value() << std::endl; _ext->set_param_float(_pref, this->get_value()); @@ -191,7 +191,7 @@ Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View #include "clear-n_.h" void -Grid::init (void) +Grid::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/grid.h b/src/extension/internal/grid.h index 7d25c7b20..950615ce2 100644 --- a/src/extension/internal/grid.h +++ b/src/extension/internal/grid.h @@ -27,7 +27,7 @@ public: void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *document, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; Gtk::Widget * prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View * view, sigc::signal<void> * changeSignal, Inkscape::Extension::Implementation::ImplementationDocumentCache * docCache) override; - static void init (void); + static void init (); }; }; /* namespace Internal */ diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp index 0185e07cd..ad8fa855d 100644 --- a/src/extension/internal/javafx-out.cpp +++ b/src/extension/internal/javafx-out.cpp @@ -101,7 +101,7 @@ static double effective_opacity(const SPStyle *style) //# OUTPUT FORMATTING //######################################################################## -JavaFXOutput::JavaFXOutput(void) : +JavaFXOutput::JavaFXOutput() : name(), outbuf(), foutbuf(), diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h index f9d209b86..f6035f7c3 100644 --- a/src/extension/internal/javafx-out.h +++ b/src/extension/internal/javafx-out.h @@ -40,7 +40,7 @@ class JavaFXOutput : public Inkscape::Extension::Implementation::Implementation { public: - JavaFXOutput (void); + JavaFXOutput (); /** * Our internal String definition @@ -62,7 +62,7 @@ public: /** * Inkscape runtime startup call. */ - static void init(void); + static void init(); /** * Reset variables to initial state diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp index e1da0bab6..9c509f7d0 100644 --- a/src/extension/internal/latex-pstricks-out.cpp +++ b/src/extension/internal/latex-pstricks-out.cpp @@ -28,12 +28,12 @@ namespace Inkscape { namespace Extension { namespace Internal { -LatexOutput::LatexOutput (void) // The null constructor +LatexOutput::LatexOutput () // The null constructor { return; } -LatexOutput::~LatexOutput (void) //The destructor +LatexOutput::~LatexOutput () //The destructor { return; } @@ -87,7 +87,7 @@ void LatexOutput::save(Inkscape::Extension::Output * /*mod2*/, SPDocument *doc, describes the data. */ void -LatexOutput::init (void) +LatexOutput::init () { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/latex-pstricks-out.h b/src/extension/internal/latex-pstricks-out.h index 842a52655..b34d5c321 100644 --- a/src/extension/internal/latex-pstricks-out.h +++ b/src/extension/internal/latex-pstricks-out.h @@ -30,7 +30,7 @@ public: SPDocument *doc, gchar const *filename) override; - static void init(void);//Initialize the class + static void init();//Initialize the class }; } } } /* namespace Inkscape, Extension, Implementation */ diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp index 226f915aa..1d09fff82 100644 --- a/src/extension/internal/latex-pstricks.cpp +++ b/src/extension/internal/latex-pstricks.cpp @@ -36,14 +36,14 @@ namespace Inkscape { namespace Extension { namespace Internal { -PrintLatex::PrintLatex (void): +PrintLatex::PrintLatex (): _width(0), _height(0), _stream(nullptr) { } -PrintLatex::~PrintLatex (void) +PrintLatex::~PrintLatex () { if (_stream) fclose(_stream); @@ -322,7 +322,7 @@ PrintLatex::textToPath(Inkscape::Extension::Print * ext) #include "clear-n_.h" -void PrintLatex::init(void) +void PrintLatex::init() { /* SVG in */ Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/latex-pstricks.h b/src/extension/internal/latex-pstricks.h index 9b9519c55..fe9472b68 100644 --- a/src/extension/internal/latex-pstricks.h +++ b/src/extension/internal/latex-pstricks.h @@ -37,8 +37,8 @@ class PrintLatex : public Inkscape::Extension::Implementation::Implementation { void print_2geomcurve(SVGOStringStream &os, Geom::Curve const & c ); public: - PrintLatex (void); - ~PrintLatex (void) override; + PrintLatex (); + ~PrintLatex () override; /* Print functions */ unsigned int setup (Inkscape::Extension::Print * module) override; @@ -61,7 +61,7 @@ public: unsigned int comment(Inkscape::Extension::Print *module, const char * comment) override; bool textToPath (Inkscape::Extension::Print * ext) override; - static void init (void); + static void init (); }; } /* namespace Internal */ diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp index fe9e78bf2..f346a304a 100644 --- a/src/extension/internal/latex-text-renderer.cpp +++ b/src/extension/internal/latex-text-renderer.cpp @@ -111,7 +111,7 @@ LaTeXTextRenderer::LaTeXTextRenderer(bool pdflatex) push_transform(Geom::identity()); } -LaTeXTextRenderer::~LaTeXTextRenderer(void) +LaTeXTextRenderer::~LaTeXTextRenderer() { if (_stream) { writePostamble(); @@ -633,7 +633,7 @@ LaTeXTextRenderer::renderItem(SPItem *item) } void -LaTeXTextRenderer::writeGraphicPage(void) { +LaTeXTextRenderer::writeGraphicPage() { Inkscape::SVGOStringStream os; os.setf(std::ios::fixed); // no scientific notation diff --git a/src/extension/internal/metafile-inout.cpp b/src/extension/internal/metafile-inout.cpp index b90af9529..42c17bbdc 100644 --- a/src/extension/internal/metafile-inout.cpp +++ b/src/extension/internal/metafile-inout.cpp @@ -274,7 +274,7 @@ uint32_t Metafile::sethexcolor(U_COLORREF color){ Currently a random 3x4 blotch. Caller must free. */ -gchar *Metafile::bad_image_png(void){ +gchar *Metafile::bad_image_png(){ gchar *gstring = g_strdup("iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAIAAAA7ljmRAAAAA3NCSVQICAjb4U/gAAAALElEQVQImQXBQQ2AMAAAsUJQMSWI2H8qME1yMshojwrvGB8XcHKvR1XtOTc/8HENumHCsOMAAAAASUVORK5CYII="); return(gstring); } diff --git a/src/extension/internal/metafile-inout.h b/src/extension/internal/metafile-inout.h index eaa8334ee..c3cda0954 100644 --- a/src/extension/internal/metafile-inout.h +++ b/src/extension/internal/metafile-inout.h @@ -70,7 +70,7 @@ protected: static pixel_t *pixel_at (bitmap_t * bitmap, int x, int y); static void my_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length); static void toPNG(PMEMPNG accum, int width, int height, const char *px); - static gchar *bad_image_png(void); + static gchar *bad_image_png(); static void setViewBoxIfMissing(SPDocument *doc); static int combine_ops_to_livarot(const int op); diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 691d6e1f7..08520eb26 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -272,7 +272,7 @@ public: SPDocument *doc, gchar const *filename) override; - static void init (void); + static void init (); private: diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index d078b5a9b..bdda43279 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -945,7 +945,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { #include "../clear-n_.h" -void PdfInput::init(void) { +void PdfInput::init() { /* PDF in */ Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h index 4cf1d01a0..ddcb8f222 100644 --- a/src/extension/internal/pdfinput/pdf-input.h +++ b/src/extension/internal/pdfinput/pdf-input.h @@ -136,7 +136,7 @@ class PdfInput: public Inkscape::Extension::Implementation::Implementation { public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; - static void init( void ); + static void init( ); bool wasCancelled() override; private: bool _cancelled; diff --git a/src/extension/internal/pov-out.h b/src/extension/internal/pov-out.h index f38027a4b..d4f7991e7 100644 --- a/src/extension/internal/pov-out.h +++ b/src/extension/internal/pov-out.h @@ -65,7 +65,7 @@ public: /** * Inkscape runtime startup call. */ - static void init(void); + static void init(); /** * Reset variables to initial state diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index f4e28e7ed..189ef3c58 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -130,7 +130,7 @@ static void pruneProprietaryGarbage( Inkscape::XML::Node *repr ) the end of each call. */ void -Svg::init(void) +Svg::init() { /* SVG in */ Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/svg.h b/src/extension/internal/svg.h index a7b593d54..cba0ebf3d 100644 --- a/src/extension/internal/svg.h +++ b/src/extension/internal/svg.h @@ -29,7 +29,7 @@ public: gchar const *filename ) override; SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; - static void init( void ); + static void init( ); }; diff --git a/src/extension/internal/svgz.cpp b/src/extension/internal/svgz.cpp index be9440980..27992ba58 100644 --- a/src/extension/internal/svgz.cpp +++ b/src/extension/internal/svgz.cpp @@ -38,7 +38,7 @@ namespace Internal { the end of each call. */ void -Svgz::init(void) +Svgz::init() { /* SVGZ in */ Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/svgz.h b/src/extension/internal/svgz.h index ba348f887..2b917968e 100644 --- a/src/extension/internal/svgz.h +++ b/src/extension/internal/svgz.h @@ -23,7 +23,7 @@ namespace Internal { class Svgz : public Svg { public: - static void init( void ); + static void init( ); }; } } } // namespace Inkscape, Extension, Implementation diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp index 46aa0245c..a0b41a990 100644 --- a/src/extension/internal/vsd-input.cpp +++ b/src/extension/internal/vsd-input.cpp @@ -304,7 +304,7 @@ SPDocument *VsdInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u #include "clear-n_.h" -void VsdInput::init(void) +void VsdInput::init() { /* VSD */ Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/vsd-input.h b/src/extension/internal/vsd-input.h index 5d8daddb2..6a5c28e65 100644 --- a/src/extension/internal/vsd-input.h +++ b/src/extension/internal/vsd-input.h @@ -32,7 +32,7 @@ class VsdInput : public Inkscape::Extension::Implementation::Implementation { public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; - static void init( void ); + static void init( ); }; diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp index bcc8aea85..b19ac8328 100644 --- a/src/extension/internal/wmf-inout.cpp +++ b/src/extension/internal/wmf-inout.cpp @@ -67,13 +67,13 @@ namespace Internal { static bool clipset = false; static uint32_t BLTmode=0; -Wmf::Wmf (void) // The null constructor +Wmf::Wmf () // The null constructor { return; } -Wmf::~Wmf (void) //The destructor +Wmf::~Wmf () //The destructor { return; } @@ -3198,7 +3198,7 @@ Wmf::open( Inkscape::Extension::Input * /*mod*/, const gchar *uri ) void -Wmf::init (void) +Wmf::init () { /* WMF in */ Inkscape::Extension::build_from_mem( diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h index a9831a7c6..fbd7fff3a 100644 --- a/src/extension/internal/wmf-inout.h +++ b/src/extension/internal/wmf-inout.h @@ -183,7 +183,7 @@ public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; - static void init(void);//Initialize the class + static void init();//Initialize the class private: protected: diff --git a/src/extension/internal/wmf-print.cpp b/src/extension/internal/wmf-print.cpp index 6c431eba5..9318da939 100644 --- a/src/extension/internal/wmf-print.cpp +++ b/src/extension/internal/wmf-print.cpp @@ -1562,7 +1562,7 @@ unsigned int PrintWmf::text(Inkscape::Extension::Print * /*mod*/, char const *te return 0; } -void PrintWmf::init(void) +void PrintWmf::init() { _load_ppt_fontfix_data(); diff --git a/src/extension/internal/wmf-print.h b/src/extension/internal/wmf-print.h index c271e3cf7..5f68b77c1 100644 --- a/src/extension/internal/wmf-print.h +++ b/src/extension/internal/wmf-print.h @@ -64,7 +64,7 @@ public: unsigned int text(Inkscape::Extension::Print *module, char const *text, Geom::Point const &p, SPStyle const *style) override; - static void init (void); + static void init (); protected: static void smuggle_adxky_out(const char *string, int16_t **adx, double *ky, int *rtl, int *ndx, float scale); diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp index 6a790ed4c..a1c27e3e3 100644 --- a/src/extension/internal/wpg-input.cpp +++ b/src/extension/internal/wpg-input.cpp @@ -148,7 +148,7 @@ SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * u #include "clear-n_.h" -void WpgInput::init(void) { +void WpgInput::init() { Inkscape::Extension::build_from_mem( "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n" "<name>" N_("WPG Input") "</name>\n" diff --git a/src/extension/internal/wpg-input.h b/src/extension/internal/wpg-input.h index 92404a9e7..f938a8d17 100644 --- a/src/extension/internal/wpg-input.h +++ b/src/extension/internal/wpg-input.h @@ -26,7 +26,7 @@ class WpgInput : public Inkscape::Extension::Implementation::Implementation { public: SPDocument *open( Inkscape::Extension::Input *mod, const gchar *uri ) override; - static void init( void ); + static void init( ); }; |
