InxParameter::string(): remove useless overrides

8 files changed, 7 insertions, 26 deletions

diff --git a/src/extension/prefdialog/parameter-bool.h b/src/extension/prefdialog/parameter-bool.h
index 3aefd03c0..c5ffe2fd9 100644
--- a/src/extension/prefdialog/parameter-bool.h
+++ b/src/extension/prefdialog/parameter-bool.h
@@ -54,9 +54,6 @@ public:
      */
     Gtk::Widget *get_widget(SPDocument *doc, Inkscape::XML::Node *node, sigc::signal<void> *changeSignal) override;
 
-    // Explicitly call superclass version to avoid method being hidden.
-    void string(std::list <std::string> &list) const override { return InxParameter::string(list); }
-
     /**
      * Appends 'true' or 'false'.
      * @todo investigate. Returning a value that can then be appended would probably work better/safer.
diff --git a/src/extension/prefdialog/parameter-color.h b/src/extension/prefdialog/parameter-color.h
index 81df703ea..511320520 100644
--- a/src/extension/prefdialog/parameter-color.h
+++ b/src/extension/prefdialog/parameter-color.h
@@ -44,9 +44,6 @@ public:
 
     Gtk::Widget *get_widget(SPDocument *doc, Inkscape::XML::Node *node, sigc::signal<void> *changeSignal) override;
 
-    // Explicitly call superclass version to avoid method being hidden.
-    void string(std::list <std::string> &list) const override { return InxParameter::string(list); }
-
     void string(std::string &string) const override;
 
     sigc::signal<void> *_changeSignal;
diff --git a/src/extension/prefdialog/parameter-float.h b/src/extension/prefdialog/parameter-float.h
index 90dc7dba9..93c38fb24 100644
--- a/src/extension/prefdialog/parameter-float.h
+++ b/src/extension/prefdialog/parameter-float.h
@@ -46,9 +46,6 @@ public:
 
     Gtk::Widget *get_widget(SPDocument *doc, Inkscape::XML::Node *node, sigc::signal<void> *changeSignal) override;
 
-    // Explicitly call superclass version to avoid method being hidden.
-    void string(std::list <std::string> &list) const override { return InxParameter::string(list); }
-
     void string(std::string &string) const override;
 
 private:
diff --git a/src/extension/prefdialog/parameter-int.h b/src/extension/prefdialog/parameter-int.h
index e1a6d35ca..093bd3f03 100644
--- a/src/extension/prefdialog/parameter-int.h
+++ b/src/extension/prefdialog/parameter-int.h
@@ -44,9 +44,6 @@ public:
 
     Gtk::Widget *get_widget(SPDocument *doc, Inkscape::XML::Node *node, sigc::signal<void> *changeSignal) override;
 
-    // Explicitly call superclass version to avoid method being hidden.
-    void string(std::list <std::string> &list) const override { return InxParameter::string(list); }
-
     void string(std::string &string) const override;
 
 private:
diff --git a/src/extension/prefdialog/parameter-notebook.cpp b/src/extension/prefdialog/parameter-notebook.cpp
index 31cf5ba4a..e84150aa2 100644
--- a/src/extension/prefdialog/parameter-notebook.cpp
+++ b/src/extension/prefdialog/parameter-notebook.cpp
@@ -64,14 +64,13 @@ ParamNotebook::ParamNotebookPage::ParamNotebookPage(Inkscape::XML::Node *xml, In
 
 ParamNotebook::ParamNotebookPage::~ParamNotebookPage ()
 {
-    //destroy parameters
+    // destroy parameters
     for (auto parameter : parameters) {
         delete parameter;
     }
 }
 
-/** Return the value as a string. */
-void ParamNotebook::ParamNotebookPage::paramString(std::list <std::string> &list)
+void ParamNotebook::ParamNotebookPage::string(std::list <std::string> &list) const
 {
     for (auto parameter : parameters) {
         parameter->string(list);
@@ -223,7 +222,7 @@ void ParamNotebook::string(std::list <std::string> &list) const
     list.insert(list.end(), param_string);
 
     for (auto page : pages) {
-        page->paramString(list);
+        page->string(list);
     }
 }
 
diff --git a/src/extension/prefdialog/parameter-notebook.h b/src/extension/prefdialog/parameter-notebook.h
index a50ad1dca..ea51162fe 100644
--- a/src/extension/prefdialog/parameter-notebook.h
+++ b/src/extension/prefdialog/parameter-notebook.h
@@ -54,9 +54,9 @@ private:
         ~ParamNotebookPage() override;
 
         Gtk::Widget *get_widget(SPDocument *doc, Inkscape::XML::Node *node, sigc::signal<void> *changeSignal) override;
-        void paramString (std::list <std::string> &list);
-        char *get_text () {return _text;};
-        InxParameter *get_param (const char *name) override;
+        void string(std::list <std::string> &list) const override;
+        char *get_text() { return _text; };
+        InxParameter *get_param(const char *name) override;
     }; /* class ParamNotebookPage */
 
     /** A table to store the pages with parameters for this notebook.
@@ -73,7 +73,7 @@ public:
      * 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.
      */
-    void string (std::list <std::string> &list) const override;
+    void string(std::list <std::string> &list) const override;
 
     // Explicitly call superclass version to avoid method being hidden.
     void string(std::string &string) const override {return InxParameter::string(string);}
diff --git a/src/extension/prefdialog/parameter-optiongroup.h b/src/extension/prefdialog/parameter-optiongroup.h
index 225fcb2b4..17cd075e9 100644
--- a/src/extension/prefdialog/parameter-optiongroup.h
+++ b/src/extension/prefdialog/parameter-optiongroup.h
@@ -47,9 +47,6 @@ public:
 
     Gtk::Widget *get_widget(SPDocument *doc, Inkscape::XML::Node *node, sigc::signal<void> *changeSignal) override;
 
-    // Explicitly call superclass version to avoid method being hidden.
-    void string(std::list <std::string> &list) const override { return InxParameter::string(list); }
-
     void string(std::string &string) const override;
 
     Glib::ustring value_from_label(const Glib::ustring label);
diff --git a/src/extension/prefdialog/parameter-string.h b/src/extension/prefdialog/parameter-string.h
index ac5d98943..e1abaa4e8 100644
--- a/src/extension/prefdialog/parameter-string.h
+++ b/src/extension/prefdialog/parameter-string.h
@@ -28,9 +28,6 @@ public:
 
     Gtk::Widget *get_widget(SPDocument *doc, Inkscape::XML::Node *node, sigc::signal<void> *changeSignal) override;
 
-    // Explicitly call superclass version to avoid method being hidden.
-    void string(std::list <std::string> &list) const override { return InxParameter::string(list); }
-
     void string(std::string &string) const override;
 
     void setMaxLength(int maxLength) { _max_length = maxLength; }