Remove unused field "gui_tip"

("gui_description" does now what "gui_tip" was supposed to do)

(bzr r15633.1.1)

20 files changed, 25 insertions, 65 deletions

diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp
index a2f4f82c2..612bf0331 100644
--- a/src/extension/param/bool.cpp
+++ b/src/extension/param/bool.cpp
@@ -29,11 +29,10 @@ ParamBool::ParamBool(const gchar * name,
                      const gchar * desc,
                      const Parameter::_scope_t scope,
                      bool gui_hidden,
-                     const gchar * gui_tip,
                      int indent,
                      Inkscape::Extension::Extension * ext,
                      Inkscape::XML::Node * xml)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _value(false)
 {
     const char * defaultval = NULL;
diff --git a/src/extension/param/bool.h b/src/extension/param/bool.h
index 0af12b105..8a7887cc6 100644
--- a/src/extension/param/bool.h
+++ b/src/extension/param/bool.h
@@ -37,7 +37,6 @@ public:
               const gchar * desc,
               const Parameter::_scope_t scope,
               bool gui_hidden,
-              const gchar * gui_tip,
               int indent,
               Inkscape::Extension::Extension * ext,
               Inkscape::XML::Node * xml);
diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index fd88e9adb..6f6582b82 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -57,11 +57,10 @@ ParamColor::ParamColor(const gchar * name,
                        const gchar * desc,
                        const Parameter::_scope_t scope,
                        bool gui_hidden,
-                       const gchar * gui_tip,
                        int indent,
                        Inkscape::Extension::Extension * ext,
                        Inkscape::XML::Node * xml)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _changeSignal(0)
 {
     const char * defaulthex = NULL;
diff --git a/src/extension/param/color.h b/src/extension/param/color.h
index d6e9d1fbe..184d57b28 100644
--- a/src/extension/param/color.h
+++ b/src/extension/param/color.h
@@ -36,7 +36,6 @@ public:
                const gchar * desc,
                const Parameter::_scope_t scope,
                bool gui_hidden,
-               const gchar * gui_tip,
                int indent,
                Inkscape::Extension::Extension * ext,
                Inkscape::XML::Node * xml);
diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp
index 480a0898a..0f3c92dd8 100644
--- a/src/extension/param/description.cpp
+++ b/src/extension/param/description.cpp
@@ -33,12 +33,11 @@ ParamDescription::ParamDescription(const gchar * name,
                                    const gchar * desc,
                                    const Parameter::_scope_t scope,
                                    bool gui_hidden,
-                                   const gchar * gui_tip,
                                    int indent,
                                    Inkscape::Extension::Extension * ext,
                                    Inkscape::XML::Node * xml,
                                    AppearanceMode mode)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _value(NULL)
     , _mode(mode)
     , _preserve_whitespace(false)
diff --git a/src/extension/param/description.h b/src/extension/param/description.h
index 91342fa6a..c065e5415 100644
--- a/src/extension/param/description.h
+++ b/src/extension/param/description.h
@@ -34,7 +34,6 @@ public:
                      const gchar * desc,
                      const Parameter::_scope_t scope,
                      bool gui_hidden,
-                     const gchar * gui_tip,
                      int indent,
                      Inkscape::Extension::Extension * ext,
                      Inkscape::XML::Node * xml,
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index 7a79e32bb..d93ed4b5a 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -51,11 +51,10 @@ ParamComboBox::ParamComboBox(const gchar * name,
                              const gchar * desc,
                              const Parameter::_scope_t scope,
                              bool gui_hidden,
-                             const gchar * gui_tip,
                              int indent,
                              Inkscape::Extension::Extension * ext,
                              Inkscape::XML::Node * xml)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _value(NULL)
     , choices(NULL)
 {
diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h
index f9d3d75f7..b54815227 100644
--- a/src/extension/param/enum.h
+++ b/src/extension/param/enum.h
@@ -42,7 +42,6 @@ public:
                   const gchar * desc,
                   const Parameter::_scope_t scope,
                   bool gui_hidden,
-                  const gchar * gui_tip,
                   int indent,
                   Inkscape::Extension::Extension * ext,
                   Inkscape::XML::Node * xml);
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp
index e9bb45c2e..574c147b6 100644
--- a/src/extension/param/float.cpp
+++ b/src/extension/param/float.cpp
@@ -32,12 +32,11 @@ ParamFloat::ParamFloat(const gchar * name,
                        const gchar * desc,
                        const Parameter::_scope_t scope,
                        bool gui_hidden,
-                       const gchar * gui_tip,
                        int indent,
                        Inkscape::Extension::Extension * ext,
                        Inkscape::XML::Node * xml,
                        AppearanceMode mode)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _value(0.0)
     , _mode(mode)
     , _min(0.0)
