diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2012-01-03 12:23:35 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2012-01-03 12:23:35 +0000 |
| commit | fde59b9691f02d4f33a9b327b0e0fac770109854 (patch) | |
| tree | ee2438781f41cbc434c230bee3dbad3c28822058 /src/extension/param | |
| parent | A few GSEAL issues in device-manager (diff) | |
| download | inkscape-fde59b9691f02d4f33a9b327b0e0fac770109854.tar.gz inkscape-fde59b9691f02d4f33a9b327b0e0fac770109854.zip | |
Janitorial tasks: get rid of deprecated repr wrapper functions
(bzr r10830)
Diffstat (limited to 'src/extension/param')
| -rw-r--r-- | src/extension/param/bool.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/color.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/description.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/float.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/int.cpp | 4 | ||||
| -rw-r--r-- | src/extension/param/notebook.cpp | 8 | ||||
| -rw-r--r-- | src/extension/param/radiobutton.cpp | 6 | ||||
| -rw-r--r-- | src/extension/param/string.cpp | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/src/extension/param/bool.cpp b/src/extension/param/bool.cpp index 3073d2e76..9f7c6e69a 100644 --- a/src/extension/param/bool.cpp +++ b/src/extension/param/bool.cpp @@ -27,8 +27,8 @@ ParamBool::ParamBool(const gchar * name, const gchar * guitext, const gchar * de _value(false), _indent(0) { const char * defaultval = NULL; - if (sp_repr_children(xml) != NULL) { - defaultval = sp_repr_children(xml)->content(); + if (xml->firstChild() != NULL) { + defaultval = xml->firstChild()->content(); } if (defaultval != NULL && (!strcmp(defaultval, "true") || !strcmp(defaultval, "true") || !strcmp(defaultval, "1"))) { diff --git a/src/extension/param/color.cpp b/src/extension/param/color.cpp index 6600d5f2a..8f4f8c0fa 100644 --- a/src/extension/param/color.cpp +++ b/src/extension/param/color.cpp @@ -62,8 +62,8 @@ ParamColor::ParamColor (const gchar * name, const gchar * guitext, const gchar * _changeSignal(0) { const char * defaulthex = NULL; - if (sp_repr_children(xml) != NULL) - defaulthex = sp_repr_children(xml)->content(); + if (xml->firstChild() != NULL) + defaulthex = xml->firstChild()->content(); gchar * pref_name = this->pref_name(); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); diff --git a/src/extension/param/description.cpp b/src/extension/param/description.cpp index 7a68aff62..5eeb24ac7 100644 --- a/src/extension/param/description.cpp +++ b/src/extension/param/description.cpp @@ -44,8 +44,8 @@ ParamDescription::ParamDescription (const gchar * name, { // printf("Building Description\n"); const char * defaultval = NULL; - if (sp_repr_children(xml) != NULL) { - defaultval = sp_repr_children(xml)->content(); + if (xml->firstChild() != NULL) { + defaultval = xml->firstChild()->content(); } if (defaultval != NULL) { diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index 2b501a9a4..29b13eef3 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -38,8 +38,8 @@ ParamFloat::ParamFloat (const gchar * name, _value(0.0), _mode(mode), _indent(0), _min(0.0), _max(10.0) { const gchar * defaultval = NULL; - if (sp_repr_children(xml) != NULL) { - defaultval = sp_repr_children(xml)->content(); + if (xml->firstChild() != NULL) { + defaultval = xml->firstChild()->content(); } if (defaultval != NULL) { _value = g_ascii_strtod (defaultval,NULL); diff --git a/src/extension/param/int.cpp b/src/extension/param/int.cpp index cd6815c4d..c7fa3b412 100644 --- a/src/extension/param/int.cpp +++ b/src/extension/param/int.cpp @@ -38,8 +38,8 @@ ParamInt::ParamInt (const gchar * name, _value(0), _mode(mode), _indent(0), _min(0), _max(10) { const char * defaultval = NULL; - if (sp_repr_children(xml) != NULL) { - defaultval = sp_repr_children(xml)->content(); + if (xml->firstChild() != NULL) { + defaultval = xml->firstChild()->content(); } if (defaultval != NULL) { _value = atoi(defaultval); diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp index 99eec7e4b..63dc77f21 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/param/notebook.cpp @@ -71,7 +71,7 @@ ParamNotebookPage::ParamNotebookPage (const gchar * name, const gchar * guitext, // Read XML to build page if (xml != NULL) { - Inkscape::XML::Node *child_repr = sp_repr_children(xml); + Inkscape::XML::Node *child_repr = xml->firstChild(); while (child_repr != NULL) { char const * chname = child_repr->name(); if (!strncmp(chname, INKSCAPE_EXTENSION_NS_NC, strlen(INKSCAPE_EXTENSION_NS_NC))) { @@ -84,7 +84,7 @@ ParamNotebookPage::ParamNotebookPage (const gchar * name, const gchar * guitext, param = Parameter::make(child_repr, ext); if (param != NULL) parameters = g_slist_append(parameters, param); } - child_repr = sp_repr_next(child_repr); + child_repr = child_repr->next(); } } } @@ -230,7 +230,7 @@ ParamNotebook::ParamNotebook (const gchar * name, const gchar * guitext, const g // Read XML tree to add pages: if (xml != NULL) { - Inkscape::XML::Node *child_repr = sp_repr_children(xml); + Inkscape::XML::Node *child_repr = xml->firstChild(); while (child_repr != NULL) { char const * chname = child_repr->name(); if (!strncmp(chname, INKSCAPE_EXTENSION_NS_NC, strlen(INKSCAPE_EXTENSION_NS_NC))) { @@ -243,7 +243,7 @@ ParamNotebook::ParamNotebook (const gchar * name, const gchar * guitext, const g page = ParamNotebookPage::makepage(child_repr, ext); if (page != NULL) pages = g_slist_append(pages, page); } - child_repr = sp_repr_next(child_repr); + child_repr = child_repr->next(); } } diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp index 92f36c813..c05fa17cc 100644 --- a/src/extension/param/radiobutton.cpp +++ b/src/extension/param/radiobutton.cpp @@ -71,13 +71,13 @@ ParamRadioButton::ParamRadioButton (const gchar * name, // Read XML tree to add enumeration items: // printf("Extension Constructor: "); if (xml != NULL) { - Inkscape::XML::Node *child_repr = sp_repr_children(xml); + Inkscape::XML::Node *child_repr = xml->firstChild(); while (child_repr != NULL) { char const * chname = child_repr->name(); if (!strcmp(chname, INKSCAPE_EXTENSION_NS "option") || !strcmp(chname, INKSCAPE_EXTENSION_NS "_option")) { Glib::ustring * newguitext = NULL; Glib::ustring * newvalue = NULL; - const char * contents = sp_repr_children(child_repr)->content(); + const char * contents = child_repr->firstChild()->content(); if (contents != NULL) { // don't translate when 'item' but do translate when '_option' @@ -106,7 +106,7 @@ ParamRadioButton::ParamRadioButton (const gchar * name, choices = g_slist_append( choices, new optionentry(newvalue, newguitext) ); } } - child_repr = sp_repr_next(child_repr); + child_repr = child_repr->next(); } } diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp index 13b8e326a..6b205d627 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -78,8 +78,8 @@ ParamString::ParamString (const gchar * name, const gchar * guitext, const gchar _value(NULL), _indent(0) { const char * defaultval = NULL; - if (sp_repr_children(xml) != NULL) { - defaultval = sp_repr_children(xml)->content(); + if (xml->firstChild() != NULL) { + defaultval = xml->firstChild()->content(); } const char * indent = xml->attribute("indent"); |
