From 425fd699e385816d93d4728af535365175cc2a65 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 29 Jun 2004 23:18:18 +0000 Subject: [PATCH] changed return value from gchar* to const gchar*. Renamed parameters to be 2004-06-30 Michael Natterer * widgets/gimpselectiondata.[ch] (gimp_selection_data_get_svg): changed return value from gchar* to const gchar*. Renamed parameters to be consistent with other SVG functions. * widgets/gimpcontainertreeview-dnd.c * widgets/gimpdnd.c: changed accordingly. --- ChangeLog | 9 +++++++++ app/widgets/gimpcontainertreeview-dnd.c | 4 ++-- app/widgets/gimpdnd.c | 4 ++-- app/widgets/gimpselectiondata.c | 20 ++++++++++---------- app/widgets/gimpselectiondata.h | 8 ++++---- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d0cf99a19..d5994cb744 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-06-30 Michael Natterer + + * widgets/gimpselectiondata.[ch] (gimp_selection_data_get_svg): + changed return value from gchar* to const gchar*. Renamed + parameters to be consistent with other SVG functions. + + * widgets/gimpcontainertreeview-dnd.c + * widgets/gimpdnd.c: changed accordingly. + 2004-06-30 Simon Budig * app/vectors/gimpstroke.[ch] diff --git a/app/widgets/gimpcontainertreeview-dnd.c b/app/widgets/gimpcontainertreeview-dnd.c index 62c3fce6da..2d133446c3 100644 --- a/app/widgets/gimpcontainertreeview-dnd.c +++ b/app/widgets/gimpcontainertreeview-dnd.c @@ -386,8 +386,8 @@ gimp_container_tree_view_drag_data_received (GtkWidget *widget, case GIMP_DND_TYPE_SVG_XML: if (tree_view_class->drop_svg) { - gchar *svg_data; - gint svg_data_length; + const gchar *svg_data; + gint svg_data_length; svg_data = gimp_selection_data_get_svg (selection_data, &svg_data_length); diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c index b895c184a0..0927332091 100644 --- a/app/widgets/gimpdnd.c +++ b/app/widgets/gimpdnd.c @@ -1119,8 +1119,8 @@ gimp_dnd_set_svg_data (GtkWidget *widget, gpointer set_svg_data, GtkSelectionData *selection) { - gchar *svg_data; - gint svg_data_length; + const gchar *svg_data; + gint svg_data_length; svg_data = gimp_selection_data_get_svg (selection, &svg_data_length); diff --git a/app/widgets/gimpselectiondata.c b/app/widgets/gimpselectiondata.c index 0d08d0b608..6c57705379 100644 --- a/app/widgets/gimpselectiondata.c +++ b/app/widgets/gimpselectiondata.c @@ -378,24 +378,24 @@ gimp_selection_data_get_color (GtkSelectionData *selection, void gimp_selection_data_set_svg (GtkSelectionData *selection, GdkAtom atom, - const gchar *data, - gint data_length) + const gchar *svg_data, + gint svg_data_length) { g_return_if_fail (selection != NULL); g_return_if_fail (atom != GDK_NONE); - g_return_if_fail (data != NULL); - g_return_if_fail (data_length > 0); + g_return_if_fail (svg_data != NULL); + g_return_if_fail (svg_data_length > 0); gtk_selection_data_set (selection, atom, - 8, (guchar *) data, data_length); + 8, (guchar *) svg_data, svg_data_length); } -gchar * +const gchar * gimp_selection_data_get_svg (GtkSelectionData *selection, - gint *length) + gint *svg_data_length) { g_return_val_if_fail (selection != NULL, NULL); - g_return_val_if_fail (length != NULL, NULL); + g_return_val_if_fail (svg_data_length != NULL, NULL); if ((selection->format != 8) || (selection->length < 1)) { @@ -403,9 +403,9 @@ gimp_selection_data_get_svg (GtkSelectionData *selection, return NULL; } - *length = selection->length; + *svg_data_length = selection->length; - return selection->data; + return (const gchar *) selection->data; } void diff --git a/app/widgets/gimpselectiondata.h b/app/widgets/gimpselectiondata.h index 11776f5021..fec0be78d0 100644 --- a/app/widgets/gimpselectiondata.h +++ b/app/widgets/gimpselectiondata.h @@ -41,10 +41,10 @@ gboolean gimp_selection_data_get_color (GtkSelectionData *selection, void gimp_selection_data_set_svg (GtkSelectionData *selection, GdkAtom atom, - const gchar *data, - gint data_length); -gchar * gimp_selection_data_get_svg (GtkSelectionData *selection, - gint *length); + const gchar *svg_data, + gint svg_data_length); +const gchar * gimp_selection_data_get_svg (GtkSelectionData *selection, + gint *svg_data_length); /* image */