diff --git a/src/extension/param/float.h b/src/extension/param/float.h
index 7fd86cea7..b81b7ff08 100644
--- a/src/extension/param/float.h
+++ b/src/extension/param/float.h
@@ -34,7 +34,6 @@ public:
                const gchar * desc,
                const Parameter::_scope_t scope,
                bool gui_hidden,
-               const gchar * gui_tip,
                int indent,
                Inkscape::Extension::Extension * ext,
                Inkscape::XML::Node * xml,
diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp
index e81b0a526..c76493a26 100644
--- a/src/extension/param/int.cpp
+++ b/src/extension/param/int.cpp
@@ -32,12 +32,11 @@ ParamInt::ParamInt(const gchar * name,
                    const gchar * desc,
                    const Parameter::_scope_t scope,
                    bool gui_hidden,
-                   const gchar * gui_tip,
                    int indent,
                    Inkscape::Extension::Extension * ext,
                    Inkscape::XML::Node * xml,
                    AppearanceMode mode)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _value(0)
     , _mode(mode)
     , _min(0)
diff --git a/src/extension/param/int.h b/src/extension/param/int.h
index 40c0395ec..ae307c371 100644
--- a/src/extension/param/int.h
+++ b/src/extension/param/int.h
@@ -34,7 +34,6 @@ public:
              const gchar * desc,
              const Parameter::_scope_t scope,
              bool gui_hidden,
-             const gchar * gui_tip,
              int indent,
              Inkscape::Extension::Extension * ext,
              Inkscape::XML::Node * xml,
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index de86d1005..2e216e967 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -59,7 +59,6 @@ public:
                       const gchar * desc,
                       const Parameter::_scope_t scope,
                       bool gui_hidden,
-                      const gchar * gui_tip,
                       Inkscape::Extension::Extension * ext,
                       Inkscape::XML::Node * xml);
     ~ParamNotebookPage(void);
@@ -76,10 +75,9 @@ ParamNotebookPage::ParamNotebookPage(const gchar * name,
                                      const gchar * desc,
                                      const Parameter::_scope_t scope,
                                      bool gui_hidden,
-                                     const gchar * gui_tip,
                                      Inkscape::Extension::Extension * ext,
                                      Inkscape::XML::Node * xml)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, /*indent*/ 0, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, /*indent*/ 0, ext)
 {
     parameters = NULL;
 
@@ -157,15 +155,11 @@ ParamNotebookPage::makepage (Inkscape::XML::Node * in_repr, Inkscape::Extension:
     Parameter::_scope_t scope = Parameter::SCOPE_USER;
     bool gui_hidden = false;
     const char * gui_hide;
-    const char * gui_tip;
 
     name = in_repr->attribute("name");
     guitext = in_repr->attribute("gui-text");
     if (guitext == NULL)
         guitext = in_repr->attribute("_gui-text");
-    gui_tip = in_repr->attribute("gui-tip");
-    if (gui_tip == NULL)
-        gui_tip = in_repr->attribute("_gui-tip");
     desc = in_repr->attribute("gui-description");
     if (desc == NULL)
         desc = in_repr->attribute("_gui-description");
@@ -194,7 +188,7 @@ ParamNotebookPage::makepage (Inkscape::XML::Node * in_repr, Inkscape::Extension:
         }
     }
 
-    ParamNotebookPage * page = new ParamNotebookPage(name, guitext, desc, scope, gui_hidden, gui_tip, in_ext, in_repr);
+    ParamNotebookPage * page = new ParamNotebookPage(name, guitext, desc, scope, gui_hidden, in_ext, in_repr);
 
     /* Note: page could equal NULL */
     return page;
@@ -251,11 +245,10 @@ ParamNotebook::ParamNotebook(const gchar * name,
                              const gchar * desc,
                              const Parameter::_scope_t scope,
                              bool gui_hidden,
-                             const gchar * gui_tip,
                              int indent,
                              Inkscape::Extension::Extension * ext,
                              Inkscape::XML::Node * xml)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
 {
     pages = NULL;
 
diff --git a/src/extension/param/notebook.h b/src/extension/param/notebook.h
index 278c4de12..0b3a2ba85 100644
--- a/src/extension/param/notebook.h
+++ b/src/extension/param/notebook.h
@@ -46,7 +46,6 @@ public:
                   const gchar * desc,
                   const Parameter::_scope_t scope,
                   bool gui_hidden,
-                  const gchar * gui_tip,
                   int indent,
                   Inkscape::Extension::Extension * ext,
                   Inkscape::XML::Node * xml);
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 2c72c61df..a0488142e 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -77,10 +77,6 @@ Parameter *Parameter::make(Inkscape::XML::Node *in_repr, Inkscape::Extension::Ex
             }
         }
     }
