summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-19 13:55:58 +0000
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-19 13:55:58 +0000
commit884fe02952017ac219cd23f9407d27ed4d8a8620 (patch)
treea86d66e240ae1e72007ba75b23757c71d5a9a28c /src/extension
parentRun clang-tidy’s modernize-use-emplace pass. (diff)
downloadinkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.tar.gz
inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.zip
Run clang-tidy’s modernize-redundant-void-arg pass.
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/db.h2
-rw-r--r--src/extension/dependency.cpp4
-rw-r--r--src/extension/dependency.h8
-rw-r--r--src/extension/effect.cpp8
-rw-r--r--src/extension/effect.h14
-rw-r--r--src/extension/error-file.cpp6
-rw-r--r--src/extension/error-file.h6
-rw-r--r--src/extension/execution-env.cpp22
-rw-r--r--src/extension/execution-env.h24
-rw-r--r--src/extension/extension.cpp32
-rw-r--r--src/extension/extension.h36
-rw-r--r--src/extension/implementation/script.cpp4
-rw-r--r--src/extension/implementation/script.h8
-rw-r--r--src/extension/implementation/xslt.cpp2
-rw-r--r--src/extension/implementation/xslt.h2
-rw-r--r--src/extension/init.h2
-rw-r--r--src/extension/input.cpp12
-rw-r--r--src/extension/input.h12
-rw-r--r--src/extension/internal/bluredge.cpp2
-rw-r--r--src/extension/internal/bluredge.h2
-rw-r--r--src/extension/internal/cairo-png-out.cpp2
-rw-r--r--src/extension/internal/cairo-ps-out.cpp4
-rw-r--r--src/extension/internal/cairo-render-context.cpp34
-rw-r--r--src/extension/internal/cairo-render-context.h44
-rw-r--r--src/extension/internal/cairo-renderer-pdf-out.cpp2
-rw-r--r--src/extension/internal/cairo-renderer.cpp4
-rw-r--r--src/extension/internal/cairo-renderer.h6
-rw-r--r--src/extension/internal/cdr-input.cpp2
-rw-r--r--src/extension/internal/cdr-input.h2
-rw-r--r--src/extension/internal/emf-inout.cpp6
-rw-r--r--src/extension/internal/emf-inout.h2
-rw-r--r--src/extension/internal/emf-print.cpp2
-rw-r--r--src/extension/internal/emf-print.h2
-rw-r--r--src/extension/internal/filter/bevels.h6
-rw-r--r--src/extension/internal/filter/blurs.h10
-rw-r--r--src/extension/internal/filter/bumps.h4
-rw-r--r--src/extension/internal/filter/color.h38
-rw-r--r--src/extension/internal/filter/distort.h4
-rw-r--r--src/extension/internal/filter/filter-all.cpp2
-rw-r--r--src/extension/internal/filter/filter-file.cpp12
-rw-r--r--src/extension/internal/filter/filter.cpp2
-rw-r--r--src/extension/internal/filter/filter.h4
-rw-r--r--src/extension/internal/filter/image.h2
-rw-r--r--src/extension/internal/filter/morphology.h4
-rw-r--r--src/extension/internal/filter/overlays.h2
-rw-r--r--src/extension/internal/filter/paint.h16
-rw-r--r--src/extension/internal/filter/protrusions.h2
-rw-r--r--src/extension/internal/filter/shadows.h2
-rw-r--r--src/extension/internal/filter/textures.h2
-rw-r--r--src/extension/internal/filter/transparency.h10
-rw-r--r--src/extension/internal/gdkpixbuf-input.cpp2
-rw-r--r--src/extension/internal/gimpgrad.cpp2
-rw-r--r--src/extension/internal/grid.cpp6
-rw-r--r--src/extension/internal/grid.h2
-rw-r--r--src/extension/internal/javafx-out.cpp2
-rw-r--r--src/extension/internal/javafx-out.h4
-rw-r--r--src/extension/internal/latex-pstricks-out.cpp6
-rw-r--r--src/extension/internal/latex-pstricks-out.h2
-rw-r--r--src/extension/internal/latex-pstricks.cpp6
-rw-r--r--src/extension/internal/latex-pstricks.h6
-rw-r--r--src/extension/internal/latex-text-renderer.cpp4
-rw-r--r--src/extension/internal/metafile-inout.cpp2
-rw-r--r--src/extension/internal/metafile-inout.h2
-rw-r--r--src/extension/internal/odf.h2
-rw-r--r--src/extension/internal/pdfinput/pdf-input.cpp2
-rw-r--r--src/extension/internal/pdfinput/pdf-input.h2
-rw-r--r--src/extension/internal/pov-out.h2
-rw-r--r--src/extension/internal/svg.cpp2
-rw-r--r--src/extension/internal/svg.h2
-rw-r--r--src/extension/internal/svgz.cpp2
-rw-r--r--src/extension/internal/svgz.h2
-rw-r--r--src/extension/internal/vsd-input.cpp2
-rw-r--r--src/extension/internal/vsd-input.h2
-rw-r--r--src/extension/internal/wmf-inout.cpp6
-rw-r--r--src/extension/internal/wmf-inout.h2
-rw-r--r--src/extension/internal/wmf-print.cpp2
-rw-r--r--src/extension/internal/wmf-print.h2
-rw-r--r--src/extension/internal/wpg-input.cpp2
-rw-r--r--src/extension/internal/wpg-input.h2
-rw-r--r--src/extension/loader.cpp4
-rw-r--r--src/extension/output.cpp14
-rw-r--r--src/extension/output.h16
-rw-r--r--src/extension/param/bool.cpp4
-rw-r--r--src/extension/param/color.cpp2
-rw-r--r--src/extension/param/color.h2
-rw-r--r--src/extension/param/enum.cpp8
-rw-r--r--src/extension/param/enum.h4
-rw-r--r--src/extension/param/float.cpp4
-rw-r--r--src/extension/param/float.h6
-rw-r--r--src/extension/param/int.cpp4
-rw-r--r--src/extension/param/int.h4
-rw-r--r--src/extension/param/notebook.cpp4
-rw-r--r--src/extension/param/notebook.h6
-rw-r--r--src/extension/param/parameter.cpp4
-rw-r--r--src/extension/param/parameter.h8
-rw-r--r--src/extension/param/radiobutton.cpp10
-rw-r--r--src/extension/param/radiobutton.h2
-rw-r--r--src/extension/param/string.cpp6
-rw-r--r--src/extension/param/string.h4
-rw-r--r--src/extension/patheffect.h2
-rw-r--r--src/extension/plugins/grid2/grid.cpp4
-rw-r--r--src/extension/prefdialog.cpp6
-rw-r--r--src/extension/prefdialog.h6
-rw-r--r--src/extension/print.h16
-rw-r--r--src/extension/timer.cpp10
-rw-r--r--src/extension/timer.h14
106 files changed, 349 insertions, 349 deletions
diff --git a/src/extension/db.h b/src/extension/db.h
index 73e735ac0..19595e840 100644
--- a/src/extension/db.h
+++ b/src/extension/db.h
@@ -55,7 +55,7 @@ private:
static void foreach_internal (gpointer in_key, gpointer in_value, gpointer in_data);
public:
- DB (void);
+ DB ();
Extension * get (const gchar *key);
void register_ext (Extension *module);
void unregister_ext (Extension *module);
diff --git a/src/extension/dependency.cpp b/src/extension/dependency.cpp
index 07462e5e7..054fc9b2a 100644
--- a/src/extension/dependency.cpp
+++ b/src/extension/dependency.cpp
@@ -94,7 +94,7 @@ Dependency::Dependency (Inkscape::XML::Node * in_repr)
Unreference the XML structure.
*/
-Dependency::~Dependency (void)
+Dependency::~Dependency ()
{
Inkscape::GC::release(_repr);
}
@@ -129,7 +129,7 @@ Dependency::~Dependency (void)
found then a TRUE is returned. If we get all the way through the
path then a FALSE is returned, the command could not be found.
*/
-bool Dependency::check (void) const
+bool Dependency::check () const
{
// std::cout << "Checking: " << *this << std::endl;
diff --git a/src/extension/dependency.h b/src/extension/dependency.h
index 5e58fe06b..e97965cc5 100644
--- a/src/extension/dependency.h
+++ b/src/extension/dependency.h
@@ -56,11 +56,11 @@ class Dependency {
public:
Dependency (Inkscape::XML::Node * in_repr);
- virtual ~Dependency (void);
- bool check (void) const;
+ virtual ~Dependency ();
+ bool check () const;
const gchar* get_name();
- Glib::ustring &get_help (void) const;
- Glib::ustring &get_link (void) const;
+ Glib::ustring &get_help () const;
+ Glib::ustring &get_link () const;
friend std::ostream & operator<< (std::ostream &out_file, const Dependency & in_dep);
}; /* class Dependency */
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index 8be5287a2..1cf624ad0 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -207,7 +207,7 @@ Effect::merge_menu (Inkscape::XML::Node * base,
return;
}
-Effect::~Effect (void)
+Effect::~Effect ()
{
if (get_last_effect() == this)
set_last_effect(nullptr);
@@ -217,7 +217,7 @@ Effect::~Effect (void)
}
bool
-Effect::check (void)
+Effect::check ()
{
if (!Extension::check()) {
/** \todo Check to see if parent has this as its only child,
@@ -346,13 +346,13 @@ Effect::find_menu (Inkscape::XML::Node * menustruct, const gchar *name)
Gtk::VBox *
-Effect::get_info_widget(void)
+Effect::get_info_widget()
{
return Extension::get_info_widget();
}
PrefDialog *
-Effect::get_pref_dialog (void)
+Effect::get_pref_dialog ()
{
return _prefDialog;
}
diff --git a/src/extension/effect.h b/src/extension/effect.h
index 5481d420a..b37e2bc7e 100644
--- a/src/extension/effect.h
+++ b/src/extension/effect.h
@@ -106,26 +106,26 @@ class Effect : public Extension {
public:
Effect (Inkscape::XML::Node * in_repr,
Implementation::Implementation * in_imp);
- ~Effect (void) override;
- bool check (void) override;
+ ~Effect () override;
+ bool check () override;
bool prefs (Inkscape::UI::View::View * doc);
void effect (Inkscape::UI::View::View * doc);
/** \brief Accessor function for a pointer to the verb */
- Inkscape::Verb * get_verb (void) { return &_verb; };
+ Inkscape::Verb * get_verb () { return &_verb; };
/** \brief Static function to get the last effect used */
- static Effect * get_last_effect (void) { return _last_effect; };
+ static Effect * get_last_effect () { return _last_effect; };
static void set_last_effect (Effect * in_effect);
- static void place_menus (void);
+ static void place_menus ();
void place_menu (Inkscape::XML::Node * menus);
- Gtk::VBox * get_info_widget(void);
+ Gtk::VBox * get_info_widget();
bool no_doc; // if true, the effect does not process SVG document at all, so no need to save, read, and watch for errors
bool no_live_preview; // if true, the effect does not need "live preview" checkbox in its dialog
- PrefDialog *get_pref_dialog (void);
+ PrefDialog *get_pref_dialog ();
void set_pref_dialog (PrefDialog * prefdialog);
private:
static gchar * remove_ (gchar * instr);
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp
index 20dcc0f5f..fdfe87db8 100644
--- a/src/extension/error-file.cpp
+++ b/src/extension/error-file.cpp
@@ -39,7 +39,7 @@ namespace Extension {
it should always be checked if you can see the dialog, but it is
probably good to check anyway).
*/
-ErrorFileNotice::ErrorFileNotice (void) :
+ErrorFileNotice::ErrorFileNotice () :
Gtk::MessageDialog(
"", /* message */
false, /* use markup */
@@ -80,7 +80,7 @@ ErrorFileNotice::ErrorFileNotice (void) :
/** \brief Sets the preferences based on the checkbox value */
void
-ErrorFileNotice::checkbox_toggle (void)
+ErrorFileNotice::checkbox_toggle ()
{
// std::cout << "Toggle value" << std::endl;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -93,7 +93,7 @@ ErrorFileNotice::checkbox_toggle (void)
user wants to see the dialog, otherwise it just exits.
*/
int
-ErrorFileNotice::run (void)
+ErrorFileNotice::run ()
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
if (!prefs->getBool(PREFERENCE_ID, true))
diff --git a/src/extension/error-file.h b/src/extension/error-file.h
index e710c0e4e..c4983e7e7 100644
--- a/src/extension/error-file.h
+++ b/src/extension/error-file.h
@@ -23,10 +23,10 @@ class ErrorFileNotice : public Gtk::MessageDialog {
/** The checkbutton, this is so we can figure out when it gets checked */
Gtk::CheckButton * checkbutton;
- void checkbox_toggle(void);
+ void checkbox_toggle();
public:
- ErrorFileNotice (void);
- int run (void);
+ ErrorFileNotice ();
+ int run ();
};
}; }; /* namespace Inkscape, Extension */
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 0e0688f44..9a1733eea 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -63,7 +63,7 @@ ExecutionEnv::ExecutionEnv (Effect * effect, Inkscape::UI::View::View * doc, Imp
Destroys the dialog if created and the document cache.
*/
-ExecutionEnv::~ExecutionEnv (void) {
+ExecutionEnv::~ExecutionEnv () {
if (_visibleDialog != nullptr) {
_visibleDialog->hide();
delete _visibleDialog;
@@ -79,7 +79,7 @@ ExecutionEnv::~ExecutionEnv (void) {
from the effect's implementation.
*/
void
-ExecutionEnv::genDocCache (void) {
+ExecutionEnv::genDocCache () {
if (_docCache == nullptr) {
// printf("Gen Doc Cache\n");
_docCache = _effect->get_imp()->newDocCache(_effect, _doc);
@@ -92,7 +92,7 @@ ExecutionEnv::genDocCache (void) {
Just delete it.
*/
void
-ExecutionEnv::killDocCache (void) {
+ExecutionEnv::killDocCache () {
if (_docCache != nullptr) {
// printf("Killed Doc Cache\n");
delete _docCache;
@@ -107,7 +107,7 @@ ExecutionEnv::killDocCache (void) {
And make sure to connect to the cancel.
*/
void
-ExecutionEnv::createWorkingDialog (void) {
+ExecutionEnv::createWorkingDialog () {
if (_visibleDialog != nullptr) {
_visibleDialog->hide();
delete _visibleDialog;
@@ -153,7 +153,7 @@ ExecutionEnv::workingCanceled( const int /*resp*/) {
}
void
-ExecutionEnv::cancel (void) {
+ExecutionEnv::cancel () {
SPDesktop *desktop = (SPDesktop *)_doc;
desktop->clearWaitingCursor();
_effect->get_imp()->cancelProcessing();
@@ -161,13 +161,13 @@ ExecutionEnv::cancel (void) {
}
void
-ExecutionEnv::undo (void) {
+ExecutionEnv::undo () {
DocumentUndo::cancel(_doc->doc());
return;
}
void
-ExecutionEnv::commit (void) {
+ExecutionEnv::commit () {
DocumentUndo::done(_doc->doc(), SP_VERB_NONE, _(_effect->get_name()));
Effect::set_last_effect(_effect);
_effect->get_imp()->commitDocument();
@@ -176,7 +176,7 @@ ExecutionEnv::commit (void) {
}
void
-ExecutionEnv::reselect (void) {
+ExecutionEnv::reselect () {
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
if(desktop) {
Inkscape::Selection * selection = desktop->getSelection();
@@ -188,7 +188,7 @@ ExecutionEnv::reselect (void) {
}
void
-ExecutionEnv::run (void) {
+ExecutionEnv::run () {
_state = ExecutionEnv::RUNNING;
if (_show_working) {
createWorkingDialog();
@@ -203,12 +203,12 @@ ExecutionEnv::run (void) {
}
void
-ExecutionEnv::runComplete (void) {
+ExecutionEnv::runComplete () {
_mainloop->quit();
}
bool
-ExecutionEnv::wait (void) {
+ExecutionEnv::wait () {
if (_state != ExecutionEnv::COMPLETE) {
if (_mainloop) {
_mainloop = Glib::MainLoop::create(false);
diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h
index 5ae7beb42..1bafdf8a7 100644
--- a/src/extension/execution-env.h
+++ b/src/extension/execution-env.h
@@ -81,30 +81,30 @@ public:
Implementation::ImplementationDocumentCache * docCache = nullptr,
bool show_working = true,
bool show_errors = true);
- virtual ~ExecutionEnv (void);
+ virtual ~ExecutionEnv ();
/** \brief Starts the execution of the effect
\return Returns whether the effect was executed to completion */
- void run (void);
+ void run ();
/** \brief Cancel the execution of the effect */
- void cancel (void);
+ void cancel ();
/** \brief Commit the changes to the document */
- void commit (void);
+ void commit ();
/** \brief Undoes what the effect completed. */
- void undo (void);
+ void undo ();
/** \brief Wait for the effect to complete if it hasn't. */
- bool wait (void);
- void reselect (void);
+ bool wait ();
+ void reselect ();
/** \brief Return reference to working dialog (if any) */
- Gtk::Dialog *get_working_dialog (void) { return _visibleDialog; };
+ Gtk::Dialog *get_working_dialog () { return _visibleDialog; };
private:
- void runComplete (void);
- void createWorkingDialog (void);
+ void runComplete ();
+ void createWorkingDialog ();
void workingCanceled (const int resp);
- void genDocCache (void);
- void killDocCache (void);
+ void genDocCache ();
+ void killDocCache ();
};
} } /* namespace Inkscape, Extension */
diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp
index 55b5f68fc..3c9861aee 100644
--- a/src/extension/extension.cpp
+++ b/src/extension/extension.cpp
@@ -133,7 +133,7 @@ Extension::Extension (Inkscape::XML::Node * in_repr, Implementation::Implementat
than freeing it because it may (I wouldn't know why) be referenced
in another place.
*/
-Extension::~Extension (void)
+Extension::~Extension ()
{
// printf("Extension Destructor: %s\n", name);
set_state(STATE_UNLOADED);
@@ -217,7 +217,7 @@ Extension::set_state (state_t in_state)
\brief A getter for the state variable.
*/
Extension::state_t
-Extension::get_state (void)
+Extension::get_state ()
{
return _state;
}
@@ -227,7 +227,7 @@ Extension::get_state (void)
\brief A quick function to test the state of the extension
*/
bool
-Extension::loaded (void)
+Extension::loaded ()
{
return get_state() == STATE_LOADED;
}
@@ -249,7 +249,7 @@ Extension::loaded (void)
functionality of Inkscape to be available.
*/
bool
-Extension::check (void)
+Extension::check ()
{
bool retval = true;
@@ -321,7 +321,7 @@ Extension::printFailure (Glib::ustring reason)
\brief A getter for the internal Repr, does not add a reference.
*/
Inkscape::XML::Node *
-Extension::get_repr (void)
+Extension::get_repr ()
{
return repr;
}
@@ -331,7 +331,7 @@ Extension::get_repr (void)
\brief Whether this extension should hide the "working, please wait" dialog
*/
bool
-Extension::is_silent (void)
+Extension::is_silent ()
{
return silent;
}
@@ -341,7 +341,7 @@ Extension::is_silent (void)
\brief Get the ID of this extension - not a copy don't delete!
*/
gchar *
-Extension::get_id (void)
+Extension::get_id ()
{
return id;
}
@@ -351,7 +351,7 @@ Extension::get_id (void)
\brief Get the name of this extension - not a copy don't delete!
*/
gchar *
-Extension::get_name (void)
+Extension::get_name ()
{
return name;
}
@@ -372,7 +372,7 @@ Extension::get_name (void)
Running this function is irreversable.
*/
void
-Extension::deactivate (void)
+Extension::deactivate ()
{
set_state(STATE_DEACTIVATED);
@@ -389,7 +389,7 @@ Extension::deactivate (void)
\brief Find out the status of the extension
*/
bool
-Extension::deactivated (void)
+Extension::deactivated ()
{
return get_state() == STATE_DEACTIVATED;
}
@@ -650,7 +650,7 @@ Extension::set_param_color (const gchar * name, guint32 color, SPDocument * doc,
/** \brief A function to open the error log file. */
void
-Extension::error_file_open (void)
+Extension::error_file_open ()
{
gchar * ext_error_file = Inkscape::IO::Resource::log_path(EXTENSION_ERROR_LOG_FILENAME);
gchar * filename = g_filename_from_utf8( ext_error_file, -1, nullptr, nullptr, nullptr );
@@ -665,7 +665,7 @@ Extension::error_file_open (void)
/** \brief A function to close the error log file. */
void
-Extension::error_file_close (void)
+Extension::error_file_close ()
{
error_file.close();
};
@@ -674,7 +674,7 @@ Extension::error_file_close (void)
class AutoGUI : public Gtk::VBox {
public:
/** \brief Create an AutoGUI object */
- AutoGUI (void) : Gtk::VBox() {};
+ AutoGUI () : Gtk::VBox() {};
/**
* Adds a widget with a tool tip into the autogui.
@@ -754,7 +754,7 @@ Extension::paramListString (std::list <std::string> &retlist)
/* Extension editor dialog stuff */
Gtk::VBox *
-Extension::get_info_widget(void)
+Extension::get_info_widget()
{
Gtk::VBox * retval = Gtk::manage(new Gtk::VBox());
@@ -794,7 +794,7 @@ void Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Gri
}
Gtk::VBox *
-Extension::get_help_widget(void)
+Extension::get_help_widget()
{
Gtk::VBox * retval = Gtk::manage(new Gtk::VBox());
@@ -814,7 +814,7 @@ Extension::get_help_widget(void)
}
Gtk::VBox *
-Extension::get_params_widget(void)
+Extension::get_params_widget()
{
Gtk::VBox * retval = Gtk::manage(new Gtk::VBox());
Gtk::Widget * content = Gtk::manage(new Gtk::Label("Params"));
diff --git a/src/extension/extension.h b/src/extension/extension.h
index e927e1431..36e06939a 100644
--- a/src/extension/extension.h
+++ b/src/extension/extension.h
@@ -116,24 +116,24 @@ protected:
public:
Extension (Inkscape::XML::Node * in_repr,
Implementation::Implementation * in_imp);
- virtual ~Extension (void);
+ virtual ~Extension ();
void set_state (state_t in_state);
- state_t get_state (void);
- bool loaded (void);
- virtual bool check (void);
- Inkscape::XML::Node * get_repr (void);
- gchar * get_id (void);
- gchar * get_name (void);
+ state_t get_state ();
+ bool loaded ();
+ virtual bool check ();
+ Inkscape::XML::Node * get_repr ();
+ gchar * get_id ();
+ gchar * get_name ();
/** \brief Gets the help string for this extension */
- gchar const * get_help (void) { return _help; }
- bool is_silent (void);
- void deactivate (void);
- bool deactivated (void);
+ gchar const * get_help () { return _help; }
+ bool is_silent ();
+ void deactivate ();
+ bool deactivated ();
void printFailure (Glib::ustring reason);
- Implementation::Implementation * get_imp (void) { return imp; };
+ Implementation::Implementation * get_imp () { return imp; };
void set_execution_env (ExecutionEnv * env) { execution_env = env; };
- ExecutionEnv *get_execution_env (void) { return execution_env; };
+ ExecutionEnv *get_execution_env () { return execution_env; };
/* Parameter Stuff */
private:
@@ -283,8 +283,8 @@ public:
/* Error file handling */
public:
- static void error_file_open (void);
- static void error_file_close (void);
+ static void error_file_open ();
+ static void error_file_close ();
public:
Gtk::Widget * autogui (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal = nullptr);
@@ -293,9 +293,9 @@ public:
/* Extension editor dialog stuff */
public:
- Gtk::VBox * get_info_widget(void);
- Gtk::VBox * get_help_widget(void);
- Gtk::VBox * get_params_widget(void);
+ Gtk::VBox * get_info_widget();
+ Gtk::VBox * get_help_widget();
+ Gtk::VBox * get_params_widget();
protected:
inline static void add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Grid * table, int * row);
};
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 72a015b57..f0a6ec7bf 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -70,7 +70,7 @@ namespace Implementation {
This just keeps coming the events through so that we'll make the GUI
update and look pretty.
*/
-void Script::pump_events (void) {
+void Script::pump_events () {
while ( Gtk::Main::events_pending() ) {
Gtk::Main::iteration();
}
@@ -903,7 +903,7 @@ void Script::checkStderr (const Glib::ustring &data,
return;
}
-bool Script::cancelProcessing (void) {
+bool Script::cancelProcessing () {
_canceled = true;
_main_loop->quit();
Glib::spawn_close_pid(_pid);
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index 22c15faa8..fba1df136 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -34,7 +34,7 @@ namespace Implementation {
class Script : public Implementation {
public:
- Script(void);
+ Script();
~Script() override;
bool load(Inkscape::Extension::Extension *module) override;
void unload(Inkscape::Extension::Extension *module) override;
@@ -47,7 +47,7 @@ public:
Gtk::Widget *prefs_output(Inkscape::Extension::Output *module) override;
void save(Inkscape::Extension::Output *module, SPDocument *doc, gchar const *filename) override;
void effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *doc, ImplementationDocumentCache * docCache) override;
- bool cancelProcessing (void) override;
+ bool cancelProcessing () override;
private:
bool _canceled;
@@ -96,7 +96,7 @@ private:
bool isDead () { return _dead; }
void init(int fd, Glib::RefPtr<Glib::MainLoop> main);
bool read(Glib::IOCondition condition);
- Glib::ustring string (void) { return _string; };
+ Glib::ustring string () { return _string; };
bool toFile(const Glib::ustring &name);
};
@@ -105,7 +105,7 @@ private:
const Glib::ustring &filein,
file_listener &fileout);
- void pump_events(void);
+ void pump_events();
/** \brief A definition of an interpreter, which can be specified
in the INX file, but we need to know what to call */
diff --git a/src/extension/implementation/xslt.cpp b/src/extension/implementation/xslt.cpp
index 9e4a45483..e3b63d0a3 100644
--- a/src/extension/implementation/xslt.cpp
+++ b/src/extension/implementation/xslt.cpp
@@ -45,7 +45,7 @@ namespace Implementation {
variables.
*/
-XSLT::XSLT(void) :
+XSLT::XSLT() :
Implementation(),
_filename(""),
_parsedDoc(nullptr),
diff --git a/src/extension/implementation/xslt.h b/src/extension/implementation/xslt.h
index 3e5e24a9b..eb24436ae 100644
--- a/src/extension/implementation/xslt.h
+++ b/src/extension/implementation/xslt.h
@@ -37,7 +37,7 @@ private:
Glib::ustring solve_reldir(Inkscape::XML::Node *reprin);
public:
- XSLT (void);
+ XSLT ();
bool load(Inkscape::Extension::Extension *module) override;
void unload(Inkscape::Extension::Extension *module) override;
diff --git a/src/extension/init.h b/src/extension/init.h
index efe44bf47..d89ad6ddd 100644
--- a/src/extension/init.h
+++ b/src/extension/init.h
@@ -18,7 +18,7 @@
namespace Inkscape {
namespace Extension {
-void init (void);
+void init ();
} } /* namespace Inkscape::Extension */
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 3fb330998..a13b6c4ea 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -98,7 +98,7 @@ Input::Input (Inkscape::XML::Node * in_repr, Implementation::Implementation * in
\return None
\brief Destroys an Input extension
*/
-Input::~Input (void)
+Input::~Input ()
{
g_free(mimetype);
g_free(extension);
@@ -117,7 +117,7 @@ Input::~Input (void)
class' check function which also checks out the implementation.
*/
bool
-Input::check (void)
+Input::check ()
{
if (extension == nullptr)
return FALSE;
@@ -162,7 +162,7 @@ Input::open (const gchar *uri)
\brief Get the mime-type that describes this extension
*/
gchar *
-Input::get_mimetype(void)
+Input::get_mimetype()
{
return mimetype;
}
@@ -172,7 +172,7 @@ Input::get_mimetype(void)
\brief Get the filename extension for this extension
*/
gchar *
-Input::get_extension(void)
+Input::get_extension()
{
return extension;
}
@@ -182,7 +182,7 @@ Input::get_extension(void)
\brief Get the name of the filetype supported
*/
gchar *
-Input::get_filetypename(void)
+Input::get_filetypename()
{
if (filetypename != nullptr)
return filetypename;
@@ -195,7 +195,7 @@ Input::get_filetypename(void)
\brief Get the tooltip for more information on the filetype
*/
gchar *
-Input::get_filetypetooltip(void)
+Input::get_filetypetooltip()
{
return filetypetooltip;
}
diff --git a/src/extension/input.h b/src/extension/input.h
index c433272ca..6db5a98b9 100644
--- a/src/extension/input.h
+++ b/src/extension/input.h
@@ -45,13 +45,13 @@ public:
Input (Inkscape::XML::Node * in_repr,
Implementation::Implementation * in_imp);
- ~Input (void) override;
- bool check (void) override;
+ ~Input () override;
+ bool check () override;
SPDocument * open (gchar const *uri);
- gchar * get_mimetype (void);
- gchar * get_extension (void);
- gchar * get_filetypename (void);
- gchar * get_filetypetooltip (void);
+ gchar * get_mimetype ();
+ gchar * get_extension ();
+ gchar * get_filetypename ();
+ gchar * get_filetypetooltip ();
bool prefs (gchar const *uri);
};
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( );
};
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 9d8c52aea..fc9b7ee29 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -21,8 +21,8 @@
namespace Inkscape {
namespace Extension {
-typedef Implementation::Implementation *(*_getImplementation)(void);
-typedef const gchar *(*_getInkscapeVersion)(void);
+typedef Implementation::Implementation *(*_getImplementation)();
+typedef const gchar *(*_getInkscapeVersion)();
bool Loader::load_dependency(Dependency *dep)
{
diff --git a/src/extension/output.cpp b/src/extension/output.cpp
index d6f95c19a..5a39a2403 100644
--- a/src/extension/output.cpp
+++ b/src/extension/output.cpp
@@ -95,7 +95,7 @@ Output::Output (Inkscape::XML::Node * in_repr, Implementation::Implementation *
/**
\brief Destroy an output extension
*/
-Output::~Output (void)
+Output::~Output ()
{
g_free(mimetype);
g_free(extension);
@@ -113,7 +113,7 @@ Output::~Output (void)
class' check function which also checks out the implementation.
*/
bool
-Output::check (void)
+Output::check ()
{
if (extension == nullptr)
return FALSE;
@@ -128,7 +128,7 @@ Output::check (void)
\brief Get the mime-type that describes this extension
*/
gchar *
-Output::get_mimetype(void)
+Output::get_mimetype()
{
return mimetype;
}
@@ -138,7 +138,7 @@ Output::get_mimetype(void)
\brief Get the filename extension for this extension
*/
gchar *
-Output::get_extension(void)
+Output::get_extension()
{
return extension;
}
@@ -148,7 +148,7 @@ Output::get_extension(void)
\brief Get the name of the filetype supported
*/
gchar *
-Output::get_filetypename(void)
+Output::get_filetypename()
{
if (filetypename != nullptr)
return filetypename;
@@ -161,7 +161,7 @@ Output::get_filetypename(void)
\brief Get the tooltip for more information on the filetype
*/
gchar *
-Output::get_filetypetooltip(void)
+Output::get_filetypetooltip()
{
return filetypetooltip;
}
@@ -173,7 +173,7 @@ Output::get_filetypetooltip(void)
Calls the implementation to get the preferences.
*/
bool
-Output::prefs (void)
+Output::prefs ()
{
if (!loaded())
set_state(Extension::STATE_LOADED);
diff --git a/src/extension/output.h b/src/extension/output.h
index 4f2924852..de1ce4503 100644
--- a/src/extension/output.h
+++ b/src/extension/output.h
@@ -39,16 +39,16 @@ public:
Output (Inkscape::XML::Node * in_repr,
Implementation::Implementation * in_imp);
- ~Output (void) override;
- bool check (void) override;
+ ~Output () override;
+ bool check () override;
void save (SPDocument *doc,
gchar const *uri);
- bool prefs (void);
- gchar * get_mimetype(void);
- gchar * get_extension(void);
- gchar * get_filetypename(void);
- gchar * get_filetypetooltip(void);
- bool causes_dataloss(void) { return dataloss; };
+ bool prefs ();
+ gchar * get_mimetype();
+ gchar * get_extension();
+ gchar * get_filetypename();
+ gchar * get_filetypetooltip();
+ bool causes_dataloss() { return dataloss; };
};
} } /* namespace Inkscape, Extension */
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index eea660f69..ac86e77b1 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -94,7 +94,7 @@ public:
* A function to respond to the check box changing.
* Adjusts the value of the preference to match that in the check box.
*/
- void on_toggle (void);
+ void on_toggle ();
private:
/** Param to change. */
@@ -104,7 +104,7 @@ private:
sigc::signal<void> * _changeSignal;
};
-void ParamBoolCheckButton::on_toggle(void)
+void ParamBoolCheckButton::on_toggle()
{
_pref->set(this->get_active(), nullptr /**\todo fix this */, nullptr);
if (_changeSignal != nullptr) {
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 1e3b1dc4c..886f6ab49 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -30,7 +30,7 @@
namespace Inkscape {
namespace Extension {
-ParamColor::~ParamColor(void)
+ParamColor::~ParamColor()
{
_color_changed.disconnect();
}
diff --git a/src/extension/param/color.h b/src/extension/param/color.h
index ed272ea2a..f3b44b412 100644
--- a/src/extension/param/color.h
+++ b/src/extension/param/color.h
@@ -38,7 +38,7 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- ~ParamColor(void) override;
+ ~ParamColor() override;
/** Returns \c _value, with a \i const to protect it. */
guint32 get( SPDocument const * /*doc*/, Inkscape::XML::Node const * /*node*/ ) const { return _color.value(); }
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index c5ee5f6b9..df4b22d0c 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -101,7 +101,7 @@ ParamComboBox::ParamComboBox(const gchar * name,
}
}
-ParamComboBox::~ParamComboBox (void)
+ParamComboBox::~ParamComboBox ()
{
//destroy choice strings
for (auto i:choices) {
@@ -171,7 +171,7 @@ bool ParamComboBox::contains(const gchar * text, SPDocument const * /*doc*/, Ink
}
void
-ParamComboBox::changed (void) {
+ParamComboBox::changed () {
}
@@ -200,7 +200,7 @@ public:
Gtk::ComboBoxText(), _pref(pref), _doc(doc), _node(node), _changeSignal(changeSignal) {
this->signal_changed().connect(sigc::mem_fun(this, &ParamComboBoxEntry::changed));
};
- void changed (void);
+ void changed ();
};
/**
@@ -210,7 +210,7 @@ public:
* from the text box and putting it in the parameter.
*/
void
-ParamComboBoxEntry::changed (void)
+ParamComboBoxEntry::changed ()
{
Glib::ustring data = this->get_active_text();
_pref->set(data.c_str(), _doc, _node);
diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h
index b60eacf0f..0c80bdcf6 100644
--- a/src/extension/param/enum.h
+++ b/src/extension/param/enum.h
@@ -60,7 +60,7 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- ~ParamComboBox(void) override;
+ ~ParamComboBox() override;
Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
@@ -78,7 +78,7 @@ public:
*/
bool contains(const gchar * text, SPDocument const * /*doc*/, Inkscape::XML::Node const * /*node*/) const;
- void changed (void);
+ void changed ();
}; /* class ParamComboBox */
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index aaf871068..bde96339a 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -141,7 +141,7 @@ public:
return;
};
- void val_changed (void);
+ void val_changed ();
}; /* class ParamFloatAdjustment */
/**
@@ -150,7 +150,7 @@ public:
* This function just grabs the value from the adjustment and writes
* it to the parameter. Very simple, but yet beautiful.
*/
-void ParamFloatAdjustment::val_changed(void)
+void ParamFloatAdjustment::val_changed()
{
//std::cout << "Value Changed to: " << this->get_value() << std::endl;
_pref->set(this->get_value(), _doc, _node);
diff --git a/src/extension/param/float.h b/src/extension/param/float.h
index c7ac11c6f..ce92d8c28 100644
--- a/src/extension/param/float.h
+++ b/src/extension/param/float.h
@@ -43,11 +43,11 @@ public:
float set (float in, SPDocument * doc, Inkscape::XML::Node * node);
- float max (void) { return _max; }
+ float max () { return _max; }
- float min (void) { return _min; }
+ float min () { return _min; }
- float precision (void) { return _precision; }
+ float precision () { return _precision; }
Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index 1c946d8b8..2e0792081 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -122,7 +122,7 @@ public:
this->signal_value_changed().connect(sigc::mem_fun(this, &ParamIntAdjustment::val_changed));
};
- void val_changed (void);
+ void val_changed ();
}; /* class ParamIntAdjustment */
/**
@@ -131,7 +131,7 @@ public:
* This function just grabs the value from the adjustment and writes
* it to the parameter. Very simple, but yet beautiful.
*/
-void ParamIntAdjustment::val_changed(void)
+void ParamIntAdjustment::val_changed()
{
//std::cout << "Value Changed to: " << this->get_value() << std::endl;
_pref->set((int)this->get_value(), _doc, _node);
diff --git a/src/extension/param/int.h b/src/extension/param/int.h
index 5b3cfb364..e6f4ac3db 100644
--- a/src/extension/param/int.h
+++ b/src/extension/param/int.h
@@ -43,9 +43,9 @@ public:
int set (int in, SPDocument * doc, Inkscape::XML::Node * node);
- int max (void) { return _max; }
+ int max () { return _max; }
- int min (void) { return _min; }
+ int min () { return _min; }
Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index d00693db4..f948cc937 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -70,7 +70,7 @@ ParamNotebook::ParamNotebookPage::ParamNotebookPage(const gchar * name,
}
}
-ParamNotebook::ParamNotebookPage::~ParamNotebookPage (void)
+ParamNotebook::ParamNotebookPage::~ParamNotebookPage ()
{
//destroy parameters
for (auto param:parameters) {
@@ -260,7 +260,7 @@ ParamNotebook::ParamNotebook(const gchar * name,
_value = g_strdup(defaultval); // allocate space for _value
}
-ParamNotebook::~ParamNotebook (void)
+ParamNotebook::~ParamNotebook ()
{
//destroy pages
for (auto page:pages) {
diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h
index 52577dd48..1d676615b 100644
--- a/src/extension/param/notebook.h
+++ b/src/extension/param/notebook.h
@@ -55,11 +55,11 @@ private:
bool hidden,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- ~ParamNotebookPage(void) override;
+ ~ParamNotebookPage() override;
Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
void paramString (std::list <std::string> &list);
- gchar * get_text (void) {return _text;};
+ gchar * get_text () {return _text;};
Parameter * get_param (const gchar * name) override;
}; /* class ParamNotebookPage */
@@ -75,7 +75,7 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- ~ParamNotebook(void) override;
+ ~ParamNotebook() override;
Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index d897903cb..36c6838cd 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -348,7 +348,7 @@ Parameter::Parameter (gchar const * name, gchar const * text, Inkscape::Extensio
return;
}
-Parameter::~Parameter(void)
+Parameter::~Parameter()
{
g_free(_name);
_name = nullptr;
@@ -360,7 +360,7 @@ Parameter::~Parameter(void)
_description = nullptr;
}
-gchar *Parameter::pref_name(void) const
+gchar *Parameter::pref_name() const
{
return g_strdup_printf("%s.%s", _extension->get_id(), _name);
}
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index 829085cf6..cb6c84441 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -59,7 +59,7 @@ public:
gchar const *text,
Inkscape::Extension::Extension * ext);
- virtual ~Parameter(void);
+ virtual ~Parameter();
/** Wrapper to cast to the object and use its function. */
bool get_bool(SPDocument const *doc, Inkscape::XML::Node const *node) const;
@@ -100,7 +100,7 @@ public:
guint32 set_color(guint32 in, SPDocument * doc, Inkscape::XML::Node * node);
- gchar const * name(void) const {return _name;}
+ gchar const * name() const {return _name;}
/**
* This function creates a parameter that can be used later. This
@@ -130,7 +130,7 @@ public:
virtual Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
- gchar const * get_tooltip(void) const { return _description; }
+ gchar const * get_tooltip() const { return _description; }
/** Indicates if the GUI for this parameter is hidden or not */
bool get_hidden() const { return _hidden; }
@@ -181,7 +181,7 @@ protected:
/**
* Build the name to write the parameter from the extension's ID and the name of this parameter.
*/
- gchar *pref_name(void) const;
+ gchar *pref_name() const;
Inkscape::XML::Node * find_child (Inkscape::XML::Node * adult);
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 4a479687b..428767cb0 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -116,7 +116,7 @@ ParamRadioButton::ParamRadioButton(const gchar * name,
}
}
-ParamRadioButton::~ParamRadioButton (void)
+ParamRadioButton::~ParamRadioButton ()
{
//destroy choice strings
for(auto i:choices) {
@@ -200,7 +200,7 @@ public:
void add_changesignal() {
this->signal_toggled().connect(sigc::mem_fun(this, &ParamRadioButtonWdg::changed));
};
- void changed (void);
+ void changed ();
};
/**
@@ -209,7 +209,7 @@ public:
* This function responds to the radiobutton selection changing by grabbing the value
* from the text box and putting it in the parameter.
*/
-void ParamRadioButtonWdg::changed(void)
+void ParamRadioButtonWdg::changed()
{
if (this->get_active()) {
Glib::ustring value = _pref->value_from_label(this->get_label());
@@ -238,10 +238,10 @@ public:
this->signal_changed().connect(sigc::mem_fun(this, &ComboWdg::changed));
}
~ComboWdg() override = default;
- void changed (void);
+ void changed ();
};
-void ComboWdg::changed(void)
+void ComboWdg::changed()
{
if ( _base ) {
Glib::ustring value = _base->value_from_label(get_active_text());
diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h
index b96defe10..5958be8a4 100644
--- a/src/extension/param/radiobutton.h
+++ b/src/extension/param/radiobutton.h
@@ -43,7 +43,7 @@ public:
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml,
AppearanceMode mode);
- ~ParamRadioButton(void) override;
+ ~ParamRadioButton() override;
Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 775bf62ee..59e21d77d 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -27,7 +27,7 @@ namespace Extension {
/** Free the allocated data. */
-ParamString::~ParamString(void)
+ParamString::~ParamString()
{
g_free(_value);
_value = nullptr;
@@ -136,7 +136,7 @@ public:
this->set_max_length(_pref->getMaxLength()); //Set the max length - default zero means no maximum
this->signal_changed().connect(sigc::mem_fun(this, &ParamStringEntry::changed_text));
};
- void changed_text (void);
+ void changed_text ();
};
@@ -146,7 +146,7 @@ public:
* This function responds to the box changing by grabbing the value
* from the text box and putting it in the parameter.
*/
-void ParamStringEntry::changed_text(void)
+void ParamStringEntry::changed_text()
{
Glib::ustring data = this->get_text();
_pref->set(data.c_str(), _doc, _node);
diff --git a/src/extension/param/string.h b/src/extension/param/string.h
index e911565fe..20bfd849c 100644
--- a/src/extension/param/string.h
+++ b/src/extension/param/string.h
@@ -30,7 +30,7 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- ~ParamString(void) override;
+ ~ParamString() override;
/** \brief Returns \c _value, with a \i const to protect it. */
const gchar *get(SPDocument const * /*doc*/, Inkscape::XML::Node const * /*node*/) const { return _value; }
@@ -45,7 +45,7 @@ public:
void string(std::string &string) const override;
void setMaxLength(int maxLenght) { _max_length = maxLenght; }
- int getMaxLength(void) { return _max_length; }
+ int getMaxLength() { return _max_length; }
};
diff --git a/src/extension/patheffect.h b/src/extension/patheffect.h
index a89651ae3..d9aea7f59 100644
--- a/src/extension/patheffect.h
+++ b/src/extension/patheffect.h
@@ -21,7 +21,7 @@ class PathEffect : public Extension {
public:
PathEffect (Inkscape::XML::Node * in_repr,
Implementation::Implementation * in_imp);
- ~PathEffect (void) override;
+ ~PathEffect () override;
void processPath (SPDocument * doc,
Inkscape::XML::Node * path,
Inkscape::XML::Node * def);
diff --git a/src/extension/plugins/grid2/grid.cpp b/src/extension/plugins/grid2/grid.cpp
index 3ebe85b3e..91d9e3b2b 100644
--- a/src/extension/plugins/grid2/grid.cpp
+++ b/src/extension/plugins/grid2/grid.cpp
@@ -158,7 +158,7 @@ public:
return;
};
- void val_changed (void);
+ void val_changed ();
}; /* class PrefAdjustment */
/** \brief A function to respond to the value_changed signal from the
@@ -168,7 +168,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());
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 47ed14405..94456b8d4 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -172,7 +172,7 @@ PrefDialog::run (void) {
#endif
void
-PrefDialog::preview_toggle (void) {
+PrefDialog::preview_toggle () {
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
SPDocument *document = SP_ACTIVE_DOCUMENT;
bool modified = document->isModifiedSinceSave();
@@ -198,7 +198,7 @@ PrefDialog::preview_toggle (void) {
}
void
-PrefDialog::param_change (void) {
+PrefDialog::param_change () {
if (_exEnv != nullptr) {
if (!_effect->loaded()) {
_effect->set_state(Extension::STATE_LOADED);
@@ -213,7 +213,7 @@ PrefDialog::param_change (void) {
}
bool
-PrefDialog::param_timer_expire (void) {
+PrefDialog::param_timer_expire () {
if (_exEnv != nullptr) {
_exEnv->cancel();
_exEnv->undo();
diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h
index f2ff60770..bc5742fd5 100644
--- a/src/extension/prefdialog.h
+++ b/src/extension/prefdialog.h
@@ -63,9 +63,9 @@ class PrefDialog : public Gtk::Dialog {
directly and allows for changes. */
sigc::connection _timersig;
- void preview_toggle(void);
- void param_change(void);
- bool param_timer_expire(void);
+ void preview_toggle();
+ void param_change();
+ bool param_timer_expire();
void on_response (int signal) override;
public:
diff --git a/src/extension/print.h b/src/extension/print.h
index 23a58b3fc..65719baf7 100644
--- a/src/extension/print.h
+++ b/src/extension/print.h
@@ -34,20 +34,20 @@ public: /* TODO: These are public for the short term, but this should be fixed *
public:
Print (Inkscape::XML::Node * in_repr,
Implementation::Implementation * in_imp);
- ~Print (void) override;
- bool check (void) override;
+ ~Print () override;
+ bool check () override;
/* FALSE means user hit cancel */
- unsigned int setup (void);
- unsigned int set_preview (void);
+ unsigned int setup ();
+ unsigned int set_preview ();
unsigned int begin (SPDocument *doc);
- unsigned int finish (void);
+ unsigned int finish ();
/* Rendering methods */
unsigned int bind (Geom::Affine const &transform,
float opacity);
- unsigned int release (void);
+ unsigned int release ();
unsigned int comment (const char * comment);
unsigned int fill (Geom::PathVector const &pathv,
Geom::Affine const &ctm,
@@ -70,8 +70,8 @@ public:
unsigned int text (char const *text,
Geom::Point const &p,
SPStyle const *style);
- bool textToPath (void);
- bool fontEmbedded (void);
+ bool textToPath ();
+ bool fontEmbedded ();
};
} } /* namespace Inkscape, Extension */
diff --git a/src/extension/timer.cpp b/src/extension/timer.cpp
index 5fb727409..867faf205 100644
--- a/src/extension/timer.cpp
+++ b/src/extension/timer.cpp
@@ -64,7 +64,7 @@ ExpirationTimer::ExpirationTimer (Extension * in_extension):
list that is easy, otherwise all the entries must be found, and this
one removed from the list.
*/
-ExpirationTimer::~ExpirationTimer(void)
+ExpirationTimer::~ExpirationTimer()
{
if (this != next) {
/* This will remove this entry from the circularly linked
@@ -103,7 +103,7 @@ ExpirationTimer::~ExpirationTimer(void)
set by \c timeout.
*/
void
-ExpirationTimer::touch (void)
+ExpirationTimer::touch ()
{
Glib::TimeVal current;
current.assign_current_time();
@@ -121,7 +121,7 @@ ExpirationTimer::touch (void)
Checks the time against the current time.
*/
bool
-ExpirationTimer::expired (void) const
+ExpirationTimer::expired () const
{
if (locked > 0) return false;
@@ -146,7 +146,7 @@ ExpirationTimer::expired (void) const
will then re-add the idle loop function when it runs.
*/
bool
-ExpirationTimer::idle_func (void)
+ExpirationTimer::idle_func ()
{
// std::cout << "Idle func pass: " << idle_cnt++ << " timer list: " << timer_list << std::endl;
@@ -190,7 +190,7 @@ ExpirationTimer::idle_func (void)
the one that unloads all the extensions.
*/
bool
-ExpirationTimer::timer_func (void)
+ExpirationTimer::timer_func ()
{
// std::cout << "Timer func" << std::endl;
idle_start = timer_list;
diff --git a/src/extension/timer.h b/src/extension/timer.h
index e00929013..c8a5be438 100644
--- a/src/extension/timer.h
+++ b/src/extension/timer.h
@@ -41,18 +41,18 @@ class ExpirationTimer {
/** \brief What extension this function relates to */
Extension * extension;
- bool expired(void) const;
+ bool expired() const;
- static bool idle_func (void);
- static bool timer_func (void);
+ static bool idle_func ();
+ static bool timer_func ();
public:
ExpirationTimer(Extension * in_extension);
- virtual ~ExpirationTimer(void);
+ virtual ~ExpirationTimer();
- void touch (void);
- void lock (void) { locked++; };
- void unlock (void) { locked--; };
+ void touch ();
+ void lock () { locked++; };
+ void unlock () { locked--; };
/** \brief Set the timeout variable */
static void set_timeout (long in_seconds) { timeout = in_seconds; };