diff options
202 files changed, 631 insertions, 631 deletions
diff --git a/src/color-rgba.h b/src/color-rgba.h index b5db486f7..8b439fca3 100644 --- a/src/color-rgba.h +++ b/src/color-rgba.h @@ -36,7 +36,7 @@ public: /** * Create a quick ColorRGBA with all zeros. */ - ColorRGBA(void) + ColorRGBA() { for (int i = 0; i < 4; i++) _c[i] = 0.0; diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp index d4b0ee50a..6e30506ec 100644 --- a/src/conn-avoid-ref.cpp +++ b/src/conn-avoid-ref.cpp @@ -80,7 +80,7 @@ void SPAvoidRef::setAvoid(char const *value) } } -void SPAvoidRef::handleSettingChange(void) +void SPAvoidRef::handleSettingChange() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == nullptr) { diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h index d304a95cc..f221e3fdc 100644 --- a/src/conn-avoid-ref.h +++ b/src/conn-avoid-ref.h @@ -31,9 +31,9 @@ public: Avoid::ShapeRef *shapeRef; void setAvoid(char const *value); - void handleSettingChange(void); + void handleSettingChange(); - Geom::Point getConnectionPointPos(void); + Geom::Point getConnectionPointPos(); // Returns a list of SPItems of all connectors/shapes attached to // this object. Pass one of the following for 'type': diff --git a/src/desktop.h b/src/desktop.h index 9de4c0e14..01d0b06bf 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -340,7 +340,7 @@ public: void zoom_quick(bool enable = true); /** \brief Returns whether the desktop is in quick zoom mode or not */ - bool quick_zoomed(void) { return _quick_zoom_enabled; } + bool quick_zoomed() { return _quick_zoom_enabled; } void zoom_grab_focus(); diff --git a/src/display/canvas-arena.h b/src/display/canvas-arena.h index 15bbc2ee0..27df38d8c 100644 --- a/src/display/canvas-arena.h +++ b/src/display/canvas-arena.h @@ -61,7 +61,7 @@ struct _SPCanvasArenaClass { gint (* arena_event) (SPCanvasArena *carena, Inkscape::DrawingItem *item, GdkEvent *event); }; -GType sp_canvas_arena_get_type (void); +GType sp_canvas_arena_get_type (); void sp_canvas_arena_set_pick_delta (SPCanvasArena *ca, gdouble delta); void sp_canvas_arena_set_sticky (SPCanvasArena *ca, gboolean sticky); diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h index 686eb7c5a..92d77eb47 100644 --- a/src/display/canvas-bpath.h +++ b/src/display/canvas-bpath.h @@ -90,7 +90,7 @@ struct SPCanvasBPathClass { SPCanvasItemClass parent_class; }; -GType sp_canvas_bpath_get_type (void); +GType sp_canvas_bpath_get_type (); SPCanvasItem *sp_canvas_bpath_new (SPCanvasGroup *parent, SPCurve *curve, bool phantom_line = false); diff --git a/src/display/canvas-debug.h b/src/display/canvas-debug.h index d5a166da9..784c36a8d 100644 --- a/src/display/canvas-debug.h +++ b/src/display/canvas-debug.h @@ -23,7 +23,7 @@ class SPItem; struct SPCanvasDebug : public SPCanvasItem { }; -GType sp_canvas_debug_get_type (void); +GType sp_canvas_debug_get_type (); struct SPCanvasDebugClass : public SPCanvasItemClass{}; diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h index 226acd5ef..0fe8ce378 100644 --- a/src/display/canvas-grid.h +++ b/src/display/canvas-grid.h @@ -58,7 +58,7 @@ struct GridCanvasItemClass { }; /* Standard Gtk function */ -GType grid_canvasitem_get_type (void); +GType grid_canvasitem_get_type (); diff --git a/src/display/canvas-rotate.h b/src/display/canvas-rotate.h index 8620dcced..a830e888a 100644 --- a/src/display/canvas-rotate.h +++ b/src/display/canvas-rotate.h @@ -32,7 +32,7 @@ struct SPCanvasRotate : public SPCanvasItem { void sp_canvas_rotate_start( SPCanvasRotate *canvas_rotate, cairo_surface_t *background ); -GType sp_canvas_rotate_get_type (void); +GType sp_canvas_rotate_get_type (); struct SPCanvasRotateClass : public SPCanvasItemClass{}; diff --git a/src/display/canvas-text.h b/src/display/canvas-text.h index b779d7170..b2ab1f876 100644 --- a/src/display/canvas-text.h +++ b/src/display/canvas-text.h @@ -56,7 +56,7 @@ struct SPCanvasText : public SPCanvasItem { }; struct SPCanvasTextClass : public SPCanvasItemClass{}; -GType sp_canvastext_get_type (void); +GType sp_canvastext_get_type (); SPCanvasText *sp_canvastext_new(SPCanvasGroup *parent, SPDesktop *desktop, Geom::Point pos, gchar const *text); diff --git a/src/display/gnome-canvas-acetate.h b/src/display/gnome-canvas-acetate.h index 3e1ba7661..6fae8bbd0 100644 --- a/src/display/gnome-canvas-acetate.h +++ b/src/display/gnome-canvas-acetate.h @@ -32,7 +32,7 @@ struct SPCanvasAcetateClass { SPCanvasItemClass parent_class; }; -GType sp_canvas_acetate_get_type (void); +GType sp_canvas_acetate_get_type (); #endif // SEEN_SP_CANVAS_ACETATE_H diff --git a/src/display/nr-filter-slot.cpp b/src/display/nr-filter-slot.cpp index 3b7a653dd..4f522402b 100644 --- a/src/display/nr-filter-slot.cpp +++ b/src/display/nr-filter-slot.cpp @@ -266,7 +266,7 @@ void FilterSlot::set_blurquality(int const q) { blurquality = q; } -int FilterSlot::get_blurquality(void) { +int FilterSlot::get_blurquality() { return blurquality; } diff --git a/src/display/nr-filter-slot.h b/src/display/nr-filter-slot.h index d73e9d91c..480a0ac3c 100644 --- a/src/display/nr-filter-slot.h +++ b/src/display/nr-filter-slot.h @@ -70,7 +70,7 @@ public: void set_blurquality(int const q); /** Gets the gaussian filtering quality. Affects used interpolation methods */ - int get_blurquality(void); + int get_blurquality(); /** Sets the device scale; for high DPI monitors. */ void set_device_scale(int const s); diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h index ac5ac9442..9bce6b6ab 100644 --- a/src/display/sodipodi-ctrl.h +++ b/src/display/sodipodi-ctrl.h @@ -63,7 +63,7 @@ struct SPCtrlClass : public SPCanvasItemClass{ /* Standard Gtk function */ -GType sp_ctrl_get_type (void); +GType sp_ctrl_get_type (); #endif /* !INKSCAPE_CTRL_H */ diff --git a/src/display/sp-ctrlquadr.h b/src/display/sp-ctrlquadr.h index 1dfb06456..e76f84579 100644 --- a/src/display/sp-ctrlquadr.h +++ b/src/display/sp-ctrlquadr.h @@ -21,7 +21,7 @@ struct SPCtrlQuadr; struct SPCtrlQuadrClass; -GType sp_ctrlquadr_get_type (void); +GType sp_ctrlquadr_get_type (); void sp_ctrlquadr_set_rgba32 (SPCtrlQuadr *cl, guint32 rgba); void sp_ctrlquadr_set_coords (SPCtrlQuadr *cl, const Geom::Point p1, const Geom::Point p2, const Geom::Point p3, const Geom::Point p4); diff --git a/src/document.cpp b/src/document.cpp index 825b826c5..658bc93c9 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -975,7 +975,7 @@ SPDocument::connectReconstructionStart(SPDocument::ReconstructionStart::slot_typ } void -SPDocument::emitReconstructionStart(void) +SPDocument::emitReconstructionStart() { // printf("Starting Reconstruction\n"); priv->_reconstruction_start_signal.emit(); @@ -989,7 +989,7 @@ SPDocument::connectReconstructionFinish(SPDocument::ReconstructionFinish::slot_t } void -SPDocument::emitReconstructionFinish(void) +SPDocument::emitReconstructionFinish() { // printf("Finishing Reconstruction\n"); priv->_reconstruction_finish_signal.emit(); diff --git a/src/document.h b/src/document.h index 251aa8619..142f6a2e3 100644 --- a/src/document.h +++ b/src/document.h @@ -240,8 +240,8 @@ private: public: sigc::connection connectReconstructionStart(ReconstructionStart::slot_type slot); sigc::connection connectReconstructionFinish(ReconstructionFinish::slot_type slot); - void emitReconstructionStart(void); - void emitReconstructionFinish(void); + void emitReconstructionStart(); + void emitReconstructionFinish(); unsigned long serial() const; void reset_key(void *dummy); 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; }; diff --git a/src/file.h b/src/file.h index c86f065d3..c24ecdf6f 100644 --- a/src/file.h +++ b/src/file.h @@ -45,7 +45,7 @@ Glib::ustring sp_file_default_template_uri(); * Return value is a pointer to the newly created desktop. */ SPDesktop* sp_file_new (const std::string &templ); -SPDesktop* sp_file_new_default (void); +SPDesktop* sp_file_new_default (); /*###################### ## D E L E T E @@ -54,7 +54,7 @@ SPDesktop* sp_file_new_default (void); /** * Close the document/view */ -void sp_file_exit (void); +void sp_file_exit (); /*###################### ## O P E N diff --git a/src/inkscape.cpp b/src/inkscape.cpp index a29b2fad5..58d60d3b2 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -1171,7 +1171,7 @@ Application::sole_desktop_for_document(SPDesktop const &desktop) { } Inkscape::UI::Tools::ToolBase * -Application::active_event_context (void) +Application::active_event_context () { if (SP_ACTIVE_DESKTOP) { return SP_ACTIVE_DESKTOP->getEventContext(); diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 99717bb77..0c2c55f75 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -229,13 +229,13 @@ static void FactorySubstituteFunc(FcPattern *pattern,gpointer /*data*/) font_factory *font_factory::lUsine = nullptr; -font_factory *font_factory::Default(void) +font_factory *font_factory::Default() { if ( lUsine == nullptr ) lUsine = new font_factory; return lUsine; } -font_factory::font_factory(void) : +font_factory::font_factory() : nbEnt(0), // Note: this "ents" cache only keeps fonts from being unreffed, does not speed up access maxEnt(32), ents(static_cast<font_entry*>(g_malloc(maxEnt*sizeof(font_entry)))), @@ -266,7 +266,7 @@ font_factory::font_factory(void) : } -font_factory::~font_factory(void) +font_factory::~font_factory() { for (int i = 0;i < nbEnt;i++) ents[i].f->Unref(); if ( ents ) g_free(ents); diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 619e78929..733eb4dd5 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -102,7 +102,7 @@ static int ft2_cubic_to(FT_Vector const *control1, FT_Vector const *control2, FT * */ -font_instance::font_instance(void) : +font_instance::font_instance() : pFont(nullptr), descr(nullptr), refCount(0), @@ -129,7 +129,7 @@ font_instance::font_instance(void) : _baselines[ SP_CSS_BASELINE_TEXT_AFTER_EDGE ] = -_descent; } -font_instance::~font_instance(void) +font_instance::~font_instance() { if ( parent ) { parent->UnrefFace(this); @@ -164,7 +164,7 @@ font_instance::~font_instance(void) maxGlyph = 0; } -void font_instance::Ref(void) +void font_instance::Ref() { refCount++; //char *tc=pango_font_description_to_string(descr); @@ -172,7 +172,7 @@ void font_instance::Ref(void) //free(tc); } -void font_instance::Unref(void) +void font_instance::Unref() { refCount--; //char *tc=pango_font_description_to_string(descr); @@ -320,7 +320,7 @@ void font_instance::InstallFace(PangoFont* iFace) } } -bool font_instance::IsOutlineFont(void) +bool font_instance::IsOutlineFont() { if ( pFont == nullptr ) { return false; diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h index 5cb26aec2..725d5d2d2 100644 --- a/src/libnrtype/font-instance.h +++ b/src/libnrtype/font-instance.h @@ -45,13 +45,13 @@ public: // Maps for font variations. std::map<Glib::ustring, OTVarAxis> openTypeVarAxes; // Axes with ranges - font_instance(void); - virtual ~font_instance(void); + font_instance(); + virtual ~font_instance(); - void Ref(void); - void Unref(void); + void Ref(); + void Unref(); - bool IsOutlineFont(void); // utility + bool IsOutlineFont(); // utility void InstallFace(PangoFont* iFace); // utility; should reset the pFont field if loading failed // in case the PangoFont is a bitmap font, for example. that way, the calling function // will be able to check the validity of the font before installing it in loadedFaces diff --git a/src/livarot/AlphaLigne.cpp b/src/livarot/AlphaLigne.cpp index 2c969107a..e2265ec8c 100644 --- a/src/livarot/AlphaLigne.cpp +++ b/src/livarot/AlphaLigne.cpp @@ -26,13 +26,13 @@ AlphaLigne::AlphaLigne(int iMin,int iMax) after.x=max+1; after.delta=0; } -AlphaLigne::~AlphaLigne(void) +AlphaLigne::~AlphaLigne() { g_free(steps); steps=nullptr; nbStep=maxStep=0; } -void AlphaLigne::Affiche(void) +void AlphaLigne::Affiche() { printf("%i steps\n",nbStep); for (int i=0;i<nbStep;i++) { @@ -42,7 +42,7 @@ void AlphaLigne::Affiche(void) } -void AlphaLigne::Reset(void) +void AlphaLigne::Reset() { // reset to empty line // doesn't deallocate the steps array, to minimize memory operations @@ -243,7 +243,7 @@ int AlphaLigne::AddBord(float spos,float sval,float epos,float eval return 0; } -void AlphaLigne::Flatten(void) +void AlphaLigne::Flatten() { // just sort if ( nbStep > 0 ) qsort(steps,nbStep,sizeof(alpha_step),CmpStep); diff --git a/src/livarot/AlphaLigne.h b/src/livarot/AlphaLigne.h index 51359705b..fe3dc69b0 100644 --- a/src/livarot/AlphaLigne.h +++ b/src/livarot/AlphaLigne.h @@ -45,10 +45,10 @@ public: // iMin and iMax are the bounds of the visible portion of the line AlphaLigne(int iMin,int iMax); - virtual ~AlphaLigne(void); + virtual ~AlphaLigne(); // empties the line - void Reset(void); + void Reset(); // add some coverage. // pente is (eval-sval)/(epos-spos), because you can compute it once per edge, and thus spare the @@ -58,10 +58,10 @@ public: int AddBord(float spos,float sval,float epos,float eval); // sorts the steps in increasing order. needed before you raster the line - void Flatten(void); + void Flatten(); // debug dump of the steps - void Affiche(void); + void Affiche(); // private void AddRun(int st,float pente); diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp index e868d6374..53ab06c1d 100644 --- a/src/livarot/BitLigne.cpp +++ b/src/livarot/BitLigne.cpp @@ -39,13 +39,13 @@ BitLigne::BitLigne(int ist,int ien,float iScale) curMin=en; curMax=st; } -BitLigne::~BitLigne(void) +BitLigne::~BitLigne() { g_free(fullB); g_free(partB); } -void BitLigne::Reset(void) +void BitLigne::Reset() { curMin=en; curMax=st+1; @@ -167,7 +167,7 @@ int BitLigne::AddBord(float spos,float epos,bool full) } -void BitLigne::Affiche(void) +void BitLigne::Affiche() { for (int i=0;i<nbInt;i++) printf(" %.8x",fullB[i]); printf("\n"); diff --git a/src/livarot/BitLigne.h b/src/livarot/BitLigne.h index e496a7b4b..86505c0a7 100644 --- a/src/livarot/BitLigne.h +++ b/src/livarot/BitLigne.h @@ -40,10 +40,10 @@ public: float scale,invScale; BitLigne(int ist,int ien,float iScale=0.25); // default scale is 1/4 for 4x4 supersampling - virtual ~BitLigne(void); + virtual ~BitLigne(); // reset the line to full empty - void Reset(void); + void Reset(); // put coverage from spos to epos (in canvas coordinates) // full==true means that the bits from (fractional) position spos to epos are entirely covered @@ -52,7 +52,7 @@ public: int AddBord(float spos,float epos,bool full); // debug dump - void Affiche(void); + void Affiche(); }; diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp index 87af8423d..55ed6f08b 100644 --- a/src/livarot/Shape.cpp +++ b/src/livarot/Shape.cpp @@ -48,14 +48,14 @@ Shape::Shape() type = shape_polygon; } -Shape::~Shape (void) +Shape::~Shape () { maxPt = 0; maxAr = 0; free(qrsData); } -void Shape::Affiche(void) +void Shape::Affiche() { printf("sh=%p nbPt=%i nbAr=%i\n", this, static_cast<int>(_pts.size()), static_cast<int>(_aretes.size())); // localizing ok for (unsigned int i=0; i<_pts.size(); i++) { @@ -533,7 +533,7 @@ Shape::SwapPoints (int a, int b, int c) } void -Shape::SortPoints (void) +Shape::SortPoints () { if (_need_points_sorting && hasPoints()) SortPoints (0, numberOfPoints() - 1); @@ -541,7 +541,7 @@ Shape::SortPoints (void) } void -Shape::SortPointsRounded (void) +Shape::SortPointsRounded () { if (hasPoints()) SortPointsRounded (0, numberOfPoints() - 1); @@ -1479,7 +1479,7 @@ Shape::SwapEdges (int a, int b, int c) } void -Shape::SortEdges (void) +Shape::SortEdges () { if (_need_edges_sorting == false) { return; diff --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp index 53e9d3137..e5ebb9099 100644 --- a/src/livarot/ShapeSweep.cpp +++ b/src/livarot/ShapeSweep.cpp @@ -43,7 +43,7 @@ */ void -Shape::ResetSweep (void) +Shape::ResetSweep () { MakePointData (true); MakeEdgeData (true); @@ -51,7 +51,7 @@ Shape::ResetSweep (void) } void -Shape::CleanupSweep (void) +Shape::CleanupSweep () { MakePointData (false); MakeEdgeData (false); @@ -59,7 +59,7 @@ Shape::CleanupSweep (void) } void -Shape::ForceToPolygon (void) +Shape::ForceToPolygon () { type = shape_polygon; } @@ -3009,7 +3009,7 @@ void Shape::AddChgt(int lastPointNo, int lastChgtPt, Shape * &shapeHead, // is this a debug function? It's calling localized "printf" ... void -Shape::Validate (void) +Shape::Validate () { for (int i = 0; i < numberOfPoints(); i++) { diff --git a/src/livarot/sweep-event.h b/src/livarot/sweep-event.h index 5df952731..d2e8909ee 100644 --- a/src/livarot/sweep-event.h +++ b/src/livarot/sweep-event.h @@ -27,7 +27,7 @@ public: double itl, double itr); /// Void a SweepEvent structure. - void MakeDelete (void); + void MakeDelete (); }; diff --git a/src/live_effects/lpe-clone-original.cpp b/src/live_effects/lpe-clone-original.cpp index f491c7ad7..54b7dd090 100644 --- a/src/live_effects/lpe-clone-original.cpp +++ b/src/live_effects/lpe-clone-original.cpp @@ -241,7 +241,7 @@ LPECloneOriginal::start_listening() } void -LPECloneOriginal::quit_listening(void) +LPECloneOriginal::quit_listening() { modified_connection.disconnect(); listening = false; diff --git a/src/live_effects/lpe-embrodery-stitch-ordering.cpp b/src/live_effects/lpe-embrodery-stitch-ordering.cpp index 7cd69e1b6..6d788870f 100644 --- a/src/live_effects/lpe-embrodery-stitch-ordering.cpp +++ b/src/live_effects/lpe-embrodery-stitch-ordering.cpp @@ -294,7 +294,7 @@ void OrderingPoint::FindNearest2(const std::vector<OrderingInfoEx *> &infos) // Check if "this" is among the nearest of its nearest -void OrderingPoint::EnforceMutual(void) +void OrderingPoint::EnforceMutual() { if (nearest[0] && !(this == nearest[0]->nearest[0] || this == nearest[0]->nearest[1])) { nearest[0] = nullptr; @@ -334,7 +334,7 @@ void OrderingPoint::EnforceSymmetric(const OrderingPoint &other) } } -void OrderingPoint::Dump(void) +void OrderingPoint::Dump() { Coord dist0 = nearest[0] ? distance(point, nearest[0]->point) : -1.0; Coord dist1 = nearest[1] ? distance(point, nearest[1]->point) : -1.0; @@ -400,7 +400,7 @@ bool OrderingGroupNeighbor::Compare(const OrderingGroupNeighbor &a, const Orderi // Find the nearest unused neighbor point -OrderingGroupNeighbor *OrderingGroupPoint::FindNearestUnused(void) +OrderingGroupNeighbor *OrderingGroupPoint::FindNearestUnused() { for (std::vector<OrderingGroupNeighbor>::iterator it = nearest.begin(); it != nearest.end(); ++it) { if (!it->point->used) { @@ -420,14 +420,14 @@ OrderingGroupNeighbor *OrderingGroupPoint::FindNearestUnused(void) // Return the other end in the group of the point -OrderingGroupPoint *OrderingGroupPoint::GetOtherEndGroup(void) +OrderingGroupPoint *OrderingGroupPoint::GetOtherEndGroup() { return group->endpoints[ indexInGroup ^ 1 ]; } // Return the alternate point (if one exists), 0 otherwise -OrderingGroupPoint *OrderingGroupPoint::GetAltPointGroup(void) +OrderingGroupPoint *OrderingGroupPoint::GetAltPointGroup() { if (group->nEndPoints < 4) { return nullptr; @@ -440,7 +440,7 @@ OrderingGroupPoint *OrderingGroupPoint::GetAltPointGroup(void) // Sets the rev flags in the group assuming that the group starts with this point -void OrderingGroupPoint::SetRevInGroup(void) +void OrderingGroupPoint::SetRevInGroup() { // If this is not a front point, the item list needs to be reversed group->revItemList = !front; @@ -452,7 +452,7 @@ void OrderingGroupPoint::SetRevInGroup(void) // Mark an end point as used and also mark the two other alternating points as used // Returns the used point -void OrderingGroupPoint::UsePoint(void) +void OrderingGroupPoint::UsePoint() { group->UsePoint(indexInGroup); } @@ -460,13 +460,13 @@ void OrderingGroupPoint::UsePoint(void) // Mark an end point as unused and possibly also mark the two other alternating points as unused // Returns the used point -void OrderingGroupPoint::UnusePoint(void) +void OrderingGroupPoint::UnusePoint() { group->UnusePoint(indexInGroup); } // Return the other end in the connection -OrderingGroupPoint *OrderingGroupPoint::GetOtherEndConnection(void) +OrderingGroupPoint *OrderingGroupPoint::GetOtherEndConnection() { assert(connection); assert(connection->points[ indexInConnection ] == this); @@ -478,7 +478,7 @@ OrderingGroupPoint *OrderingGroupPoint::GetOtherEndConnection(void) // Set the end points of a group from the items -void OrderingGroup::SetEndpoints(void) +void OrderingGroup::SetEndpoints() { assert(items.size() >= 1); diff --git a/src/live_effects/lpe-embrodery-stitch-ordering.h b/src/live_effects/lpe-embrodery-stitch-ordering.h index 5f64462f7..c5c71e50c 100644 --- a/src/live_effects/lpe-embrodery-stitch-ordering.h +++ b/src/live_effects/lpe-embrodery-stitch-ordering.h @@ -71,11 +71,11 @@ struct OrderingPoint { // Find 2 nearest points to given point void FindNearest2(const std::vector<OrderingInfoEx *> &infos); // Check if "this" is among the nearest of its nearest - void EnforceMutual(void); + void EnforceMutual(); // Check if the subpath indices of this and other are the same, otherwise zero both nearest void EnforceSymmetric(const OrderingPoint &other); // Dump point information - void Dump(void); + void Dump(); Geom::Point point; OrderingInfoEx *infoex; @@ -146,21 +146,21 @@ struct OrderingGroupPoint { } // Find the nearest unused neighbor point - OrderingGroupNeighbor *FindNearestUnused(void); + OrderingGroupNeighbor *FindNearestUnused(); // Return the other end in the group of the point - OrderingGroupPoint *GetOtherEndGroup(void); + OrderingGroupPoint *GetOtherEndGroup(); // Return the alternate point (if one exists), 0 otherwise - OrderingGroupPoint *GetAltPointGroup(void); + OrderingGroupPoint *GetAltPointGroup(); // Sets the rev flags in the group assuming that the group starts with this point - void SetRevInGroup(void); + void SetRevInGroup(); // Mark an end point as used and also mark the two other alternating points as used // Returns the used point - void UsePoint(void); + void UsePoint(); // Mark an end point as unused and possibly also mark the two other alternating points as unused // Returns the used point - void UnusePoint(void); + void UnusePoint(); // Return the other end in the connection - OrderingGroupPoint *GetOtherEndConnection(void); + OrderingGroupPoint *GetOtherEndConnection(); // The coordinates of the point Geom::Point point; @@ -239,7 +239,7 @@ struct OrderingGroup { } // Set the endpoints of a group from the items - void SetEndpoints(void); + void SetEndpoints(); // Add all points from another group as neighbors void AddNeighbors(OrderingGroup *nghb); // Mark an end point as used and also mark the two other alternating points as used diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp index e430c12f1..f8d4e08f5 100644 --- a/src/live_effects/lpeobject-reference.cpp +++ b/src/live_effects/lpeobject-reference.cpp @@ -33,7 +33,7 @@ LPEObjectReference::LPEObjectReference(SPObject* i_owner) : URIReference(i_owner user_unlink = nullptr; } -LPEObjectReference::~LPEObjectReference(void) +LPEObjectReference::~LPEObjectReference() { _changed_connection.disconnect(); // to do before unlinking @@ -76,7 +76,7 @@ LPEObjectReference::link(const char *to) } void -LPEObjectReference::unlink(void) +LPEObjectReference::unlink() { if (lpeobject_href) { g_free(lpeobject_href); @@ -98,7 +98,7 @@ LPEObjectReference::start_listening(LivePathEffectObject* to) } void -LPEObjectReference::quit_listening(void) +LPEObjectReference::quit_listening() { _modified_connection.disconnect(); _delete_connection.disconnect(); diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h index 328fa9eaf..a86c10eee 100644 --- a/src/live_effects/lpeobject-reference.h +++ b/src/live_effects/lpeobject-reference.h @@ -43,9 +43,9 @@ public: sigc::connection _changed_connection; void link(const char* to); - void unlink(void); + void unlink(); void start_listening(LivePathEffectObject* to); - void quit_listening(void); + void quit_listening(); void (*user_unlink) (LPEObjectReference *me, SPObject *user); diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp index c22a3df33..8a8b12307 100644 --- a/src/live_effects/parameter/item.cpp +++ b/src/live_effects/parameter/item.cpp @@ -166,7 +166,7 @@ ItemParam::start_listening(SPObject * to) } void -ItemParam::quit_listening(void) +ItemParam::quit_listening() { linked_modified_connection.disconnect(); linked_delete_connection.disconnect(); diff --git a/src/live_effects/parameter/item.h b/src/live_effects/parameter/item.h index 1c285fcff..315f7618d 100644 --- a/src/live_effects/parameter/item.h +++ b/src/live_effects/parameter/item.h @@ -55,7 +55,7 @@ protected: void ref_changed(SPObject *old_ref, SPObject *new_ref); void remove_link(); void start_listening(SPObject * to); - void quit_listening(void); + void quit_listening(); void linked_delete(SPObject *deleted); void linked_modified(SPObject *linked_obj, guint flags); void linked_transformed(Geom::Affine const *rel_transf, SPItem *moved_item); diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp index d87bd4d1b..1bdd31a0f 100644 --- a/src/live_effects/parameter/parameter.cpp +++ b/src/live_effects/parameter/parameter.cpp @@ -45,7 +45,7 @@ Parameter::param_write_to_repr(const char * svgd) param_effect->getRepr()->setAttribute(param_key.c_str(), svgd); } -void Parameter::write_to_SVG(void) +void Parameter::write_to_SVG() { gchar * str = param_getSVGValue(); param_write_to_repr(str); diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index 649d3a1ef..52e1b62a6 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -410,7 +410,7 @@ PathParam::start_listening(SPObject * to) } void -PathParam::quit_listening(void) +PathParam::quit_listening() { linked_modified_connection.disconnect(); linked_delete_connection.disconnect(); diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h index 5993b54e6..99c073997 100644 --- a/src/live_effects/parameter/path.h +++ b/src/live_effects/parameter/path.h @@ -77,7 +77,7 @@ protected: void ref_changed(SPObject *old_ref, SPObject *new_ref); void remove_link(); void start_listening(SPObject * to); - void quit_listening(void); + void quit_listening(); void linked_delete(SPObject *deleted); void linked_modified(SPObject *linked_obj, guint flags); void linked_transformed(Geom::Affine const *rel_transf, SPItem *moved_item); diff --git a/src/main-cmdlineact.cpp b/src/main-cmdlineact.cpp index 6b97616dd..fac5c5563 100644 --- a/src/main-cmdlineact.cpp +++ b/src/main-cmdlineact.cpp @@ -99,7 +99,7 @@ CmdLineAction::doList (ActionContext const & context) { } bool -CmdLineAction::idle (void) { +CmdLineAction::idle () { std::list<SPDesktop *> desktops; INKSCAPE.get_all_desktops(desktops); diff --git a/src/main-cmdlineact.h b/src/main-cmdlineact.h index f50e70e5a..b8151909d 100644 --- a/src/main-cmdlineact.h +++ b/src/main-cmdlineact.h @@ -37,7 +37,7 @@ public: /** Return true if any actions were performed */ static bool doList (ActionContext const & context); - static bool idle (void); + static bool idle (); }; } // Inkscape diff --git a/src/object/persp3d-reference.cpp b/src/object/persp3d-reference.cpp index c1e6526bb..1ed45cafb 100644 --- a/src/object/persp3d-reference.cpp +++ b/src/object/persp3d-reference.cpp @@ -23,7 +23,7 @@ Persp3DReference::Persp3DReference(SPObject* i_owner) : URIReference(i_owner) _changed_connection = changedSignal().connect(sigc::bind(sigc::ptr_fun(persp3dreference_href_changed), this)); // listening to myself, this should be virtual instead } -Persp3DReference::~Persp3DReference(void) +Persp3DReference::~Persp3DReference() { _changed_connection.disconnect(); // to do before unlinking @@ -41,7 +41,7 @@ Persp3DReference::_acceptObject(SPObject *obj) const } void -Persp3DReference::unlink(void) +Persp3DReference::unlink() { g_free(persp_href); persp_href = nullptr; @@ -61,7 +61,7 @@ Persp3DReference::start_listening(Persp3D* to) } void -Persp3DReference::quit_listening(void) +Persp3DReference::quit_listening() { if ( persp == nullptr ) { return; diff --git a/src/object/persp3d-reference.h b/src/object/persp3d-reference.h index 808d50e4d..ab6eca062 100644 --- a/src/object/persp3d-reference.h +++ b/src/object/persp3d-reference.h @@ -45,9 +45,9 @@ public: sigc::connection _delete_connection; void link(char* to); - void unlink(void); + void unlink(); void start_listening(Persp3D* to); - void quit_listening(void); + void quit_listening(); protected: bool _acceptObject(SPObject *obj) const override; diff --git a/src/object/sp-flowregion.cpp b/src/object/sp-flowregion.cpp index 3e7732e1a..9829cf828 100644 --- a/src/object/sp-flowregion.cpp +++ b/src/object/sp-flowregion.cpp @@ -89,7 +89,7 @@ void SPFlowregion::update(SPCtx *ctx, unsigned int flags) { this->UpdateComputed(); } -void SPFlowregion::UpdateComputed(void) +void SPFlowregion::UpdateComputed() { for (std::vector<Shape*>::iterator it = computed.begin() ; it != computed.end() ; ++it) { delete *it; @@ -236,7 +236,7 @@ void SPFlowregionExclude::update(SPCtx *ctx, unsigned int flags) { } -void SPFlowregionExclude::UpdateComputed(void) +void SPFlowregionExclude::UpdateComputed() { if (computed) { delete computed; diff --git a/src/object/sp-flowregion.h b/src/object/sp-flowregion.h index 58c67c8d1..a8201d020 100644 --- a/src/object/sp-flowregion.h +++ b/src/object/sp-flowregion.h @@ -24,7 +24,7 @@ public: std::vector<Shape*> computed; - void UpdateComputed(void); + void UpdateComputed(); void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node *child) override; @@ -41,7 +41,7 @@ public: Shape *computed; - void UpdateComputed(void); + void UpdateComputed(); void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref) override; void remove_child(Inkscape::XML::Node *child) override; diff --git a/src/object/sp-guide.h b/src/object/sp-guide.h index 0d9b8afc2..3e8d8550d 100644 --- a/src/object/sp-guide.h +++ b/src/object/sp-guide.h @@ -21,7 +21,7 @@ typedef unsigned int guint32; extern "C" { - typedef void (*GCallback) (void); + typedef void (*GCallback) (); } class SPDesktop; diff --git a/src/object/sp-tag-use-reference.cpp b/src/object/sp-tag-use-reference.cpp index c4de4a068..cee9f2127 100644 --- a/src/object/sp-tag-use-reference.cpp +++ b/src/object/sp-tag-use-reference.cpp @@ -45,7 +45,7 @@ SPTagUsePath::SPTagUsePath(SPObject* i_owner):SPTagUseReference(i_owner) user_unlink = nullptr; } -SPTagUsePath::~SPTagUsePath(void) +SPTagUsePath::~SPTagUsePath() { delete originalPath; originalPath = nullptr; @@ -80,7 +80,7 @@ SPTagUsePath::link(char *to) } void -SPTagUsePath::unlink(void) +SPTagUsePath::unlink() { g_free(sourceHref); sourceHref = nullptr; @@ -99,7 +99,7 @@ SPTagUsePath::start_listening(SPObject* to) } void -SPTagUsePath::quit_listening(void) +SPTagUsePath::quit_listening() { if ( sourceObject == nullptr ) { return; diff --git a/src/object/sp-tag-use-reference.h b/src/object/sp-tag-use-reference.h index 50035ab70..a0522fa97 100644 --- a/src/object/sp-tag-use-reference.h +++ b/src/object/sp-tag-use-reference.h @@ -54,13 +54,13 @@ public: sigc::connection _changed_connection; SPTagUsePath(SPObject* i_owner); - ~SPTagUsePath(void) override; + ~SPTagUsePath() override; void link(char* to); - void unlink(void); + void unlink(); void start_listening(SPObject* to); - void quit_listening(void); - void refresh_source(void); + void quit_listening(); + void refresh_source(); void (*user_unlink) (SPObject *user); }; diff --git a/src/object/sp-tref.cpp b/src/object/sp-tref.cpp index ef81a1128..e7941145f 100644 --- a/src/object/sp-tref.cpp +++ b/src/object/sp-tref.cpp @@ -280,7 +280,7 @@ sp_tref_delete_self(SPObject */*deleted*/, SPTRef *self) /** * Return the object referred to via the URI reference */ -SPObject * SPTRef::getObjectReferredTo(void) +SPObject * SPTRef::getObjectReferredTo() { SPObject *referredObject = nullptr; diff --git a/src/object/sp-use-reference.cpp b/src/object/sp-use-reference.cpp index d5fdfc01a..67cf5c778 100644 --- a/src/object/sp-use-reference.cpp +++ b/src/object/sp-use-reference.cpp @@ -46,7 +46,7 @@ SPUsePath::SPUsePath(SPObject* i_owner):SPUseReference(i_owner) user_unlink = nullptr; } -SPUsePath::~SPUsePath(void) +SPUsePath::~SPUsePath() { if (originalPath != nullptr) { originalPath->unref(); @@ -82,7 +82,7 @@ SPUsePath::link(char *to) } void -SPUsePath::unlink(void) +SPUsePath::unlink() { g_free(sourceHref); sourceHref = nullptr; @@ -103,7 +103,7 @@ SPUsePath::start_listening(SPObject* to) } void -SPUsePath::quit_listening(void) +SPUsePath::quit_listening() { if ( sourceObject == nullptr ) { return; diff --git a/src/object/sp-use-reference.h b/src/object/sp-use-reference.h index 3dc1ae32b..be82bddc2 100644 --- a/src/object/sp-use-reference.h +++ b/src/object/sp-use-reference.h @@ -53,13 +53,13 @@ public: sigc::connection _transformed_connection; SPUsePath(SPObject* i_owner); - ~SPUsePath(void) override; + ~SPUsePath() override; void link(char* to); - void unlink(void); + void unlink(); void start_listening(SPObject* to); - void quit_listening(void); - void refresh_source(void); + void quit_listening(); + void refresh_source(); void (*user_unlink) (SPObject *user); }; diff --git a/src/svg-view-widget.h b/src/svg-view-widget.h index 34c70f396..6b187a895 100644 --- a/src/svg-view-widget.h +++ b/src/svg-view-widget.h @@ -25,7 +25,7 @@ class SPDocument; /** * Registers SPSVGSPViewWidget class with Gtk and returns its type number. */ -GType sp_svg_view_widget_get_type(void); +GType sp_svg_view_widget_get_type(); /** * Constructs new SPSVGSPViewWidget object and returns pointer to it. diff --git a/src/text-chemistry.h b/src/text-chemistry.h index c983f005f..a014394af 100644 --- a/src/text-chemistry.h +++ b/src/text-chemistry.h @@ -14,9 +14,9 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -void text_put_on_path(void); -void text_remove_from_path(void); -void text_remove_all_kerns(void); +void text_put_on_path(); +void text_remove_from_path(); +void text_remove_all_kerns(); void text_flow_into_shape(); void text_unflow(); void flowtext_to_text(); diff --git a/src/ui/contextmenu.cpp b/src/ui/contextmenu.cpp index 7a6c4e7cf..361a68f93 100644 --- a/src/ui/contextmenu.cpp +++ b/src/ui/contextmenu.cpp @@ -167,7 +167,7 @@ ContextMenu::ContextMenu(SPDesktop *desktop, SPItem *item) : ContextMenu::~ContextMenu(void) = default; -Gtk::SeparatorMenuItem* ContextMenu::AddSeparator(void) +Gtk::SeparatorMenuItem* ContextMenu::AddSeparator() { Gtk::SeparatorMenuItem* sep = Gtk::manage(new Gtk::SeparatorMenuItem()); sep->show(); @@ -181,12 +181,12 @@ void ContextMenu::EnterGroup(Gtk::MenuItem* mi) _desktop->selection->clear(); } -void ContextMenu::LeaveGroup(void) +void ContextMenu::LeaveGroup() { _desktop->setCurrentLayer(_desktop->currentLayer()->parent); } -void ContextMenu::LockSelected(void) +void ContextMenu::LockSelected() { auto itemlist = _desktop->selection->items(); for(auto i=itemlist.begin();i!=itemlist.end(); ++i) { @@ -194,7 +194,7 @@ void ContextMenu::LockSelected(void) } } -void ContextMenu::HideSelected(void) +void ContextMenu::HideSelected() { auto itemlist =_desktop->selection->items(); for(auto i=itemlist.begin();i!=itemlist.end(); ++i) { @@ -288,7 +288,7 @@ void ContextMenu::AppendItemFromVerb(Inkscape::Verb *verb) } } -void ContextMenu::MakeObjectMenu(void) +void ContextMenu::MakeObjectMenu() { if (SP_IS_ITEM(_object)) { MakeItemMenu(); @@ -315,7 +315,7 @@ void ContextMenu::MakeObjectMenu(void) } } -void ContextMenu::MakeItemMenu (void) +void ContextMenu::MakeItemMenu () { Gtk::MenuItem* mi; @@ -480,50 +480,50 @@ void ContextMenu::MakeItemMenu (void) append(*mi); } -void ContextMenu::SelectSameFillStroke(void) +void ContextMenu::SelectSameFillStroke() { sp_select_same_fill_stroke_style(_desktop, true, true, true); } -void ContextMenu::SelectSameFillColor(void) +void ContextMenu::SelectSameFillColor() { sp_select_same_fill_stroke_style(_desktop, true, false, false); } -void ContextMenu::SelectSameStrokeColor(void) +void ContextMenu::SelectSameStrokeColor() { sp_select_same_fill_stroke_style(_desktop, false, true, false); } -void ContextMenu::SelectSameStrokeStyle(void) +void ContextMenu::SelectSameStrokeStyle() { sp_select_same_fill_stroke_style(_desktop, false, false, true); } -void ContextMenu::SelectSameObjectType(void) +void ContextMenu::SelectSameObjectType() { sp_select_same_object_type(_desktop); } -void ContextMenu::ItemProperties(void) +void ContextMenu::ItemProperties() { _desktop->selection->set(_item); _desktop->_dlg_mgr->showDialog("ObjectProperties"); } -void ContextMenu::ItemSelectThis(void) +void ContextMenu::ItemSelectThis() { _desktop->selection->set(_item); } -void ContextMenu::ItemMoveTo(void) +void ContextMenu::ItemMoveTo() { Inkscape::UI::Dialogs::LayerPropertiesDialog::showMove(_desktop, _desktop->currentLayer()); } -void ContextMenu::ItemCreateLink(void) +void ContextMenu::ItemCreateLink() { Inkscape::XML::Document *xml_doc = _desktop->doc()->getReprDoc(); Inkscape::XML::Node *repr = xml_doc->createElement("svg:a"); @@ -546,33 +546,33 @@ void ContextMenu::ItemCreateLink(void) _desktop->_dlg_mgr->showDialog("ObjectAttributes"); } -void ContextMenu::SetMask(void) +void ContextMenu::SetMask() { _desktop->selection->setMask(false, false); } -void ContextMenu::ReleaseMask(void) +void ContextMenu::ReleaseMask() { _desktop->selection->unsetMask(false); } -void ContextMenu::CreateGroupClip(void) +void ContextMenu::CreateGroupClip() { _desktop->selection->setClipGroup(); } -void ContextMenu::SetClip(void) +void ContextMenu::SetClip() { _desktop->selection->setMask(true, false); } -void ContextMenu::ReleaseClip(void) +void ContextMenu::ReleaseClip() { _desktop->selection->unsetMask(true); } -void ContextMenu::MakeGroupMenu(void) +void ContextMenu::MakeGroupMenu() { /* Ungroup */ Gtk::MenuItem* mi = Gtk::manage(new Gtk::MenuItem(_("_Ungroup"), true)); @@ -581,12 +581,12 @@ void ContextMenu::MakeGroupMenu(void) append(*mi); } -void ContextMenu::ActivateGroup(void) +void ContextMenu::ActivateGroup() { _desktop->selection->group(); } -void ContextMenu::ActivateUngroup(void) +void ContextMenu::ActivateUngroup() { std::vector<SPItem*> children; @@ -594,13 +594,13 @@ void ContextMenu::ActivateUngroup(void) _desktop->selection->setList(children); } -void ContextMenu::ActivateUngroupPopSelection(void) +void ContextMenu::ActivateUngroupPopSelection() { _desktop->selection->popFromGroup(); } -void ContextMenu::MakeAnchorMenu(void) +void ContextMenu::MakeAnchorMenu() { Gtk::MenuItem* mi; @@ -623,12 +623,12 @@ void ContextMenu::MakeAnchorMenu(void) append(*mi); } -void ContextMenu::AnchorLinkProperties(void) +void ContextMenu::AnchorLinkProperties() { _desktop->_dlg_mgr->showDialog("ObjectAttributes"); } -void ContextMenu::AnchorLinkFollow(void) +void ContextMenu::AnchorLinkFollow() { if (_desktop->selection->isEmpty()) { @@ -644,14 +644,14 @@ void ContextMenu::AnchorLinkFollow(void) } } -void ContextMenu::AnchorLinkRemove(void) +void ContextMenu::AnchorLinkRemove() { std::vector<SPItem*> children; sp_item_group_ungroup(static_cast<SPAnchor*>(_item), children, false); Inkscape::DocumentUndo::done(_desktop->doc(), SP_VERB_NONE, _("Remove link")); } -void ContextMenu::MakeImageMenu (void) +void ContextMenu::MakeImageMenu () { Gtk::MenuItem* mi; Inkscape::XML::Node *ir = _object->getRepr(); @@ -713,7 +713,7 @@ void ContextMenu::MakeImageMenu (void) } } -void ContextMenu::ImageProperties(void) +void ContextMenu::ImageProperties() { _desktop->_dlg_mgr->showDialog("ObjectAttributes"); } @@ -741,7 +741,7 @@ Glib::ustring ContextMenu::getImageEditorName(bool is_svg) { return value; } -void ContextMenu::ImageEdit(void) +void ContextMenu::ImageEdit() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -817,19 +817,19 @@ void ContextMenu::ImageEdit(void) } } -void ContextMenu::ImageTraceBitmap(void) +void ContextMenu::ImageTraceBitmap() { INKSCAPE.dialogs_unhide(); _desktop->_dlg_mgr->showDialog("Trace"); } -void ContextMenu::ImageTracePixelArt(void) +void ContextMenu::ImageTracePixelArt() { INKSCAPE.dialogs_unhide(); _desktop->_dlg_mgr->showDialog("PixelArt"); } -void ContextMenu::ImageEmbed(void) +void ContextMenu::ImageEmbed() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -844,7 +844,7 @@ void ContextMenu::ImageEmbed(void) } } -void ContextMenu::ImageExtract(void) +void ContextMenu::ImageExtract() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -859,7 +859,7 @@ void ContextMenu::ImageExtract(void) } } -void ContextMenu::MakeShapeMenu (void) +void ContextMenu::MakeShapeMenu () { Gtk::MenuItem* mi; @@ -870,7 +870,7 @@ void ContextMenu::MakeShapeMenu (void) insert(*mi,positionOfLastDialog++); } -void ContextMenu::FillSettings(void) +void ContextMenu::FillSettings() { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -879,7 +879,7 @@ void ContextMenu::FillSettings(void) _desktop->_dlg_mgr->showDialog("FillAndStroke"); } -void ContextMenu::MakeTextMenu (void) +void ContextMenu::MakeTextMenu () { Gtk::MenuItem* mi; @@ -902,7 +902,7 @@ void ContextMenu::MakeTextMenu (void) insert(*mi,positionOfLastDialog++); } -void ContextMenu::TextSettings (void) +void ContextMenu::TextSettings () { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); @@ -911,7 +911,7 @@ void ContextMenu::TextSettings (void) _desktop->_dlg_mgr->showDialog("TextFont"); } -void ContextMenu::SpellcheckSettings (void) +void ContextMenu::SpellcheckSettings () { if (_desktop->selection->isEmpty()) { _desktop->selection->set(_item); diff --git a/src/ui/contextmenu.h b/src/ui/contextmenu.h index 29a090530..bd58fde00 100644 --- a/src/ui/contextmenu.h +++ b/src/ui/contextmenu.h @@ -53,7 +53,7 @@ class ContextMenu : public Gtk::Menu * @param item SPItem pointer to the object selected at the time the ContextMenu is created. */ ContextMenu(SPDesktop *desktop, SPItem *item); - ~ContextMenu(void) override; + ~ContextMenu() override; private: SPItem *_item; // pointer to the object selected at the time the ContextMenu is created @@ -68,7 +68,7 @@ class ContextMenu : public Gtk::Menu /** * auxiliary function that adds a separator line in the context menu */ - Gtk::SeparatorMenuItem* AddSeparator(void); + Gtk::SeparatorMenuItem* AddSeparator(); /** * c++ified version of sp_ui_menu_append_item. @@ -81,86 +81,86 @@ class ContextMenu : public Gtk::Menu * main function which is responsible for creating the context sensitive menu items, * calls subfunctions below to create the menu entry widgets. */ - void MakeObjectMenu (void); + void MakeObjectMenu (); /** * creates menu entries for an SP_TYPE_ITEM object */ - void MakeItemMenu (void); + void MakeItemMenu (); /** * creates menu entries for a grouped object */ - void MakeGroupMenu (void); + void MakeGroupMenu (); /** * creates menu entries for an anchor object */ - void MakeAnchorMenu (void); + void MakeAnchorMenu (); /** * creates menu entries for a bitmap image object */ - void MakeImageMenu (void); + void MakeImageMenu (); /** * creates menu entries for a shape object */ - void MakeShapeMenu (void); + void MakeShapeMenu (); /** * creates menu entries for a text object */ - void MakeTextMenu (void); + void MakeTextMenu (); void EnterGroup(Gtk::MenuItem* mi); - void LeaveGroup(void); - void LockSelected(void); - void HideSelected(void); + void LeaveGroup(); + void LockSelected(); + void HideSelected(); void UnLockBelow(std::vector<SPItem *> items); void UnHideBelow(std::vector<SPItem *> items); ////////////////////////////////////////// //callbacks for the context menu entries of an SP_TYPE_ITEM object - void ItemProperties(void); - void ItemSelectThis(void); - void ItemMoveTo(void); - void SelectSameFillStroke(void); - void SelectSameFillColor(void); - void SelectSameStrokeColor(void); - void SelectSameStrokeStyle(void); - void SelectSameObjectType(void); - void ItemCreateLink(void); - void CreateGroupClip(void); - void SetMask(void); - void ReleaseMask(void); - void SetClip(void); - void ReleaseClip(void); + void ItemProperties(); + void ItemSelectThis(); + void ItemMoveTo(); + void SelectSameFillStroke(); + void SelectSameFillColor(); + void SelectSameStrokeColor(); + void SelectSameStrokeStyle(); + void SelectSameObjectType(); + void ItemCreateLink(); + void CreateGroupClip(); + void SetMask(); + void ReleaseMask(); + void SetClip(); + void ReleaseClip(); ////////////////////////////////////////// /** * callback, is executed on clicking the anchor "Group" and "Ungroup" menu entry */ - void ActivateUngroupPopSelection(void); - void ActivateUngroup(void); - void ActivateGroup(void); + void ActivateUngroupPopSelection(); + void ActivateUngroup(); + void ActivateGroup(); - void AnchorLinkProperties(void); + void AnchorLinkProperties(); /** * placeholder for callback to be executed on clicking the anchor "Follow link" context menu entry * @todo add code to follow link externally */ - void AnchorLinkFollow(void); + void AnchorLinkFollow(); /** * callback, is executed on clicking the anchor "Link remove" menu entry */ - void AnchorLinkRemove(void); + void AnchorLinkRemove(); /** * callback, opens the image properties dialog and is executed on clicking the context menu entry with similar name */ - void ImageProperties(void); + void ImageProperties(); /** * callback, is executed on clicking the image "Edit Externally" menu entry */ - void ImageEdit(void); + void ImageEdit(); /** * auxiliary function that loads the external image editor name from the settings. @@ -170,39 +170,39 @@ class ContextMenu : public Gtk::Menu /** * callback, is executed on clicking the "Embed Image" menu entry */ - void ImageEmbed(void); + void ImageEmbed(); /** * callback, is executed on clicking the "Trace Bitmap" menu entry */ - void ImageTraceBitmap(void); + void ImageTraceBitmap(); /** * callback, is executed on clicking the "Trace Pixel Art" menu entry */ - void ImageTracePixelArt(void); + void ImageTracePixelArt(); /** * callback, is executed on clicking the "Extract Image" menu entry */ - void ImageExtract(void); + void ImageExtract(); /** * callback, is executed on clicking the "Fill and Stroke" menu entry */ - void FillSettings(void); + void FillSettings(); /** * callback, is executed on clicking the "Text and Font" menu entry */ - void TextSettings(void); + void TextSettings(); /** * callback, is executed on clicking the "Check spelling" menu entry */ - void SpellcheckSettings(void); + void SpellcheckSettings(); }; #endif // SEEN_CONTEXT_MENU_H diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp index 3346dd595..9e7d71c32 100644 --- a/src/ui/dialog/clonetiler.cpp +++ b/src/ui/dialog/clonetiler.cpp @@ -1167,7 +1167,7 @@ CloneTiler::CloneTiler () : } -CloneTiler::~CloneTiler (void) +CloneTiler::~CloneTiler () { //subselChangedConn.disconnect(); //selectModifiedConn.disconnect(); diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 392587bef..f484f7e47 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -121,7 +121,7 @@ static const char * selection_labels[SELECTION_NUMBER_OF] = { N_("_Page"), N_("_Drawing"), N_("_Selection"), N_("_Custom") }; -Export::Export (void) : +Export::Export () : UI::Widget::Panel("/dialogs/export/", SP_VERB_DIALOG_EXPORT), current_key(SELECTION_PAGE), original_name(), @@ -386,7 +386,7 @@ Export::Export (void) : onAreaToggled(); } -Export::~Export (void) +Export::~Export () { was_empty = TRUE; diff --git a/src/ui/dialog/extension-editor.cpp b/src/ui/dialog/extension-editor.cpp index fdbf59c1d..5e1a0cda5 100644 --- a/src/ui/dialog/extension-editor.cpp +++ b/src/ui/dialog/extension-editor.cpp @@ -121,7 +121,7 @@ ExtensionEditor::setExtensionIter(const Gtk::TreeModel::iterator &iter) * from the tree view in the left pane. It figure out which extension * is selected and updates the widgets to have data for that extension. */ -void ExtensionEditor::on_pagelist_selection_changed(void) +void ExtensionEditor::on_pagelist_selection_changed() { Glib::RefPtr<Gtk::TreeSelection> selection = _page_list.get_selection(); Gtk::TreeModel::iterator iter = selection->get_selected(); diff --git a/src/ui/dialog/extension-editor.h b/src/ui/dialog/extension-editor.h index f4e1bfb56..a0949dcd3 100644 --- a/src/ui/dialog/extension-editor.h +++ b/src/ui/dialog/extension-editor.h @@ -70,7 +70,7 @@ private: ExtensionEditor(ExtensionEditor const &d); ExtensionEditor& operator=(ExtensionEditor const &d); - void on_pagelist_selection_changed(void); + void on_pagelist_selection_changed(); static void dbfunc (Inkscape::Extension::Extension * in_plug, gpointer in_data); Gtk::TreeModel::iterator add_extension (Inkscape::Extension::Extension * ext); bool setExtensionIter(const Gtk::TreeModel::iterator &iter); diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp index 4d3a1fb62..e7b7be9b9 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.cpp +++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp @@ -898,7 +898,7 @@ Inkscape::Extension::Extension *FileOpenDialogImplGtk::getSelectionType() /** * Get the file name chosen by the user. Valid after an [OK] */ -Glib::ustring FileOpenDialogImplGtk::getFilename(void) +Glib::ustring FileOpenDialogImplGtk::getFilename() { return myFilename; } diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index 64045f252..f8de11f42 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -274,7 +274,7 @@ void Find::setTargetDesktop(SPDesktop *desktop) } } -void Find::onSelectionChange(void) +void Find::onSelectionChange() { if (!blocked) { status.set_text(""); diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h index c695bd9ac..2ed341122 100644 --- a/src/ui/dialog/find.h +++ b/src/ui/dialog/find.h @@ -196,7 +196,7 @@ protected: /** * Called when desktop selection changes */ - void onSelectionChange(void); + void onSelectionChange(); private: Find(Find const &d) = delete; diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp index 0cc3af606..dccbd76b7 100644 --- a/src/ui/dialog/floating-behavior.cpp +++ b/src/ui/dialog/floating-behavior.cpp @@ -62,7 +62,7 @@ FloatingBehavior::FloatingBehavior(Dialog &dialog) : * zero so that the transition happens instantaneously. This occurs on * windows as opacity changes cause flicker there. */ -void FloatingBehavior::_focus_event (void) +void FloatingBehavior::_focus_event () { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); _steps = 0; @@ -96,7 +96,7 @@ void FloatingBehavior::_focus_event (void) * the opacity half way to the goal until it runs out of steps, and then * it just forces the goal. */ -bool FloatingBehavior::_trans_timer (void) { +bool FloatingBehavior::_trans_timer () { // printf("Go go gadget timer: %d\n", _steps); if (_steps == 0) { if (_dialog_active.get_value()) { diff --git a/src/ui/dialog/floating-behavior.h b/src/ui/dialog/floating-behavior.h index 4c998940a..015ddfa27 100644 --- a/src/ui/dialog/floating-behavior.h +++ b/src/ui/dialog/floating-behavior.h @@ -66,8 +66,8 @@ private: Gtk::Dialog *_d; //< the actual dialog - void _focus_event (void); - bool _trans_timer (void); + void _focus_event (); + bool _trans_timer (); Glib::PropertyProxy_ReadOnly<bool> _dialog_active; //< Variable proxy to track whether the dialog is the active window int _steps; //< Number of steps for the timer to animate the transparent dialog diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp index 629f8c1c8..ec3ce1b71 100644 --- a/src/ui/dialog/object-attributes.cpp +++ b/src/ui/dialog/object-attributes.cpp @@ -79,7 +79,7 @@ static const SPAttrDesc image_nohref_desc[] = { { nullptr, nullptr} }; -ObjectAttributes::ObjectAttributes (void) : +ObjectAttributes::ObjectAttributes () : UI::Widget::Panel("/dialogs/objectattr/", SP_VERB_DIALOG_ATTR), blocked (false), CurrentItem(nullptr), @@ -97,7 +97,7 @@ ObjectAttributes::ObjectAttributes (void) : deskTrack.connect(GTK_WIDGET(gobj())); } -ObjectAttributes::~ObjectAttributes (void) +ObjectAttributes::~ObjectAttributes () { selectModifiedConn.disconnect(); subselChangedConn.disconnect(); @@ -106,7 +106,7 @@ ObjectAttributes::~ObjectAttributes (void) deskTrack.disconnect(); } -void ObjectAttributes::widget_setup (void) +void ObjectAttributes::widget_setup () { if (blocked) { diff --git a/src/ui/dialog/object-attributes.h b/src/ui/dialog/object-attributes.h index f10667093..a1264b8cf 100644 --- a/src/ui/dialog/object-attributes.h +++ b/src/ui/dialog/object-attributes.h @@ -50,7 +50,7 @@ public: /** * Updates entries and other child widgets on selection change, object modification, etc. */ - void widget_setup(void); + void widget_setup(); private: /** diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp index ff3dd2636..972f2d1f9 100644 --- a/src/ui/dialog/spellcheck.cpp +++ b/src/ui/dialog/spellcheck.cpp @@ -53,7 +53,7 @@ namespace UI { namespace Dialog { -SpellCheck::SpellCheck (void) : +SpellCheck::SpellCheck () : UI::Widget::Panel("/dialogs/spellcheck/", SP_VERB_DIALOG_SPELLCHECK), _text(nullptr), _layout(nullptr), @@ -170,7 +170,7 @@ SpellCheck::SpellCheck (void) : onStart (); } -SpellCheck::~SpellCheck(void) +SpellCheck::~SpellCheck() { clearRects(); disconnect(); diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 7b43977bb..16a79acdb 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -317,7 +317,7 @@ void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring font_featu } -SPItem *TextEdit::getSelectedTextItem (void) +SPItem *TextEdit::getSelectedTextItem () { if (!SP_ACTIVE_DESKTOP) return nullptr; @@ -333,7 +333,7 @@ SPItem *TextEdit::getSelectedTextItem (void) } -unsigned TextEdit::getSelectedTextCount (void) +unsigned TextEdit::getSelectedTextCount () { if (!SP_ACTIVE_DESKTOP) return 0; diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index bcf14d63f..f6ca8cdd3 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -112,12 +112,12 @@ protected: * * @return SPItem pointer to the selected text object */ - SPItem *getSelectedTextItem (void); + SPItem *getSelectedTextItem (); /** * Count the number of text objects in the selection on the canvas. */ - unsigned getSelectedTextCount (void); + unsigned getSelectedTextCount (); /** * Helper function to create markup from a fontspec and display in the preview label. diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 6be6d9f22..c7c5424eb 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -303,7 +303,7 @@ void XmlTree::present() UI::Widget::Panel::present(); } -XmlTree::~XmlTree (void) +XmlTree::~XmlTree () { set_tree_desktop(nullptr); diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index f9a30001a..c690e5dfc 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -310,7 +310,7 @@ sp_ui_close_view(GtkWidget */*widget*/) unsigned int -sp_ui_close_all(void) +sp_ui_close_all() { /* Iterate through all the windows, destroying each in the order they become active */ diff --git a/src/ui/interface.h b/src/ui/interface.h index 6e95c161c..83788ca1b 100644 --- a/src/ui/interface.h +++ b/src/ui/interface.h @@ -43,12 +43,12 @@ void sp_create_window (SPViewWidget *vw, bool editable); */ void sp_ui_close_view (GtkWidget *widget); -void sp_ui_new_view (void); +void sp_ui_new_view (); /** * @todo TODO: not yet working. To be re-enabled (by adding to menu) once it works. */ -void sp_ui_new_view_preview (void); +void sp_ui_new_view_preview (); /** * This function is called to exit the program, and iterates through all @@ -59,7 +59,7 @@ void sp_ui_new_view_preview (void); * Returns FALSE if the user cancels the close_all operation, TRUE * otherwise. */ -unsigned int sp_ui_close_all (void); +unsigned int sp_ui_close_all (); /** * Build the main tool bar. diff --git a/src/ui/view/view-widget.h b/src/ui/view/view-widget.h index 668f9d19a..661b7b342 100644 --- a/src/ui/view/view-widget.h +++ b/src/ui/view/view-widget.h @@ -36,7 +36,7 @@ class SPNamedView; /** * Registers the SPViewWidget class with Glib and returns its type number. */ -GType sp_view_widget_get_type(void); +GType sp_view_widget_get_type(); /** * Connects widget to view's 'resized' signal and calls virtual set_view() diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp index 57555a53d..12bb6ad28 100644 --- a/src/ui/widget/color-scales.cpp +++ b/src/ui/widget/color-scales.cpp @@ -702,7 +702,7 @@ void ColorScales::_updateSliders(guint channels) #endif } -static const gchar *sp_color_scales_hue_map(void) +static const gchar *sp_color_scales_hue_map() { static gchar *map = nullptr; diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index b5fdc721d..ceb3ca2ff 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -1118,11 +1118,11 @@ SelectedStyle::update() } } -void SelectedStyle::opacity_0(void) {_opacity_sb.set_value(0);} -void SelectedStyle::opacity_025(void) {_opacity_sb.set_value(25);} -void SelectedStyle::opacity_05(void) {_opacity_sb.set_value(50);} -void SelectedStyle::opacity_075(void) {_opacity_sb.set_value(75);} -void SelectedStyle::opacity_1(void) {_opacity_sb.set_value(100);} +void SelectedStyle::opacity_0() {_opacity_sb.set_value(0);} +void SelectedStyle::opacity_025() {_opacity_sb.set_value(25);} +void SelectedStyle::opacity_05() {_opacity_sb.set_value(50);} +void SelectedStyle::opacity_075() {_opacity_sb.set_value(75);} +void SelectedStyle::opacity_1() {_opacity_sb.set_value(100);} void SelectedStyle::on_opacity_menu (Gtk::Menu *menu) { diff --git a/src/verbs.cpp b/src/verbs.cpp index 0abb51303..f859f672b 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -392,7 +392,7 @@ Verb::Verb(gchar const *id, gchar const *name, gchar const *tip, gchar const *im * The only allocated variable is the _actions variable. If it has * been allocated it is deleted. */ -Verb::~Verb(void) +Verb::~Verb() { /// \todo all the actions need to be cleaned up first. delete _actions; @@ -697,7 +697,7 @@ void Verb::sensitive(SPDocument *in_doc, bool in_sensitive) /** * Accessor to get the tooltip for verb as localised string. */ -gchar const *Verb::get_tip(void) +gchar const *Verb::get_tip() { gchar const *result = nullptr; if (_tip) { @@ -3294,7 +3294,7 @@ Verb *Verb::_base_verbs[] = { }; std::vector<Inkscape::Verb *> -Verb::getList (void) { +Verb::getList () { std::vector<Verb *> verbs; // Go through the dynamic verb table @@ -3313,7 +3313,7 @@ Verb::getList (void) { }; void -Verb::list (void) { +Verb::list () { // Go through the dynamic verb table for (VerbTable::iterator iter = _verbs.begin(); iter != _verbs.end(); ++iter) { Verb * verb = iter->second; diff --git a/src/verbs.h b/src/verbs.h index afef793a1..b448cbf7f 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -501,28 +501,28 @@ protected: public: /** Accessor to get the \c _default_sensitive value. */ - bool get_default_sensitive (void) { return _default_sensitive; } + bool get_default_sensitive () { return _default_sensitive; } /** Accessor to get the internal variable. */ - unsigned int get_code (void) { return _code; } + unsigned int get_code () { return _code; } /** Accessor to get the internal variable. */ - char const * get_id (void) { return _id; } + char const * get_id () { return _id; } /** Accessor to get the internal variable. */ - char const * get_name (void) { return _name; } + char const * get_name () { return _name; } /** Accessor to get the internal variable. */ - char const * get_short_tip (void) { return _tip; }; + char const * get_short_tip () { return _tip; }; /** Accessor to get the internal variable. */ - char const * get_tip (void) ; + char const * get_tip () ; /** Accessor to get the internal variable. */ - char const * get_image (void) { return _image; } + char const * get_image () { return _image; } /** Get the verbs group */ - char const * get_group (void) { return _group; } + char const * get_group () { return _group; } /** Set the name after initialization. */ char const * set_name (char const * name) { _name = name; return _name; } @@ -579,7 +579,7 @@ public: _verb_ids.insert(VerbIDTable::value_type(_id, this)); } Verb (char const * id, char const * name, char const * tip, char const * image, char const * group); - virtual ~Verb (void); + virtual ~Verb (); SPAction * get_action(Inkscape::ActionContext const & context); @@ -631,11 +631,11 @@ protected: * * @return The size in elements of the internal base array. */ - static int _getBaseListSize(void) {return G_N_ELEMENTS(_base_verbs);} + static int _getBaseListSize() {return G_N_ELEMENTS(_base_verbs);} public: - static void list (void); - static std::vector<Inkscape::Verb *>getList (void); + static void list (); + static std::vector<Inkscape::Verb *>getList (); }; /* Verb class */ diff --git a/src/widgets/button.h b/src/widgets/button.h index 680ccb79d..60b98de45 100644 --- a/src/widgets/button.h +++ b/src/widgets/button.h @@ -56,7 +56,7 @@ struct SPButtonClass { #define SP_BUTTON_IS_DOWN(b) gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (b)) -GType sp_button_get_type (void); +GType sp_button_get_type (); GtkWidget *sp_button_new (GtkIconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action); diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index dd46cf58d..e70578e90 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -266,7 +266,7 @@ static GTimer *overallTimer = nullptr; /** * Registers SPDesktopWidget class and returns its type number. */ -GType SPDesktopWidget::getType(void) +GType SPDesktopWidget::getType() { static GType type = 0; if (!type) { diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp index 2e35659dd..673293509 100644 --- a/src/widgets/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -56,7 +56,7 @@ /* Fill */ -Gtk::Widget *sp_fill_style_widget_new(void) +Gtk::Widget *sp_fill_style_widget_new() { return Inkscape::Widgets::createStyleWidget( FILL ); } diff --git a/src/widgets/fill-style.h b/src/widgets/fill-style.h index 28a3f4f46..6e484077a 100644 --- a/src/widgets/fill-style.h +++ b/src/widgets/fill-style.h @@ -20,7 +20,7 @@ class Widget; class SPDesktop; -Gtk::Widget *sp_fill_style_widget_new(void); +Gtk::Widget *sp_fill_style_widget_new(); void sp_fill_style_widget_set_desktop(Gtk::Widget *widget, SPDesktop *desktop); diff --git a/src/widgets/gimp/gimpcolorwheel.h b/src/widgets/gimp/gimpcolorwheel.h index cec0f19df..41a38c842 100644 --- a/src/widgets/gimp/gimpcolorwheel.h +++ b/src/widgets/gimp/gimpcolorwheel.h @@ -63,10 +63,10 @@ struct _GimpColorWheelClass GtkDirectionType type); /* Padding for future expansion */ - void (*_gimp_reserved1) (void); - void (*_gimp_reserved2) (void); - void (*_gimp_reserved3) (void); - void (*_gimp_reserved4) (void); + void (*_gimp_reserved1) (); + void (*_gimp_reserved2) (); + void (*_gimp_reserved3) (); + void (*_gimp_reserved4) (); }; diff --git a/src/widgets/gradient-image.h b/src/widgets/gradient-image.h index a1b665f16..637d7c39d 100644 --- a/src/widgets/gradient-image.h +++ b/src/widgets/gradient-image.h @@ -42,7 +42,7 @@ struct SPGradientImageClass { GtkWidgetClass parent_class; }; -GType sp_gradient_image_get_type (void); +GType sp_gradient_image_get_type (); GtkWidget *sp_gradient_image_new (SPGradient *gradient); GdkPixbuf *sp_gradient_to_pixbuf (SPGradient *gr, int width, int height); diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h index 33b78519a..8317dd451 100644 --- a/src/widgets/gradient-selector.h +++ b/src/widgets/gradient-selector.h @@ -132,9 +132,9 @@ struct SPGradientSelectorClass { void (* changed) (SPGradientSelector *sel); }; -GType sp_gradient_selector_get_type(void); +GType sp_gradient_selector_get_type(); -GtkWidget *sp_gradient_selector_new (void); +GtkWidget *sp_gradient_selector_new (); void sp_gradient_selector_set_bbox (SPGradientSelector *sel, gdouble x0, gdouble y0, gdouble x1, gdouble y1); diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 793f37384..0bc5fcbe4 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -62,7 +62,7 @@ struct SPGradientVectorSelectorClass { void (* vector_set) (SPGradientVectorSelector *gvs, SPGradient *gr); }; -GType sp_gradient_vector_selector_get_type(void); +GType sp_gradient_vector_selector_get_type(); GtkWidget *sp_gradient_vector_selector_new (SPDocument *doc, SPGradient *gradient); diff --git a/src/widgets/ink-comboboxentry-action.h b/src/widgets/ink-comboboxentry-action.h index 9faf44268..042d42937 100644 --- a/src/widgets/ink-comboboxentry-action.h +++ b/src/widgets/ink-comboboxentry-action.h @@ -67,7 +67,7 @@ struct _Ink_ComboBoxEntry_Action { }; -GType ink_comboboxentry_action_get_type (void); +GType ink_comboboxentry_action_get_type (); /** * Creates a GtkAction subclass that wraps a GtkComboBoxEntry object. diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index 8433d66f8..f9d32b492 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -154,7 +154,7 @@ struct SPPaintSelectorClass { void (* fillrule_changed) (SPPaintSelector *psel, SPPaintSelector::FillRule fillrule); }; -GType sp_paint_selector_get_type (void); +GType sp_paint_selector_get_type (); SPPaintSelector *sp_paint_selector_new(FillOrStroke kind); diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index 043eb93cc..2749b90ef 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -92,7 +92,7 @@ SPAttributeTable::~SPAttributeTable () clear(); } -void SPAttributeTable::clear(void) +void SPAttributeTable::clear() { if (table) { @@ -228,7 +228,7 @@ void SPAttributeTable::change_object(SPObject *object) } -void SPAttributeTable::reread_properties(void) +void SPAttributeTable::reread_properties() { blocked = true; for (guint i = 0; i < (_attributes.size()); i++) diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h index 7aad9bdc7..b76b642db 100644 --- a/src/widgets/sp-attribute-widget.h +++ b/src/widgets/sp-attribute-widget.h @@ -98,7 +98,7 @@ public: /** * Clears data of SPAttributeTable instance, destroys all child widgets and closes connections. */ - void clear(void); + void clear(); /** * Reads the object attributes. @@ -107,17 +107,17 @@ public: * entry boxes. Caution: function should only be used when which there is * no change in which objects are selected. */ - void reread_properties(void); + void reread_properties(); /** * Gives access to the attributes list. */ - std::vector<Glib::ustring> get_attributes(void) {return _attributes;}; + std::vector<Glib::ustring> get_attributes() {return _attributes;}; /** * Gives access to the Gtk::Entry list. */ - std::vector<Gtk::Entry *> get_entries(void) {return _entries;}; + std::vector<Gtk::Entry *> get_entries() {return _entries;}; /** * Stores pointer to the selected object. diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h index f5c194249..6367c8ac8 100644 --- a/src/widgets/sp-color-selector.h +++ b/src/widgets/sp-color-selector.h @@ -80,7 +80,7 @@ struct SPColorSelectorClass { void (* changed) (SPColorSelector *rgbsel); }; -GType sp_color_selector_get_type(void); +GType sp_color_selector_get_type(); GtkWidget *sp_color_selector_new( GType selector_type ); diff --git a/src/widgets/sp-xmlview-attr-list.h b/src/widgets/sp-xmlview-attr-list.h index 08b115bfa..799dbe76a 100644 --- a/src/widgets/sp-xmlview-attr-list.h +++ b/src/widgets/sp-xmlview-attr-list.h @@ -34,7 +34,7 @@ struct SPXMLViewAttrListClass void (* row_changed) (SPXMLViewAttrList *list, gint row); }; -GType sp_xmlview_attr_list_get_type (void); +GType sp_xmlview_attr_list_get_type (); GtkWidget * sp_xmlview_attr_list_new (Inkscape::XML::Node * repr); #define SP_XMLVIEW_ATTR_LIST_GET_REPR(list) (SP_XMLVIEW_ATTR_LIST (list)->repr) diff --git a/src/widgets/sp-xmlview-content.h b/src/widgets/sp-xmlview-content.h index 140eacf46..962b80738 100644 --- a/src/widgets/sp-xmlview-content.h +++ b/src/widgets/sp-xmlview-content.h @@ -33,7 +33,7 @@ struct SPXMLViewContentClass GtkTextViewClass parent_class; }; -GType sp_xmlview_content_get_type (void); +GType sp_xmlview_content_get_type (); GtkWidget * sp_xmlview_content_new (Inkscape::XML::Node * repr); #define SP_XMLVIEW_CONTENT_GET_REPR(text) (SP_XMLVIEW_CONTENT (text)->repr) diff --git a/src/widgets/sp-xmlview-tree.h b/src/widgets/sp-xmlview-tree.h index 7ecbcb471..82b7d5370 100644 --- a/src/widgets/sp-xmlview-tree.h +++ b/src/widgets/sp-xmlview-tree.h @@ -39,7 +39,7 @@ struct SPXMLViewTreeClass GtkTreeViewClass parent_class; }; -GType sp_xmlview_tree_get_type (void); +GType sp_xmlview_tree_get_type (); GtkWidget * sp_xmlview_tree_new (Inkscape::XML::Node * repr, void * factory, void * data); #define SP_XMLVIEW_TREE_REPR(tree) (SP_XMLVIEW_TREE (tree)->repr) diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 53b094206..9f702a3c4 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -38,7 +38,7 @@ using Inkscape::Util::unit_table; /** * Creates a new widget for the line stroke paint. */ -Gtk::Widget *sp_stroke_style_paint_widget_new(void) +Gtk::Widget *sp_stroke_style_paint_widget_new() { return Inkscape::Widgets::createStyleWidget( STROKE ); } @@ -46,7 +46,7 @@ Gtk::Widget *sp_stroke_style_paint_widget_new(void) /** * Creates a new widget for the line stroke style. */ -Gtk::Widget *sp_stroke_style_line_widget_new(void) +Gtk::Widget *sp_stroke_style_line_widget_new() { return Inkscape::Widgets::createStrokeStyleWidget(); } diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h index 049782517..382d87ac6 100644 --- a/src/widgets/stroke-style.h +++ b/src/widgets/stroke-style.h @@ -90,12 +90,12 @@ struct { gchar const *key; gint value; } const SPMarkerNames[] = { /** * Creates an instance of a paint style widget. */ -Gtk::Widget *sp_stroke_style_paint_widget_new(void); +Gtk::Widget *sp_stroke_style_paint_widget_new(); /** * Creates an instance of a line style widget. */ -Gtk::Widget *sp_stroke_style_line_widget_new(void); +Gtk::Widget *sp_stroke_style_line_widget_new(); /** * Switches a line or paint style widget to track the given desktop. diff --git a/src/xml/repr.h b/src/xml/repr.h index 632b1f28a..372a62055 100644 --- a/src/xml/repr.h +++ b/src/xml/repr.h @@ -75,7 +75,7 @@ bool sp_repr_save_rebased_file(Inkscape::XML::Document *doc, char const *filenam /* CSS stuff */ -SPCSSAttr *sp_repr_css_attr_new(void); +SPCSSAttr *sp_repr_css_attr_new(); void sp_repr_css_attr_unref(SPCSSAttr *css); SPCSSAttr *sp_repr_css_attr(Inkscape::XML::Node *repr, char const *attr); SPCSSAttr *sp_repr_css_attr_parse_color_to_fill(const Glib::ustring &text); |