-    const char *gui_tip = in_repr->attribute("gui-tip");
-    if (gui_tip == NULL) {
-        gui_tip = in_repr->attribute("_gui-tip");
-    }
     const char *desc = in_repr->attribute("gui-description");
     if (desc == NULL) {
         desc = in_repr->attribute("_gui-description");
@@ -125,21 +121,21 @@ Parameter *Parameter::make(Inkscape::XML::Node *in_repr, Inkscape::Extension::Ex
 
     Parameter * param = NULL;
     if (!strcmp(type, "boolean")) {
-        param = new ParamBool(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr);
+        param = new ParamBool(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr);
     } else if (!strcmp(type, "int")) {
         if (appearance && !strcmp(appearance, "full")) {
-            param = new ParamInt(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr, ParamInt::FULL);
+            param = new ParamInt(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr, ParamInt::FULL);
         } else {
-            param = new ParamInt(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr, ParamInt::MINIMAL);
+            param = new ParamInt(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr, ParamInt::MINIMAL);
         }
     } else if (!strcmp(type, "float")) {
         if (appearance && !strcmp(appearance, "full")) {
-            param = new ParamFloat(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr, ParamFloat::FULL);
+            param = new ParamFloat(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr, ParamFloat::FULL);
         } else {
-            param = new ParamFloat(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr, ParamFloat::MINIMAL);
+            param = new ParamFloat(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr, ParamFloat::MINIMAL);
         }
     } else if (!strcmp(type, "string")) {
-        param = new ParamString(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr);
+        param = new ParamString(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr);
         gchar const * max_length = in_repr->attribute("max_length");
         if (max_length != NULL) {
             ParamString * ps = dynamic_cast<ParamString *>(param);
@@ -154,19 +150,19 @@ Parameter *Parameter::make(Inkscape::XML::Node *in_repr, Inkscape::Extension::Ex
                 appearance_mode = ParamDescription::URL;
             }
         }
-        param = new ParamDescription(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr, appearance_mode);
+        param = new ParamDescription(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr, appearance_mode);
     } else if (!strcmp(type, "enum")) {
-        param = new ParamComboBox(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr);
+        param = new ParamComboBox(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr);
     } else if (!strcmp(type, "notebook")) {
-        param = new ParamNotebook(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr);
+        param = new ParamNotebook(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr);
     } else if (!strcmp(type, "optiongroup")) {
         if (appearance && !strcmp(appearance, "minimal")) {
-            param = new ParamRadioButton(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr, ParamRadioButton::MINIMAL);
+            param = new ParamRadioButton(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr, ParamRadioButton::MINIMAL);
         } else {
-            param = new ParamRadioButton(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr, ParamRadioButton::FULL);
+            param = new ParamRadioButton(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr, ParamRadioButton::FULL);
         }
     } else if (!strcmp(type, "color")) {
-        param = new ParamColor(name, guitext, desc, scope, gui_hidden, gui_tip, indent, in_ext, in_repr);
+        param = new ParamColor(name, guitext, desc, scope, gui_hidden, indent, in_ext, in_repr);
     }
 
     // Note: param could equal NULL
@@ -313,12 +309,11 @@ Parameter::set_color (guint32 in, SPDocument * doc, Inkscape::XML::Node * node)
 
 
 /** Oop, now that we need a parameter, we need it's name. */
-Parameter::Parameter(gchar const * name, gchar const * guitext, gchar const * desc, const Parameter::_scope_t scope, bool gui_hidden, gchar const * gui_tip, int indent, Inkscape::Extension::Extension * ext) :
+Parameter::Parameter(gchar const * name, gchar const * guitext, gchar const * desc, const Parameter::_scope_t scope, bool gui_hidden, int indent, Inkscape::Extension::Extension * ext) :
     _desc(0),
     _scope(scope),
     _text(0),
     _gui_hidden(gui_hidden),
-    _gui_tip(0),
     _indent(indent),
     extension(ext),
     _name(0)
@@ -326,12 +321,9 @@ Parameter::Parameter(gchar const * name, gchar const * guitext, gchar const * de
     if (name != NULL) {
         _name = g_strdup(name);
     }
+
     if (desc != NULL) {
         _desc = g_strdup(desc);
-//        printf("Adding description: '%s' on '%s'\n", _desc, _name);
-    }
-    if (gui_tip != NULL) {
-        _gui_tip = g_strdup(gui_tip);
     }
 
     if (guitext != NULL) {
@@ -349,7 +341,6 @@ Parameter::Parameter (gchar const * name, gchar const * guitext, Inkscape::Exten
     _scope(Parameter::SCOPE_USER),
     _text(0),
     _gui_hidden(false),
-    _gui_tip(0),
     _indent(0),
     extension(ext),
     _name(0)
@@ -374,9 +365,6 @@ Parameter::~Parameter(void)
     g_free(_text);
     _text = 0;
 
-    g_free(_gui_tip);
-    _gui_tip = 0;
-
     g_free(_desc);
     _desc = 0;
 }
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index c107f24f9..8888fb15b 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -61,7 +61,6 @@ public:
               gchar const *desc,
               const Parameter::_scope_t scope,
               bool gui_hidden,
-              gchar const *gui_tip,
               int indent,
               Inkscape::Extension::Extension * ext);
 
@@ -185,9 +184,6 @@ protected:
     /** Whether the GUI is visible. */
     bool _gui_hidden;
 
-    /** A tip for the GUI if there is one. */
-    gchar *  _gui_tip;
-
     /** Indentation level of the parameter. */
     int _indent;
 
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index df3c37e55..37d580381 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -62,12 +62,11 @@ ParamRadioButton::ParamRadioButton(const gchar * name,
                                    const gchar * desc,
                                    const Parameter::_scope_t scope,
                                    bool gui_hidden,
-                                   const gchar * gui_tip,
                                    int indent,
                                    Inkscape::Extension::Extension * ext,
                                    Inkscape::XML::Node * xml,
                                    AppearanceMode mode)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _value(0)
     , _mode(mode)
     , choices(0)
diff --git a/src/extension/param/radiobutton.h b/src/extension/param/radiobutton.h
index 5e15dcb57..185ec6a26 100644
--- a/src/extension/param/radiobutton.h
+++ b/src/extension/param/radiobutton.h
@@ -39,7 +39,6 @@ public:
                      const gchar * desc,
                      const Parameter::_scope_t scope,
                      bool gui_hidden,
-                     const gchar * gui_tip,
                      int indent,
                      Inkscape::Extension::Extension * ext,
                      Inkscape::XML::Node * xml,
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 86895f217..ad2968503 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -81,11 +81,10 @@ ParamString::ParamString(const gchar * name,
                          const gchar * desc,
                          const Parameter::_scope_t scope,
                          bool gui_hidden,
-                         const gchar * gui_tip,
                          int indent,
                          Inkscape::Extension::Extension * ext,
                          Inkscape::XML::Node * xml)
-    : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, indent, ext)
+    : Parameter(name, guitext, desc, scope, gui_hidden, indent, ext)
     , _value(NULL)
 {
     const char * defaultval = NULL;
diff --git a/src/extension/param/string.h b/src/extension/param/string.h
index f5412ebcc..e2721582b 100644
--- a/src/extension/param/string.h
+++ b/src/extension/param/string.h
@@ -28,7 +28,6 @@ public:
                 const gchar * desc,
                 const Parameter::_scope_t scope,
                 bool gui_hidden,
-                const gchar * gui_tip,
                 int indent,
                 Inkscape::Extension::Extension * ext,
                 Inkscape::XML::Node * xml);