summaryrefslogtreecommitdiffstats
path: root/src/extension/param
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-14 22:45:10 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:00 +0000
commit7654fc11a6442e6ee2a463d6dee6458c0f53768f (patch)
tree7eb16a57b879747842bb0401dfee7fb47cd16f95 /src/extension/param
parentFix build issue caused by f09962028d017896279b717a6621a4de772d1b4f on GTK+ <3... (diff)
downloadinkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.tar.gz
inkscape-7654fc11a6442e6ee2a463d6dee6458c0f53768f.zip
Run clang-tidy’s modernize-use-override pass.
This adds the override specifier on all methods which override a virtual method, whether they were already virtual or missing this specifier.
Diffstat (limited to 'src/extension/param')
-rw-r--r--src/extension/param/bool.h6
-rw-r--r--src/extension/param/color.h8
-rw-r--r--src/extension/param/description.h2
-rw-r--r--src/extension/param/enum.h8
-rw-r--r--src/extension/param/float.h6
-rw-r--r--src/extension/param/int.h6
-rw-r--r--src/extension/param/notebook.h16
-rw-r--r--src/extension/param/radiobutton.cpp2
-rw-r--r--src/extension/param/radiobutton.h8
-rw-r--r--src/extension/param/string.h8
10 files changed, 35 insertions, 35 deletions
diff --git a/src/extension/param/bool.h b/src/extension/param/bool.h
index 826a98927..f987621d5 100644
--- a/src/extension/param/bool.h
+++ b/src/extension/param/bool.h
@@ -61,16 +61,16 @@ public:
* Creates a bool check button for a bool parameter.
* Builds a hbox with a label and a check button in it.
*/
- Gtk::Widget *get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget *get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::list <std::string> &list) const { return Parameter::string(list); }
+ void string(std::list <std::string> &list) const override { return Parameter::string(list); }
/**
* Appends 'true' or 'false'.
* @todo investigate. Returning a value that can then be appended would probably work better/safer.
*/
- virtual void string(std::string &string) const;
+ void string(std::string &string) const override;
private:
/** Internal value. */
diff --git a/src/extension/param/color.h b/src/extension/param/color.h
index 890f5ba5f..ed272ea2a 100644
--- a/src/extension/param/color.h
+++ b/src/extension/param/color.h
@@ -38,19 +38,19 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- virtual ~ParamColor(void);
+ ~ParamColor(void) 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(); }
guint32 set (guint32 in, SPDocument * doc, Inkscape::XML::Node * node);
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::list <std::string> &list) const { return Parameter::string(list); }
+ void string(std::list <std::string> &list) const override { return Parameter::string(list); }
- virtual void string (std::string &string) const;
+ void string (std::string &string) const override;
sigc::signal<void> * _changeSignal;
diff --git a/src/extension/param/description.h b/src/extension/param/description.h
index 599c4db78..84e402890 100644
--- a/src/extension/param/description.h
+++ b/src/extension/param/description.h
@@ -38,7 +38,7 @@ public:
Inkscape::XML::Node * xml,
AppearanceMode mode);
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
private:
/** \brief Internal value. */
gchar * _value;
diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h
index d34c0dcaa..b60eacf0f 100644
--- a/src/extension/param/enum.h
+++ b/src/extension/param/enum.h
@@ -60,14 +60,14 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- virtual ~ParamComboBox(void);
+ ~ParamComboBox(void) override;
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::list <std::string> &list) const { return Parameter::string(list); }
+ void string(std::list <std::string> &list) const override { return Parameter::string(list); }
- virtual void string(std::string &string) const;
+ void string(std::string &string) const override;
gchar const *get(SPDocument const * /*doc*/, Inkscape::XML::Node const * /*node*/) const { return _value; }
diff --git a/src/extension/param/float.h b/src/extension/param/float.h
index d58253ccb..c7ac11c6f 100644
--- a/src/extension/param/float.h
+++ b/src/extension/param/float.h
@@ -49,12 +49,12 @@ public:
float precision (void) { return _precision; }
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::list <std::string> &list) const { return Parameter::string(list); }
+ void string(std::list <std::string> &list) const override { return Parameter::string(list); }
- virtual void string(std::string &string) const;
+ void string(std::string &string) const override;
private:
/** Internal value. */
diff --git a/src/extension/param/int.h b/src/extension/param/int.h
index fcb1ef3f1..5b3cfb364 100644
--- a/src/extension/param/int.h
+++ b/src/extension/param/int.h
@@ -47,12 +47,12 @@ public:
int min (void) { return _min; }
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::list <std::string> &list) const { return Parameter::string(list); }
+ void string(std::list <std::string> &list) const override { return Parameter::string(list); }
- virtual void string(std::string &string) const;
+ void string(std::string &string) const override;
private:
/** Internal value. */
diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h
index f1bebd372..52577dd48 100644
--- a/src/extension/param/notebook.h
+++ b/src/extension/param/notebook.h
@@ -55,12 +55,12 @@ private:
bool hidden,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- ~ParamNotebookPage(void);
+ ~ParamNotebookPage(void) override;
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ 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;};
- Parameter * get_param (const gchar * name);
+ Parameter * get_param (const gchar * name) override;
}; /* class ParamNotebookPage */
@@ -75,21 +75,21 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- virtual ~ParamNotebook(void);
+ ~ParamNotebook(void) override;
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
/**
* A function to get the currentpage and the parameters in a string form.
* @return A string with the 'value' and all the parameters on all pages as command line arguments.
*/
- virtual void string (std::list <std::string> &list) const;
+ void string (std::list <std::string> &list) const override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::string &string) const {return Parameter::string(string);}
+ void string(std::string &string) const override {return Parameter::string(string);}
- Parameter * get_param (const gchar * name);
+ Parameter * get_param (const gchar * name) override;
const gchar * get (const SPDocument * /*doc*/, const Inkscape::XML::Node * /*node*/) { return _value; }
const gchar * set (const int in, SPDocument * doc, Inkscape::XML::Node * node);
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 890b92219..5598081f3 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -237,7 +237,7 @@ public:
{
this->signal_changed().connect(sigc::mem_fun(this, &ComboWdg::changed));
}
- virtual ~ComboWdg() {}
+ ~ComboWdg() override {}
void changed (void);
};
diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h
index e3ced8eb8..b96defe10 100644
--- a/src/extension/param/radiobutton.h
+++ b/src/extension/param/radiobutton.h
@@ -43,14 +43,14 @@ public:
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml,
AppearanceMode mode);
- virtual ~ParamRadioButton(void);
+ ~ParamRadioButton(void) override;
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::list <std::string> &list) const { return Parameter::string(list); }
+ void string(std::list <std::string> &list) const override { return Parameter::string(list); }
- virtual void string(std::string &string) const;
+ void string(std::string &string) const override;
Glib::ustring value_from_label(const Glib::ustring label);
diff --git a/src/extension/param/string.h b/src/extension/param/string.h
index 82eebee7f..e911565fe 100644
--- a/src/extension/param/string.h
+++ b/src/extension/param/string.h
@@ -30,19 +30,19 @@ public:
int indent,
Inkscape::Extension::Extension * ext,
Inkscape::XML::Node * xml);
- virtual ~ParamString(void);
+ ~ParamString(void) 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; }
const gchar * set (const gchar * in, SPDocument * doc, Inkscape::XML::Node * node);
- Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal);
+ Gtk::Widget * get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) override;
// Explicitly call superclass version to avoid method being hidden.
- virtual void string(std::list <std::string> &list) const { return Parameter::string(list); }
+ void string(std::list <std::string> &list) const override { return Parameter::string(list); }
- virtual void string(std::string &string) const;
+ void string(std::string &string) const override;
void setMaxLength(int maxLenght) { _max_length = maxLenght; }
int getMaxLength(void) { return _max_length; }