Const correctness fixes that also correct bug #893146.

Fixed bugs:
  - https://launchpad.net/bugs/893146

(bzr r10783)

1 files changed, 42 insertions, 46 deletions

diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 18cc754a6..13b8e326a 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -2,6 +2,7 @@
  * Copyright (C) 2005-2007 Authors:
  *   Ted Gould <ted@gould.cx>
  *   Johan Engelen <johan@shouraizou.nl> *
+ *   Jon A. Cruz <jon@joncruz.org>
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
@@ -22,27 +23,29 @@ namespace Inkscape {
 namespace Extension {
     
 
-/** \brief  Free the allocated data. */
+/** Free the allocated data. */
 ParamString::~ParamString(void)
 {
     g_free(_value);
+    _value = 0;
 }
 
-/** \brief  A function to set the \c _value
-    \param  in   The value to set to
-    \param  doc  A document that should be used to set the value.
-    \param  node The node where the value may be placed
-
-    This function sets the internal value, but it also sets the value
-    in the preferences structure.  To put it in the right place, \c PREF_DIR
-    and \c pref_name() are used.
-
-    To copy the data into _value the old memory must be free'd first.
-    It is important to note that \c g_free handles \c NULL just fine.  Then
-    the passed in value is duplicated using \c g_strdup().
-*/
-const gchar *
-ParamString::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/)
+/**
+ * A function to set the \c _value.
+ *
+ * This function sets the internal value, but it also sets the value
+ * in the preferences structure.  To put it in the right place, \c PREF_DIR
+ * and \c pref_name() are used.
+ *
+ * To copy the data into _value the old memory must be free'd first.
+ * It is important to note that \c g_free handles \c NULL just fine.  Then
+ * the passed in value is duplicated using \c g_strdup().
+ *
+ * @param  in   The value to set to.
+ * @param  doc  A document that should be used to set the value.
+ * @param  node The node where the value may be placed.
+ */
+const gchar * ParamString::set(const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*/)
 {
     if (in == NULL) {
         return NULL; /* Can't have NULL string */
@@ -62,18 +65,14 @@ ParamString::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node *
     return _value;
 }
 
-/** \brief  Return the value as a string */
-void
-ParamString::string (std::string &string)
+void ParamString::string(std::string &string) const
 {
-    if (_value == NULL) {
-        return;
+    if (_value) {
+      string += _value;
     }
-    string += _value;
-    return;
 }
 
-/** \brief  Initialize the object, to do that, copy the data. */
+/** Initialize the object, to do that, copy the data. */
 ParamString::ParamString (const gchar * name, const gchar * guitext, 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, ext),
               _value(NULL), _indent(0)
@@ -101,11 +100,9 @@ ParamString::ParamString (const gchar * name, const gchar * guitext, const gchar
     }
 
     _max_length = 0;
-
-    return;
 }
 
-/** \brief  A special type of Gtk::Entry to handle string parameteres */
+/** A special type of Gtk::Entry to handle string parameteres. */
 class ParamStringEntry : public Gtk::Entry {
 private:
     ParamString * _pref;
@@ -113,10 +110,11 @@ private:
     Inkscape::XML::Node * _node;
     sigc::signal<void> * _changeSignal;
 public:
-    /** \brief  Build a string preference for the given parameter
-        \param  pref  Where to get the string from, and where to put it
-                      when it changes.
-    */
+    /**
+     * Build a string preference for the given parameter.
+     * @param  pref  Where to get the string from, and where to put it
+     *                when it changes.
+     */
     ParamStringEntry (ParamString * pref, SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) :
         Gtk::Entry(), _pref(pref), _doc(doc), _node(node), _changeSignal(changeSignal) {
         if (_pref->get(NULL, NULL) != NULL) {
@@ -129,31 +127,29 @@ public:
 };
 
 
-/** \brief  Respond to the text box changing
-
-    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)
+/**
+ * Respond to the text box changing.
+ *
+ * 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)
 {
     Glib::ustring data = this->get_text();
     _pref->set(data.c_str(), _doc, _node);
     if (_changeSignal != NULL) {
         _changeSignal->emit();
     }
-    return;
 }
 
 /**
-    \brief  Creates a text box for the string parameter
-
-    Builds a hbox with a label and a text box in it.
-*/
-Gtk::Widget *
-ParamString::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
+ * Creates a text box for the string parameter.
+ *
+ * Builds a hbox with a label and a text box in it.
+ */
+Gtk::Widget * ParamString::get_widget(SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
 {
-	if (_gui_hidden) {
+    if (_gui_hidden) {
         return NULL;
     }