diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-19 13:55:58 +0000 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-06-19 13:55:58 +0000 |
| commit | 884fe02952017ac219cd23f9407d27ed4d8a8620 (patch) | |
| tree | a86d66e240ae1e72007ba75b23757c71d5a9a28c /src/extension/param | |
| parent | Run clang-tidy’s modernize-use-emplace pass. (diff) | |
| download | inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.tar.gz inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.zip | |
Run clang-tidy’s modernize-redundant-void-arg pass.
Diffstat (limited to 'src/extension/param')
| -rw-r--r-- | src/extension/param/bool.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/color.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/color.h | 2 | ||||
| -rw-r--r-- | src/extension/param/enum.cpp | 8 | ||||
| -rw-r--r-- | src/extension/param/enum.h | 4 | ||||
| -rw-r--r-- | src/extension/param/float.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/float.h | 6 | ||||
| -rw-r--r-- | src/extension/param/int.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/int.h | 4 | ||||
| -rw-r--r-- | src/extension/param/notebook.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/notebook.h | 6 | ||||
| -rw-r--r-- | src/extension/param/parameter.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/parameter.h | 8 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 10 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.h | 2 | ||||
| -rw-r--r-- | src/extension/param/string.cpp | 6 | ||||
| -rw-r--r-- | src/extension/param/string.h | 4 |
17 files changed, 41 insertions, 41 deletions
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; } }; |
