Refactored preferences handling into a new version of

the Inkscape::Preferences class. Removed all use of 
prefs_get_string_attribute(), pref_path_get_nth_child() and 
create_pref() in favor of the new API. Replaced some "0 or 1" integer 
preferences with booleans.

(bzr r6823)

5 files changed, 35 insertions, 22 deletions

diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp
index 845a04824..555461bc7 100644
--- a/src/extension/param/color.cpp
+++ b/src/extension/param/color.cpp
@@ -25,6 +25,7 @@
 #include <color.h>
 #include "widgets/sp-color-selector.h"
 #include "widgets/sp-color-notebook.h"
+#include "preferences.h"
 
 
 namespace Inkscape {
@@ -47,7 +48,9 @@ ParamColor::set( guint32 in, SPDocument * /*doc*/, Inkscape::XML::Node * /*node*
     gchar * prefname = this->pref_name();
     std::string value;
     string(value);
-    prefs_set_string_attribute(PREF_DIR, prefname, value.c_str());
+    
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setString(PREF_DIR, prefname, value);
     g_free(prefname);
 
     return _value;
@@ -62,11 +65,12 @@ ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar *
         defaulthex = sp_repr_children(xml)->content();
 
     gchar * pref_name = this->pref_name();
-    const gchar * paramval = prefs_get_string_attribute(PREF_DIR, pref_name);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
     g_free(pref_name);
 
-    if (paramval != NULL)
-        defaulthex = paramval;
+    if (!paramval.empty())
+        defaulthex = paramval.data();
 
     _value = atoi(defaulthex);
 
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index 89db25d03..33c153434 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -33,6 +33,7 @@
 #include <sp-object.h>
 
 #include "enum.h"
+#include "preferences.h"
 
 /** \brief  The root directory in the preferences database for extension
             related parameters. */
@@ -104,13 +105,14 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g
         defaultval = sp_repr_children(xml)->attribute("value");
 
     gchar * pref_name = this->pref_name();
-    const gchar * paramval = prefs_get_string_attribute(PREF_DIR, pref_name);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
     g_free(pref_name);
 
-    if (paramval != NULL)
-        defaultval = paramval;
+    if (!paramval.empty())
+        defaultval = paramval.data();
     if (defaultval != NULL)
-        _value = g_strdup(defaultval);  // allocate space for _value
+        _value = g_strdup(defaultval);
 
     return;
 }
@@ -157,7 +159,8 @@ ParamComboBox::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node
         if (_value != NULL) g_free(_value);
         _value = g_strdup(settext->c_str());
         gchar * prefname = this->pref_name();
-        prefs_set_string_attribute(PREF_DIR, prefname, _value);
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        prefs->setString(PREF_DIR, prefname, _value);
         g_free(prefname);
     }
 
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index 1a2623fbf..bce6bc3d0 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -27,7 +27,7 @@
 #include <xml/node.h>
 
 #include <extension/extension.h>
-#include "prefs-utils.h"
+#include "preferences.h"
 #include "document-private.h"
 #include "sp-object.h"
 
@@ -263,11 +263,12 @@ ParamNotebook::ParamNotebook (const gchar * name, const gchar * guitext, const g
     }
 
     gchar * pref_name = this->pref_name();
-    const gchar * paramval = prefs_get_string_attribute(PREF_DIR, pref_name);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
     g_free(pref_name);
 
-    if (paramval != NULL)
-        defaultval = paramval;
+    if (!paramval.empty())
+        defaultval = paramval.data();
     if (defaultval != NULL)
         _value = g_strdup(defaultval);  // allocate space for _value
 
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 76c3506af..c05191b58 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -31,7 +31,7 @@
 #include <xml/node.h>
 
 #include <extension/extension.h>
-#include "prefs-utils.h"
+#include "preferences.h"
 #include "document-private.h"
 #include "sp-object.h"
 
@@ -112,11 +112,12 @@ ParamRadioButton::ParamRadioButton (const gchar * name,
         defaultval = ((optionentry*) choices->data)->value->c_str();
 
     gchar * pref_name = this->pref_name();
-    const gchar * paramval = prefs_get_string_attribute(PREF_DIR, pref_name);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
     g_free(pref_name);
 
-    if (paramval != NULL)
-        defaultval = paramval;
+    if (!paramval.empty())
+        defaultval = paramval.data();
     if (defaultval != NULL)
         _value = g_strdup(defaultval);  // allocate space for _value
 
@@ -165,7 +166,8 @@ ParamRadioButton::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::No
         if (_value != NULL) g_free(_value);
         _value = g_strdup(settext->c_str());
         gchar * prefname = this->pref_name();
-        prefs_set_string_attribute(PREF_DIR, prefname, _value);
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        prefs->setString(PREF_DIR, prefname, _value);
         g_free(prefname);
     }
 
diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 3dd2a2328..56ceeaad5 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -17,6 +17,7 @@
 
 #include <extension/extension.h>
 #include "string.h"
+#include "preferences.h"
 
 namespace Inkscape {
 namespace Extension {
@@ -51,7 +52,8 @@ ParamString::set (const gchar * in, SPDocument * /*doc*/, Inkscape::XML::Node *
     _value = g_strdup(in);
 
     gchar * prefname = this->pref_name();
-    prefs_set_string_attribute(PREF_DIR, prefname, _value);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setString(PREF_DIR, prefname, _value);
     g_free(prefname);
 
     return _value;
@@ -77,11 +79,12 @@ ParamString::ParamString (const gchar * name, const gchar * guitext, const gchar
         defaultval = sp_repr_children(xml)->content();
 
     gchar * pref_name = this->pref_name();
-    const gchar * paramval = prefs_get_string_attribute(PREF_DIR, pref_name);
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring paramval = prefs->getString(PREF_DIR, pref_name);
     g_free(pref_name);
 
-    if (paramval != NULL)
-        defaultval = paramval;
+    if (!paramval.empty())
+        defaultval = paramval.data();
     if (defaultval != NULL)
         _value = g_strdup(defaultval);