diff options
| author | Benjamin Otte <otte@redhat.com> | 2020-07-24 20:40:36 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2020-07-25 00:47:36 +0200 |
| commit | d375dce9f52fd9830069a6fd9287abde93d3f24b (patch) | |
| tree | cd759ec130e07189ab7f19ebd03b8e89923aaa7f /gtk | |
| parent | d7266b25ba5f2f21a5bd19d0fb88aca530e4d265 (diff) | |
| download | gtk+-d375dce9f52fd9830069a6fd9287abde93d3f24b.tar.gz | |
Replace "gchar" with "char"
Diffstat (limited to 'gtk')
415 files changed, 3606 insertions, 3606 deletions
diff --git a/gtk/a11y/gtkaccessibilityutil.c b/gtk/a11y/gtkaccessibilityutil.c index 8414776bb3..78bef37c3b 100644 --- a/gtk/a11y/gtkaccessibilityutil.c +++ b/gtk/a11y/gtkaccessibilityutil.c @@ -84,13 +84,13 @@ get_root (void) return root; } -static const gchar * +static const char * get_toolkit_name (void) { return "gtk"; } -static const gchar * +static const char * get_toolkit_version (void) { return GTK_VERSION; diff --git a/gtk/a11y/gtkbooleancellaccessible.c b/gtk/a11y/gtkbooleancellaccessible.c index 3074c9f65f..634bfd449d 100644 --- a/gtk/a11y/gtkbooleancellaccessible.c +++ b/gtk/a11y/gtkbooleancellaccessible.c @@ -35,7 +35,7 @@ gtk_boolean_cell_accessible_get_n_actions (AtkAction *action) return parent_action_iface->get_n_actions (action) + 1; } -static const gchar * +static const char * gtk_boolean_cell_accessible_get_description (AtkAction *action, int i) { @@ -45,7 +45,7 @@ gtk_boolean_cell_accessible_get_description (AtkAction *action, return parent_action_iface->get_description (action, i - 1); } -static const gchar * +static const char * gtk_boolean_cell_accessible_action_get_name (AtkAction *action, int i) { @@ -55,7 +55,7 @@ gtk_boolean_cell_accessible_action_get_name (AtkAction *action, return parent_action_iface->get_description (action, i - 1); } -static const gchar * +static const char * gtk_boolean_cell_accessible_action_get_localized_name (AtkAction *action, int i) { diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c index 3afd64644f..b01d5ceefb 100644 --- a/gtk/a11y/gtkbuttonaccessible.c +++ b/gtk/a11y/gtkbuttonaccessible.c @@ -102,10 +102,10 @@ get_label_from_button (GtkWidget *button) return child; } -static const gchar * +static const char * gtk_button_accessible_get_name (AtkObject *obj) { - const gchar *name = NULL; + const char *name = NULL; GtkWidget *widget; GtkWidget *child; @@ -228,11 +228,11 @@ gtk_button_accessible_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_button_accessible_get_keybinding (AtkAction *action, int i) { - gchar *return_value = NULL; + char *return_value = NULL; GtkWidget *widget; GtkWidget *label; guint key_val; @@ -282,7 +282,7 @@ gtk_button_accessible_get_keybinding (AtkAction *action, return return_value; } -static const gchar * +static const char * gtk_button_accessible_action_get_name (AtkAction *action, int i) { @@ -291,7 +291,7 @@ gtk_button_accessible_action_get_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_button_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -300,7 +300,7 @@ gtk_button_accessible_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_button_accessible_action_get_description (AtkAction *action, int i) { @@ -320,7 +320,7 @@ atk_action_interface_init (AtkActionIface *iface) iface->get_description = gtk_button_accessible_action_get_description; } -static const gchar * +static const char * gtk_button_accessible_get_image_description (AtkImage *image) { GtkWidget *widget; @@ -405,7 +405,7 @@ gtk_button_accessible_get_image_size (AtkImage *image, static gboolean gtk_button_accessible_set_image_description (AtkImage *image, - const gchar *description) + const char *description) { GtkWidget *widget; GtkWidget *button_image; diff --git a/gtk/a11y/gtkcellaccessible.c b/gtk/a11y/gtkcellaccessible.c index 51bff40d29..71ef303ea3 100644 --- a/gtk/a11y/gtkcellaccessible.c +++ b/gtk/a11y/gtkcellaccessible.c @@ -230,7 +230,7 @@ gtk_cell_accessible_action_get_n_actions (AtkAction *action) return 3; } -static const gchar * +static const char * gtk_cell_accessible_action_get_name (AtkAction *action, int index) { @@ -247,7 +247,7 @@ gtk_cell_accessible_action_get_name (AtkAction *action, } } -static const gchar * +static const char * gtk_cell_accessible_action_get_localized_name (AtkAction *action, int index) { @@ -264,7 +264,7 @@ gtk_cell_accessible_action_get_localized_name (AtkAction *action, } } -static const gchar * +static const char * gtk_cell_accessible_action_get_description (AtkAction *action, int index) { @@ -281,7 +281,7 @@ gtk_cell_accessible_action_get_description (AtkAction *action, } } -static const gchar * +static const char * gtk_cell_accessible_action_get_keybinding (AtkAction *action, int index) { diff --git a/gtk/a11y/gtkcolorswatchaccessible.c b/gtk/a11y/gtkcolorswatchaccessible.c index 5ee14822b8..8ea77a6590 100644 --- a/gtk/a11y/gtkcolorswatchaccessible.c +++ b/gtk/a11y/gtkcolorswatchaccessible.c @@ -122,14 +122,14 @@ gtk_color_swatch_accessible_get_n_actions (AtkAction *action) return 3; } -static const gchar * +static const char * gtk_color_swatch_accessible_get_keybinding (AtkAction *action, int i) { return NULL; } -static const gchar * +static const char * gtk_color_swatch_accessible_get_name (AtkAction *action, int i) { @@ -142,7 +142,7 @@ gtk_color_swatch_accessible_get_name (AtkAction *action, } } -static const gchar * +static const char * gtk_color_swatch_accessible_get_localized_name (AtkAction *action, int i) { @@ -155,7 +155,7 @@ gtk_color_swatch_accessible_get_localized_name (AtkAction *action, } } -static const gchar * +static const char * gtk_color_swatch_accessible_get_description (AtkAction *action, int i) { diff --git a/gtk/a11y/gtkcomboboxaccessible.c b/gtk/a11y/gtkcomboboxaccessible.c index 2b29ad7457..454b4730f3 100644 --- a/gtk/a11y/gtkcomboboxaccessible.c +++ b/gtk/a11y/gtkcomboboxaccessible.c @@ -23,7 +23,7 @@ struct _GtkComboBoxAccessiblePrivate { - gchar *name; + char *name; int old_selection; gboolean popup_set; }; @@ -95,14 +95,14 @@ gtk_combo_box_accessible_finalize (GObject *object) G_OBJECT_CLASS (gtk_combo_box_accessible_parent_class)->finalize (object); } -static const gchar * +static const char * gtk_combo_box_accessible_get_name (AtkObject *obj) { GtkWidget *widget; GtkComboBox *combo_box; GtkComboBoxAccessible *accessible; GtkTreeIter iter; - const gchar *name; + const char *name; GtkTreeModel *model; int n_columns; int i; @@ -248,7 +248,7 @@ gtk_combo_box_accessible_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_combo_box_accessible_get_keybinding (AtkAction *action, int i) { @@ -260,7 +260,7 @@ gtk_combo_box_accessible_get_keybinding (AtkAction *action, GPtrArray *target; gpointer target_object; guint key_val; - gchar *return_value = NULL; + char *return_value = NULL; if (i != 0) return NULL; @@ -293,7 +293,7 @@ gtk_combo_box_accessible_get_keybinding (AtkAction *action, return return_value; } -static const gchar * +static const char * gtk_combo_box_accessible_action_get_name (AtkAction *action, int i) { @@ -302,7 +302,7 @@ gtk_combo_box_accessible_action_get_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_combo_box_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -311,7 +311,7 @@ gtk_combo_box_accessible_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_combo_box_accessible_action_get_description (AtkAction *action, int i) { diff --git a/gtk/a11y/gtkentryaccessible.c b/gtk/a11y/gtkentryaccessible.c index 88a7ffcbcc..19eec7ef49 100644 --- a/gtk/a11y/gtkentryaccessible.c +++ b/gtk/a11y/gtkentryaccessible.c @@ -111,8 +111,8 @@ gtk_entry_icon_accessible_initialize (AtkObject *obj, GtkEntryIconAccessible *icon = GTK_ENTRY_ICON_ACCESSIBLE (obj); GtkWidget *widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (icon->entry)); GtkEntry *gtk_entry = GTK_ENTRY (widget); - const gchar *name; - gchar *text; + const char *name; + char *text; ATK_OBJECT_CLASS (gtk_entry_icon_accessible_parent_class)->initialize (obj, data); atk_object_set_role (obj, ATK_ROLE_ICON); @@ -255,7 +255,7 @@ gtk_entry_icon_accessible_get_n_actions (AtkAction *action) return (gtk_entry_get_icon_activatable (gtk_entry, icon->pos) ? 1 : 0); } -static const gchar * +static const char * gtk_entry_icon_accessible_get_name (AtkAction *action, int i) { @@ -418,7 +418,7 @@ check_for_selection_change (GtkEntryAccessible *accessible, static void insert_text_cb (GtkEditable *editable, - gchar *new_text, + char *new_text, int new_text_length, int *position, GtkEntryAccessible *self) @@ -455,7 +455,7 @@ delete_text_cb (GtkEditable *editable, if (end < 0) { - gchar *text; + char *text; text = gtk_text_get_display_text (textw, 0, -1); end = g_utf8_strlen (text, -1); @@ -556,7 +556,7 @@ on_notify (GObject *gobject, { if (priv->icons[GTK_ENTRY_ICON_PRIMARY]) { - const gchar *name; + const char *name; name = gtk_entry_get_icon_name (GTK_ENTRY (widget), GTK_ENTRY_ICON_PRIMARY); if (name) atk_object_set_name (priv->icons[GTK_ENTRY_ICON_PRIMARY], name); @@ -566,7 +566,7 @@ on_notify (GObject *gobject, { if (priv->icons[GTK_ENTRY_ICON_SECONDARY]) { - const gchar *name; + const char *name; name = gtk_entry_get_icon_name (GTK_ENTRY (widget), GTK_ENTRY_ICON_SECONDARY); if (name) atk_object_set_name (priv->icons[GTK_ENTRY_ICON_SECONDARY], name); @@ -576,7 +576,7 @@ on_notify (GObject *gobject, { if (priv->icons[GTK_ENTRY_ICON_PRIMARY]) { - gchar *text; + char *text; text = gtk_entry_get_icon_tooltip_text (GTK_ENTRY (widget), GTK_ENTRY_ICON_PRIMARY); if (text) { @@ -593,7 +593,7 @@ on_notify (GObject *gobject, { if (priv->icons[GTK_ENTRY_ICON_SECONDARY]) { - gchar *text; + char *text; text = gtk_entry_get_icon_tooltip_text (GTK_ENTRY (widget), GTK_ENTRY_ICON_SECONDARY); if (text) { @@ -831,7 +831,7 @@ gtk_entry_accessible_init (GtkEntryAccessible *entry) ATK_OBJECT (entry)->role = ATK_ROLE_TEXT; } -static gchar * +static char * gtk_entry_accessible_get_text (AtkText *atk_text, int start_pos, int end_pos) @@ -846,7 +846,7 @@ gtk_entry_accessible_get_text (AtkText *atk_text, return gtk_text_get_display_text (text, start_pos, end_pos); } -static gchar * +static char * gtk_entry_accessible_get_text_before_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -865,7 +865,7 @@ gtk_entry_accessible_get_text_before_offset (AtkText *atk_text, start_offset, end_offset); } -static gchar * +static char * gtk_entry_accessible_get_text_at_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -884,7 +884,7 @@ gtk_entry_accessible_get_text_at_offset (AtkText *atk_text, start_offset, end_offset); } -static gchar * +static char * gtk_entry_accessible_get_text_after_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -1033,7 +1033,7 @@ gtk_entry_accessible_get_character_extents (AtkText *atk_text, { GtkText *textw; PangoRectangle char_rect; - gchar *entry_text; + char *entry_text; int index, x_layout, y_layout; GtkAllocation allocation; @@ -1065,7 +1065,7 @@ gtk_entry_accessible_get_offset_at_point (AtkText *atk_text, AtkCoordType coords) { GtkText *textw; - gchar *text; + char *text; int index, x_layout, y_layout; int x_local, y_local; glong offset; @@ -1118,7 +1118,7 @@ gtk_entry_accessible_get_n_selections (AtkText *text) return 0; } -static gchar * +static char * gtk_entry_accessible_get_selection (AtkText *text, int selection_num, int *start_pos, @@ -1216,8 +1216,8 @@ gtk_entry_accessible_get_character_at_offset (AtkText *atk_text, int offset) { GtkText *textw; - gchar *text; - gchar *index; + char *text; + char *index; gunichar result; result = '\0'; @@ -1265,7 +1265,7 @@ atk_text_interface_init (AtkTextIface *iface) static void gtk_entry_accessible_set_text_contents (AtkEditableText *text, - const gchar *string) + const char *string) { GtkWidget *widget; @@ -1281,7 +1281,7 @@ gtk_entry_accessible_set_text_contents (AtkEditableText *text, static void gtk_entry_accessible_insert_text (AtkEditableText *text, - const gchar *string, + const char *string, int length, int *position) { @@ -1307,7 +1307,7 @@ gtk_entry_accessible_copy_text (AtkEditableText *text, { GtkWidget *widget; GtkEditable *editable; - gchar *str; + char *str; GdkClipboard *clipboard; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -1328,7 +1328,7 @@ gtk_entry_accessible_cut_text (AtkEditableText *text, { GtkWidget *widget; GtkEditable *editable; - gchar *str; + char *str; GdkClipboard *clipboard; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -1453,7 +1453,7 @@ gtk_entry_accessible_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_entry_accessible_get_keybinding (AtkAction *action, int i) { @@ -1498,7 +1498,7 @@ gtk_entry_accessible_get_keybinding (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_entry_accessible_action_get_name (AtkAction *action, int i) { @@ -1507,7 +1507,7 @@ gtk_entry_accessible_action_get_name (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_entry_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -1516,7 +1516,7 @@ gtk_entry_accessible_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_entry_accessible_action_get_description (AtkAction *action, int i) { diff --git a/gtk/a11y/gtkexpanderaccessible.c b/gtk/a11y/gtkexpanderaccessible.c index 8644675d11..1610363beb 100644 --- a/gtk/a11y/gtkexpanderaccessible.c +++ b/gtk/a11y/gtkexpanderaccessible.c @@ -27,7 +27,7 @@ static void atk_action_interface_init (AtkActionIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, gtk_expander_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) -static const gchar * +static const char * gtk_expander_accessible_get_full_text (GtkExpander *widget) { GtkWidget *label_widget; @@ -40,11 +40,11 @@ gtk_expander_accessible_get_full_text (GtkExpander *widget) return gtk_label_get_text (GTK_LABEL (label_widget)); } -static const gchar * +static const char * gtk_expander_accessible_get_name (AtkObject *obj) { GtkWidget *widget; - const gchar *name; + const char *name; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); if (widget == NULL) @@ -184,11 +184,11 @@ gtk_expander_accessible_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_expander_accessible_get_keybinding (AtkAction *action, int i) { - gchar *return_value = NULL; + char *return_value = NULL; GtkWidget *widget; GtkWidget *label; @@ -212,7 +212,7 @@ gtk_expander_accessible_get_keybinding (AtkAction *action, return return_value; } -static const gchar * +static const char * gtk_expander_accessible_action_get_name (AtkAction *action, int i) { @@ -221,7 +221,7 @@ gtk_expander_accessible_action_get_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_expander_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -230,7 +230,7 @@ gtk_expander_accessible_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_expander_accessible_action_get_description (AtkAction *action, int i) { diff --git a/gtk/a11y/gtkframeaccessible.c b/gtk/a11y/gtkframeaccessible.c index 7f80a7b813..7c59bb237f 100644 --- a/gtk/a11y/gtkframeaccessible.c +++ b/gtk/a11y/gtkframeaccessible.c @@ -33,10 +33,10 @@ gtk_frame_accessible_initialize (AtkObject *accessible, accessible->role = ATK_ROLE_PANEL; } -static const gchar * +static const char * gtk_frame_accessible_get_name (AtkObject *obj) { - const gchar *name; + const char *name; GtkWidget *widget; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); diff --git a/gtk/a11y/gtkiconviewaccessible.c b/gtk/a11y/gtkiconviewaccessible.c index 4a4fd8e9a1..ded31c5e2b 100644 --- a/gtk/a11y/gtkiconviewaccessible.c +++ b/gtk/a11y/gtkiconviewaccessible.c @@ -45,9 +45,9 @@ typedef struct GtkIconViewItem *item; GtkWidget *widget; AtkStateSet *state_set; - gchar *text; - gchar *action_description; - gchar *image_description; + char *text; + char *action_description; + char *image_description; guint action_idle_handler; } GtkIconViewItemAccessible; @@ -126,7 +126,7 @@ gtk_icon_view_item_accessible_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_icon_view_item_accessible_get_description (AtkAction *action, int i) { @@ -143,7 +143,7 @@ gtk_icon_view_item_accessible_get_description (AtkAction *action, return "Activate item"; } -static const gchar * +static const char * gtk_icon_view_item_accessible_get_name (AtkAction *action, int i) { @@ -156,7 +156,7 @@ gtk_icon_view_item_accessible_get_name (AtkAction *action, static gboolean gtk_icon_view_item_accessible_set_description (AtkAction *action, int i, - const gchar *description) + const char *description) { GtkIconViewItemAccessible *item; @@ -181,7 +181,7 @@ atk_action_item_interface_init (AtkActionIface *iface) iface->get_description = gtk_icon_view_item_accessible_get_description; } -static const gchar * +static const char * gtk_icon_view_item_accessible_get_image_description (AtkImage *image) { GtkIconViewItemAccessible *item; @@ -193,7 +193,7 @@ gtk_icon_view_item_accessible_get_image_description (AtkImage *image) static gboolean gtk_icon_view_item_accessible_set_image_description (AtkImage *image, - const gchar *description) + const char *description) { GtkIconViewItemAccessible *item; @@ -247,7 +247,7 @@ get_pixbuf_box (GtkIconView *icon_view, static gboolean get_text_foreach (GtkCellRenderer *renderer, - gchar **text) + char **text) { if (GTK_IS_CELL_RENDERER_TEXT (renderer)) { @@ -257,11 +257,11 @@ get_text_foreach (GtkCellRenderer *renderer, return FALSE; } -static gchar * +static char * get_text (GtkIconView *icon_view, GtkIconViewItem *item) { - gchar *text = NULL; + char *text = NULL; _gtk_icon_view_set_cell_data (icon_view, item); gtk_cell_area_foreach (icon_view->priv->cell_area, @@ -334,7 +334,7 @@ atk_image_item_interface_init (AtkImageIface *iface) iface->get_image_position = gtk_icon_view_item_accessible_get_image_position; } -static gchar * +static char * gtk_icon_view_item_accessible_get_text (AtkText *text, int start_pos, int end_pos) @@ -356,8 +356,8 @@ gtk_icon_view_item_accessible_get_character_at_offset (AtkText *text, int offset) { GtkIconViewItemAccessible *item; - gchar *string; - gchar *index; + char *string; + char *index; item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (text); if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT)) @@ -386,7 +386,7 @@ create_pango_layout (GtkIconViewItemAccessible *item) return layout; } -static gchar * +static char * gtk_icon_view_item_accessible_get_text_before_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -395,7 +395,7 @@ gtk_icon_view_item_accessible_get_text_before_offset (AtkText *atk_text, { GtkIconViewItemAccessible *item; PangoLayout *layout; - gchar *text; + char *text; item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (atk_text); if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT)) @@ -408,7 +408,7 @@ gtk_icon_view_item_accessible_get_text_before_offset (AtkText *atk_text, return text; } -static gchar * +static char * gtk_icon_view_item_accessible_get_text_at_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -417,7 +417,7 @@ gtk_icon_view_item_accessible_get_text_at_offset (AtkText *atk_text, { GtkIconViewItemAccessible *item; PangoLayout *layout; - gchar *text; + char *text; item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (atk_text); if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT)) @@ -430,7 +430,7 @@ gtk_icon_view_item_accessible_get_text_at_offset (AtkText *atk_text, return text; } -static gchar * +static char * gtk_icon_view_item_accessible_get_text_after_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -439,7 +439,7 @@ gtk_icon_view_item_accessible_get_text_after_offset (AtkText *atk_text, { GtkIconViewItemAccessible *item; PangoLayout *layout; - gchar *text; + char *text; item = GTK_ICON_VIEW_ITEM_ACCESSIBLE (atk_text); if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT)) @@ -480,7 +480,7 @@ gtk_icon_view_item_accessible_get_character_extents (AtkText *text, #if 0 GtkIconView *icon_view; PangoRectangle char_rect; - const gchar *item_text; + const char *item_text; int index; #endif @@ -520,7 +520,7 @@ gtk_icon_view_item_accessible_get_offset_at_point (AtkText *text, int offset = 0; #if 0 GtkIconView *icon_view; - const gchar *item_text; + const char *item_text; int index; int l_x, l_y; #endif diff --git a/gtk/a11y/gtkimageaccessible.c b/gtk/a11y/gtkimageaccessible.c index 98e6d5843d..a86a1074ef 100644 --- a/gtk/a11y/gtkimageaccessible.c +++ b/gtk/a11y/gtkimageaccessible.c @@ -25,8 +25,8 @@ struct _GtkImageAccessiblePrivate { - gchar *image_description; - gchar *stock_name; + char *image_description; + char *stock_name; }; static void atk_image_interface_init (AtkImageIface *iface); @@ -45,8 +45,8 @@ gtk_image_accessible_initialize (AtkObject *accessible, } typedef struct { - const gchar *name; - const gchar *label; + const char *name; + const char *label; } NameMapEntry; static const NameMapEntry name_map[] = { @@ -129,11 +129,11 @@ static const NameMapEntry name_map[] = { }; /* GTK+ internal methods */ -static gchar * -elide_underscores (const gchar *original) +static char * +elide_underscores (const char *original) { - gchar *q, *result; - const gchar *p, *end; + char *q, *result; + const char *p, *end; gsize len; gboolean last_underscore; @@ -172,11 +172,11 @@ elide_underscores (const gchar *original) return result; } -static gchar * -name_from_icon_name (const gchar *icon_name) +static char * +name_from_icon_name (const char *icon_name) { - gchar *name; - const gchar *label; + char *name; + const char *label; int i; name = g_strdup (icon_name); @@ -209,13 +209,13 @@ gtk_image_accessible_finalize (GObject *object) G_OBJECT_CLASS (gtk_image_accessible_parent_class)->finalize (object); } -static const gchar * +static const char * gtk_image_accessible_get_name (AtkObject *accessible) { GtkWidget* widget; GtkImage *image; GtkImageAccessible *image_accessible; - const gchar *name; + const char *name; GtkImageType storage_type; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); @@ -241,7 +241,7 @@ gtk_image_accessible_get_name (AtkObject *accessible) else if (storage_type == GTK_IMAGE_GICON) { GIcon *icon; - const gchar * const *icon_names; + const char * const *icon_names; icon = gtk_image_get_gicon (image); if (G_IS_THEMED_ICON (icon)) @@ -271,7 +271,7 @@ gtk_image_accessible_init (GtkImageAccessible *image) image->priv = gtk_image_accessible_get_instance_private (image); } -static const gchar * +static const char * gtk_image_accessible_get_image_description (AtkImage *image) { GtkImageAccessible *accessible = GTK_IMAGE_ACCESSIBLE (image); @@ -318,7 +318,7 @@ gtk_image_accessible_get_image_size (AtkImage *image, static gboolean gtk_image_accessible_set_image_description (AtkImage *image, - const gchar *description) + const char *description) { GtkImageAccessible* accessible = GTK_IMAGE_ACCESSIBLE (image); diff --git a/gtk/a11y/gtkimagecellaccessible.c b/gtk/a11y/gtkimagecellaccessible.c index 56827237f7..4deb292cd6 100644 --- a/gtk/a11y/gtkimagecellaccessible.c +++ b/gtk/a11y/gtkimagecellaccessible.c @@ -22,7 +22,7 @@ struct _GtkImageCellAccessiblePrivate { - gchar *image_description; + char *image_description; }; static void atk_image_interface_init (AtkImageIface *iface); @@ -54,7 +54,7 @@ gtk_image_cell_accessible_init (GtkImageCellAccessible *image_cell) image_cell->priv = gtk_image_cell_accessible_get_instance_private (image_cell); } -static const gchar * +static const char * gtk_image_cell_accessible_get_image_description (AtkImage *image) { GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image); @@ -64,7 +64,7 @@ gtk_image_cell_accessible_get_image_description (AtkImage *image) static gboolean gtk_image_cell_accessible_set_image_description (AtkImage *image, - const gchar *description) + const char *description) { GtkImageCellAccessible *image_cell = GTK_IMAGE_CELL_ACCESSIBLE (image); diff --git a/gtk/a11y/gtklabelaccessible.c b/gtk/a11y/gtklabelaccessible.c index 7c53c309f0..ce20a4fb5e 100644 --- a/gtk/a11y/gtklabelaccessible.c +++ b/gtk/a11y/gtklabelaccessible.c @@ -173,13 +173,13 @@ static void atk_action_interface_init (AtkActionIface *iface); G_DEFINE_TYPE_WITH_CODE (GtkLabelAccessibleLink, _gtk_label_accessible_link, ATK_TYPE_HYPERLINK, G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)) -static gchar * +static char * gtk_label_accessible_link_get_uri (AtkHyperlink *atk_link, int i) { GtkLabelAccessibleLink *link = (GtkLabelAccessibleLink *)atk_link; GtkWidget *widget; - const gchar *uri; + const char *uri; g_return_val_if_fail (i == 0, NULL); @@ -313,7 +313,7 @@ gtk_label_accessible_link_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_label_accessible_link_get_name (AtkAction *action, int i) { @@ -458,10 +458,10 @@ gtk_label_accessible_ref_relation_set (AtkObject *obj) return relation_set; } -static const gchar* +static const char * gtk_label_accessible_get_name (AtkObject *accessible) { - const gchar *name; + const char *name; g_return_val_if_fail (GTK_IS_LABEL_ACCESSIBLE (accessible), NULL); @@ -686,13 +686,13 @@ _gtk_label_accessible_focus_link_changed (GtkLabel *label) /* AtkText implementation {{{2 */ -static gchar* +static char * gtk_label_accessible_get_text (AtkText *atk_text, int start_pos, int end_pos) { GtkWidget *widget; - const gchar *text; + const char *text; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text)); if (widget == NULL) @@ -703,7 +703,7 @@ gtk_label_accessible_get_text (AtkText *atk_text, if (text) { guint length; - const gchar *start, *end; + const char *start, *end; length = g_utf8_strlen (text, -1); if (end_pos < 0 || end_pos > length) @@ -720,7 +720,7 @@ gtk_label_accessible_get_text (AtkText *atk_text, return NULL; } -static gchar * +static char * gtk_label_accessible_get_text_before_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -738,7 +738,7 @@ gtk_label_accessible_get_text_before_offset (AtkText *text, start_offset, end_offset); } -static gchar* +static char * gtk_label_accessible_get_text_at_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -756,7 +756,7 @@ gtk_label_accessible_get_text_at_offset (AtkText *text, start_offset, end_offset); } -static gchar* +static char * gtk_label_accessible_get_text_after_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -778,7 +778,7 @@ static int gtk_label_accessible_get_character_count (AtkText *atk_text) { GtkWidget *widget; - const gchar *text; + const char *text; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text)); if (widget == NULL) @@ -844,7 +844,7 @@ gtk_label_accessible_get_n_selections (AtkText *text) return 0; } -static gchar * +static char * gtk_label_accessible_get_selection (AtkText *atk_text, int selection_num, int *start_pos, @@ -864,7 +864,7 @@ gtk_label_accessible_get_selection (AtkText *atk_text, if (gtk_label_get_selection_bounds (label, start_pos, end_pos)) { - const gchar *text; + const char *text; text = gtk_label_get_text (label); @@ -974,7 +974,7 @@ gtk_label_accessible_get_character_extents (AtkText *text, GtkWidget *widget; GtkLabel *label; PangoRectangle char_rect; - const gchar *label_text; + const char *label_text; int index, x_layout, y_layout; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -1003,7 +1003,7 @@ gtk_label_accessible_get_offset_at_point (AtkText *atk_text, { GtkWidget *widget; GtkLabel *label; - const gchar *text; + const char *text; int index, x_layout, y_layout; int x_local, y_local; @@ -1041,7 +1041,7 @@ gtk_label_accessible_get_offset_at_point (AtkText *atk_text, static AtkAttributeSet * add_attribute (AtkAttributeSet *attributes, AtkTextAttribute attr, - const gchar *value) + const char *value) { AtkAttribute *at; @@ -1105,8 +1105,8 @@ gtk_label_accessible_get_character_at_offset (AtkText *atk_text, int offset) { GtkWidget *widget; - const gchar *text; - gchar *index; + const char *text; + char *index; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text)); if (widget == NULL) diff --git a/gtk/a11y/gtklevelbaraccessible.c b/gtk/a11y/gtklevelbaraccessible.c index 071845a167..a8054c204d 100644 --- a/gtk/a11y/gtklevelbaraccessible.c +++ b/gtk/a11y/gtklevelbaraccessible.c @@ -125,7 +125,7 @@ gtk_level_bar_accessible_set_current_value (AtkValue *obj, static void gtk_level_bar_accessible_get_value_and_text (AtkValue *obj, gdouble *value, - gchar **text) + char **text) { GtkWidget *widget; GtkLevelBar *level_bar; diff --git a/gtk/a11y/gtklinkbuttonaccessible.c b/gtk/a11y/gtklinkbuttonaccessible.c index 1a218940a1..f5738a78d3 100644 --- a/gtk/a11y/gtklinkbuttonaccessible.c +++ b/gtk/a11y/gtklinkbuttonaccessible.c @@ -58,13 +58,13 @@ gtk_link_button_accessible_link_new (GtkLinkButtonAccessible *button) return ATK_HYPERLINK (l); } -static gchar * +static char * gtk_link_button_accessible_link_get_uri (AtkHyperlink *atk_link, int i) { GtkLinkButtonAccessibleLink *l = (GtkLinkButtonAccessibleLink *)atk_link; GtkWidget *widget; - const gchar *uri; + const char *uri; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (l->button)); uri = gtk_link_button_get_uri (GTK_LINK_BUTTON (widget)); @@ -137,7 +137,7 @@ gtk_link_button_accessible_link_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_link_button_accessible_link_get_name (AtkAction *action, int i) { diff --git a/gtk/a11y/gtklockbuttonaccessible.c b/gtk/a11y/gtklockbuttonaccessible.c index 0e3216dcde..a7b878838c 100644 --- a/gtk/a11y/gtklockbuttonaccessible.c +++ b/gtk/a11y/gtklockbuttonaccessible.c @@ -24,7 +24,7 @@ G_DEFINE_TYPE (GtkLockButtonAccessible, gtk_lock_button_accessible, GTK_TYPE_BUTTON_ACCESSIBLE) -static const gchar * +static const char * gtk_lock_button_accessible_get_name (AtkObject *obj) { GtkLockButton *lockbutton; diff --git a/gtk/a11y/gtkmenubuttonaccessible.c b/gtk/a11y/gtkmenubuttonaccessible.c index 914fa704f5..cdd2792e06 100644 --- a/gtk/a11y/gtkmenubuttonaccessible.c +++ b/gtk/a11y/gtkmenubuttonaccessible.c @@ -60,10 +60,10 @@ gtk_menu_button_accessible_ref_child (AtkObject *obj, return accessible; } -static const gchar * +static const char * gtk_menu_button_accessible_get_name (AtkObject *obj) { - const gchar *name = NULL; + const char *name = NULL; GtkWidget *widget; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); diff --git a/gtk/a11y/gtknotebookpageaccessible.c b/gtk/a11y/gtknotebookpageaccessible.c index dfa199ad51..0d8c37ce9e 100644 --- a/gtk/a11y/gtknotebookpageaccessible.c +++ b/gtk/a11y/gtknotebookpageaccessible.c @@ -78,7 +78,7 @@ get_label_from_notebook_page (GtkNotebookPageAccessible *page) return find_label_child (child); } -static const gchar * +static const char * gtk_notebook_page_accessible_get_name (AtkObject *accessible) { GtkWidget *label; diff --git a/gtk/a11y/gtkpanedaccessible.c b/gtk/a11y/gtkpanedaccessible.c index 8d2791166a..475b65b626 100644 --- a/gtk/a11y/gtkpanedaccessible.c +++ b/gtk/a11y/gtkpanedaccessible.c @@ -144,7 +144,7 @@ gtk_paned_accessible_set_current_value (AtkValue *obj, static void gtk_paned_accessible_get_value_and_text (AtkValue *obj, gdouble *value, - gchar **text) + char **text) { GtkWidget *widget; GtkPaned *paned; diff --git a/gtk/a11y/gtkpasswordentryaccessible.c b/gtk/a11y/gtkpasswordentryaccessible.c index 9cb060ad22..350f681926 100644 --- a/gtk/a11y/gtkpasswordentryaccessible.c +++ b/gtk/a11y/gtkpasswordentryaccessible.c @@ -190,7 +190,7 @@ atk_text_interface_init (AtkTextIface *iface) static void gtk_password_entry_accessible_set_text_contents (AtkEditableText *text, - const gchar *string) + const char *string) { GtkWidget *widget; @@ -206,7 +206,7 @@ gtk_password_entry_accessible_set_text_contents (AtkEditableText *text, static void gtk_password_entry_accessible_insert_text (AtkEditableText *text, - const gchar *string, + const char *string, int length, int *position) { @@ -362,7 +362,7 @@ gtk_password_entry_accessible_get_n_actions (AtkAction *action) return n_actions; } -static const gchar * +static const char * gtk_password_entry_accessible_get_keybinding (AtkAction *action, int i) { @@ -407,7 +407,7 @@ gtk_password_entry_accessible_get_keybinding (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_password_entry_accessible_action_get_name (AtkAction *action, int i) { @@ -426,7 +426,7 @@ gtk_password_entry_accessible_action_get_name (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_password_entry_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -438,7 +438,7 @@ gtk_password_entry_accessible_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_password_entry_accessible_action_get_description (AtkAction *action, int i) { @@ -551,7 +551,7 @@ on_selection_bound_changed (GObject *gobject, static void insert_text_cb (GtkEditable *editable, - gchar *new_text, + char *new_text, int new_text_length, int *position, GtkPasswordEntryAccessible *self) diff --git a/gtk/a11y/gtkpictureaccessible.c b/gtk/a11y/gtkpictureaccessible.c index ce8b449557..7e4b10b3f0 100644 --- a/gtk/a11y/gtkpictureaccessible.c +++ b/gtk/a11y/gtkpictureaccessible.c @@ -33,7 +33,7 @@ struct _GtkPictureAccessibleClass GtkWidgetAccessibleClass parent_class; }; -static const gchar * +static const char * gtk_picture_accessible_get_image_description (AtkImage *image) { GtkWidget* widget; @@ -103,11 +103,11 @@ gtk_picture_accessible_initialize (AtkObject *accessible, accessible->role = ATK_ROLE_IMAGE; } -static const gchar * +static const char * gtk_picture_accessible_get_name (AtkObject *accessible) { GtkWidget* widget; - const gchar *name; + const char *name; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) diff --git a/gtk/a11y/gtkprogressbaraccessible.c b/gtk/a11y/gtkprogressbaraccessible.c index 99aaf95624..517f845184 100644 --- a/gtk/a11y/gtkprogressbaraccessible.c +++ b/gtk/a11y/gtkprogressbaraccessible.c @@ -79,7 +79,7 @@ gtk_progress_bar_accessible_get_minimum_value (AtkValue *obj, static void gtk_progress_bar_accessible_get_value_and_text (AtkValue *obj, gdouble *value, - gchar **text) + char **text) { GtkWidget *widget; diff --git a/gtk/a11y/gtkrangeaccessible.c b/gtk/a11y/gtkrangeaccessible.c index 5675e08c4b..8650f7c452 100644 --- a/gtk/a11y/gtkrangeaccessible.c +++ b/gtk/a11y/gtkrangeaccessible.c @@ -224,7 +224,7 @@ gtk_range_accessible_set_current_value (AtkValue *obj, static void gtk_range_accessible_get_value_and_text (AtkValue *obj, gdouble *value, - gchar **text) + char **text) { GtkWidget *widget; GtkAdjustment *adjustment; diff --git a/gtk/a11y/gtkscaleaccessible.c b/gtk/a11y/gtkscaleaccessible.c index 1a8be87793..b369b449a7 100644 --- a/gtk/a11y/gtkscaleaccessible.c +++ b/gtk/a11y/gtkscaleaccessible.c @@ -22,7 +22,7 @@ G_DEFINE_TYPE (GtkScaleAccessible, gtk_scale_accessible, GTK_TYPE_RANGE_ACCESSIBLE) -static const gchar * +static const char * gtk_scale_accessible_get_description (AtkObject *object) { GtkWidget *widget; diff --git a/gtk/a11y/gtkscalebuttonaccessible.c b/gtk/a11y/gtkscalebuttonaccessible.c index 33e01b2150..7c31735a21 100644 --- a/gtk/a11y/gtkscalebuttonaccessible.c +++ b/gtk/a11y/gtkscalebuttonaccessible.c @@ -158,7 +158,7 @@ gtk_scale_button_accessible_get_n_actions (AtkAction *action) return 2; } -static const gchar * +static const char * gtk_scale_button_accessible_get_description (AtkAction *action, int i) { @@ -173,7 +173,7 @@ gtk_scale_button_accessible_get_description (AtkAction *action, } } -static const gchar * +static const char * gtk_scale_button_accessible_action_get_name (AtkAction *action, int i) { @@ -188,7 +188,7 @@ gtk_scale_button_accessible_action_get_name (AtkAction *action, } } -static const gchar * +static const char * gtk_scale_button_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -301,7 +301,7 @@ gtk_scale_button_accessible_set_current_value (AtkValue *obj, static void gtk_scale_button_accessible_get_value_and_text (AtkValue *obj, gdouble *value, - gchar **text) + char **text) { GtkWidget *widget; GtkAdjustment *adjustment; diff --git a/gtk/a11y/gtksearchentryaccessible.c b/gtk/a11y/gtksearchentryaccessible.c index 47b23e1167..27b009971e 100644 --- a/gtk/a11y/gtksearchentryaccessible.c +++ b/gtk/a11y/gtksearchentryaccessible.c @@ -94,7 +94,7 @@ check_for_selection_change (GtkSearchEntryAccessible *self, static void insert_text_cb (GtkEditable *editable, - gchar *new_text, + char *new_text, int new_text_length, int *position, GtkSearchEntryAccessible *self) @@ -278,7 +278,7 @@ gtk_search_entry_accessible_init (GtkSearchEntryAccessible *self) atk_object_set_name (atk_obj, _("Search")); } -static gchar * +static char * gtk_search_entry_accessible_get_text (AtkText *atk_text, int start_pos, int end_pos) @@ -291,7 +291,7 @@ gtk_search_entry_accessible_get_text (AtkText *atk_text, return gtk_text_get_display_text (text, start_pos, end_pos); } -static gchar * +static char * gtk_search_entry_accessible_get_text_before_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -308,7 +308,7 @@ gtk_search_entry_accessible_get_text_before_offset (AtkText *atk_text, start_offset, end_offset); } -static gchar * +static char * gtk_search_entry_accessible_get_text_at_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -325,7 +325,7 @@ gtk_search_entry_accessible_get_text_at_offset (AtkText *atk_text, start_offset, end_offset); } -static gchar * +static char * gtk_search_entry_accessible_get_text_after_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -537,7 +537,7 @@ gtk_search_entry_accessible_get_n_selections (AtkText *text) return 0; } -static gchar * +static char * gtk_search_entry_accessible_get_selection (AtkText *text, int selection_num, int *start_pos, @@ -693,7 +693,7 @@ atk_text_interface_init (AtkTextIface *iface) static void gtk_search_entry_accessible_set_text_contents (AtkEditableText *text, - const gchar *string) + const char *string) { GtkWidget *widget; @@ -709,7 +709,7 @@ gtk_search_entry_accessible_set_text_contents (AtkEditableText *text, static void gtk_search_entry_accessible_insert_text (AtkEditableText *text, - const gchar *string, + const char *string, int length, int *position) { @@ -909,7 +909,7 @@ gtk_search_entry_accessible_get_n_actions (AtkAction *action) return n_actions; } -static const gchar * +static const char * gtk_search_entry_accessible_get_keybinding (AtkAction *action, int i) { @@ -954,7 +954,7 @@ gtk_search_entry_accessible_get_keybinding (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_search_entry_accessible_action_get_name (AtkAction *action, int i) { @@ -973,7 +973,7 @@ gtk_search_entry_accessible_action_get_name (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_search_entry_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -985,7 +985,7 @@ gtk_search_entry_accessible_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_search_entry_accessible_action_get_description (AtkAction *action, int i) { diff --git a/gtk/a11y/gtkspinbuttonaccessible.c b/gtk/a11y/gtkspinbuttonaccessible.c index 01e2a15634..879a1eb132 100644 --- a/gtk/a11y/gtkspinbuttonaccessible.c +++ b/gtk/a11y/gtkspinbuttonaccessible.c @@ -202,7 +202,7 @@ gtk_spin_button_accessible_set_current_value (AtkValue *obj, static void gtk_spin_button_accessible_get_value_and_text (AtkValue *obj, gdouble *value, - gchar **text) + char **text) { GtkWidget *widget; GtkAdjustment *adjustment; diff --git a/gtk/a11y/gtkstatusbaraccessible.c b/gtk/a11y/gtkstatusbaraccessible.c index 95e2f02c98..b2be32a9b0 100644 --- a/gtk/a11y/gtkstatusbaraccessible.c +++ b/gtk/a11y/gtkstatusbaraccessible.c @@ -28,7 +28,7 @@ G_DEFINE_TYPE (GtkStatusbarAccessible, gtk_statusbar_accessible, GTK_TYPE_WIDGET static void text_changed (GtkStatusbar *statusbar, guint context_id, - const gchar *text, + const char *text, AtkObject *obj) { if (!obj->name) @@ -52,10 +52,10 @@ gtk_statusbar_accessible_initialize (AtkObject *obj, obj->role = ATK_ROLE_STATUSBAR; } -static const gchar * +static const char * gtk_statusbar_accessible_get_name (AtkObject *obj) { - const gchar *name; + const char *name; GtkWidget *widget; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); diff --git a/gtk/a11y/gtkswitchaccessible.c b/gtk/a11y/gtkswitchaccessible.c index 985321499f..1b63ee4806 100644 --- a/gtk/a11y/gtkswitchaccessible.c +++ b/gtk/a11y/gtkswitchaccessible.c @@ -72,7 +72,7 @@ gtk_switch_action_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_switch_action_get_name (AtkAction *action, int i) { @@ -81,7 +81,7 @@ gtk_switch_action_get_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_switch_action_get_localized_name (AtkAction *action, int i) { @@ -90,7 +90,7 @@ gtk_switch_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar * +static const char * gtk_switch_action_get_description (AtkAction *action, int i) { diff --git a/gtk/a11y/gtktextaccessible.c b/gtk/a11y/gtktextaccessible.c index d71a7869b6..66f110aa46 100644 --- a/gtk/a11y/gtktextaccessible.c +++ b/gtk/a11y/gtktextaccessible.c @@ -38,7 +38,7 @@ struct _GtkTextAccessiblePrivate /* Callbacks */ static void insert_text_cb (GtkEditable *editable, - gchar *new_text, + char *new_text, int new_text_length, int *position); static void delete_text_cb (GtkEditable *editable, @@ -88,7 +88,7 @@ gtk_text_accessible_get_attributes (AtkObject *accessible) GtkWidget *widget; AtkAttributeSet *attributes; AtkAttribute *placeholder_text; - const gchar *text; + const char *text; attributes = ATK_OBJECT_CLASS (gtk_text_accessible_parent_class)->get_attributes (accessible); @@ -229,7 +229,7 @@ gtk_text_accessible_init (GtkTextAccessible *entry) entry->priv->selection_bound = 0; } -static gchar * +static char * gtk_text_accessible_get_text (AtkText *atk_text, int start_pos, int end_pos) @@ -243,7 +243,7 @@ gtk_text_accessible_get_text (AtkText *atk_text, return gtk_text_get_display_text (GTK_TEXT (widget), start_pos, end_pos); } -static gchar * +static char * gtk_text_accessible_get_text_before_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -261,7 +261,7 @@ gtk_text_accessible_get_text_before_offset (AtkText *text, start_offset, end_offset); } -static gchar * +static char * gtk_text_accessible_get_text_at_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -279,7 +279,7 @@ gtk_text_accessible_get_text_at_offset (AtkText *text, start_offset, end_offset); } -static gchar * +static char * gtk_text_accessible_get_text_after_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -301,7 +301,7 @@ static int gtk_text_accessible_get_character_count (AtkText *atk_text) { GtkWidget *widget; - gchar *text; + char *text; glong char_count; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text)); @@ -425,7 +425,7 @@ gtk_text_accessible_get_character_extents (AtkText *text, GtkWidget *widget; GtkText *entry; PangoRectangle char_rect; - gchar *entry_text; + char *entry_text; int index, x_layout, y_layout; GtkAllocation allocation; @@ -459,7 +459,7 @@ gtk_text_accessible_get_offset_at_point (AtkText *atk_text, { GtkWidget *widget; GtkText *entry; - gchar *text; + char *text; int index, x_layout, y_layout; int x_local, y_local; glong offset; @@ -513,7 +513,7 @@ gtk_text_accessible_get_n_selections (AtkText *text) return 0; } -static gchar * +static char * gtk_text_accessible_get_selection (AtkText *text, int selection_num, int *start_pos, @@ -611,8 +611,8 @@ gtk_text_accessible_get_character_at_offset (AtkText *atk_text, int offset) { GtkWidget *widget; - gchar *text; - gchar *index; + char *text; + char *index; gunichar result; result = '\0'; @@ -659,7 +659,7 @@ atk_text_interface_init (AtkTextIface *iface) static void gtk_text_accessible_set_text_contents (AtkEditableText *text, - const gchar *string) + const char *string) { GtkWidget *widget; @@ -675,7 +675,7 @@ gtk_text_accessible_set_text_contents (AtkEditableText *text, static void gtk_text_accessible_insert_text (AtkEditableText *text, - const gchar *string, + const char *string, int length, int *position) { @@ -701,7 +701,7 @@ gtk_text_accessible_copy_text (AtkEditableText *text, { GtkWidget *widget; GtkEditable *editable; - gchar *str; + char *str; GdkClipboard *clipboard; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -722,7 +722,7 @@ gtk_text_accessible_cut_text (AtkEditableText *text, { GtkWidget *widget; GtkEditable *editable; - gchar *str; + char *str; GdkClipboard *clipboard; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -822,7 +822,7 @@ atk_editable_text_interface_init (AtkEditableTextIface *iface) static void insert_text_cb (GtkEditable *editable, - gchar *new_text, + char *new_text, int new_text_length, int *position) { @@ -857,7 +857,7 @@ delete_text_cb (GtkEditable *editable, if (end < 0) { - gchar *text; + char *text; text = gtk_text_get_display_text (GTK_TEXT (editable), 0, -1); end = g_utf8_strlen (text, -1); @@ -932,7 +932,7 @@ gtk_text_accessible_get_n_actions (AtkAction *action) return 1; } -static const gchar * +static const char * gtk_text_accessible_get_keybinding (AtkAction *action, int i) { @@ -977,7 +977,7 @@ gtk_text_accessible_get_keybinding (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_text_accessible_action_get_name (AtkAction *action, int i) { @@ -986,7 +986,7 @@ gtk_text_accessible_action_get_name (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_text_accessible_action_get_localized_name (AtkAction *action, int i) { @@ -995,7 +995,7 @@ gtk_text_accessible_action_get_localized_name (AtkAction *action, return NULL; } -static const gchar* +static const char * gtk_text_accessible_action_get_description (AtkAction *action, int i) { diff --git a/gtk/a11y/gtktextcellaccessible.c b/gtk/a11y/gtktextcellaccessible.c index 9df1f41a20..7c51cb6480 100644 --- a/gtk/a11y/gtktextcellaccessible.c +++ b/gtk/a11y/gtktextcellaccessible.c @@ -26,33 +26,33 @@ struct _GtkTextCellAccessiblePrivate { - gchar *cell_text; + char *cell_text; int caret_pos; int cell_length; PangoLayout *layout; }; -static const gchar* gtk_text_cell_accessible_get_name (AtkObject *atk_obj); +static const char * gtk_text_cell_accessible_get_name (AtkObject *atk_obj); /* atktext.h */ -static gchar* gtk_text_cell_accessible_get_text (AtkText *text, +static char * gtk_text_cell_accessible_get_text (AtkText *text, int start_pos, int end_pos); static gunichar gtk_text_cell_accessible_get_character_at_offset (AtkText *text, int offset); -static gchar* gtk_text_cell_accessible_get_text_before_offset (AtkText *text, +static char * gtk_text_cell_accessible_get_text_before_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset); -static gchar* gtk_text_cell_accessible_get_text_at_offset (AtkText *text, +static char * gtk_text_cell_accessible_get_text_at_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset); -static gchar* gtk_text_cell_accessible_get_text_after_offset (AtkText *text, +static char * gtk_text_cell_accessible_get_text_after_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, @@ -121,7 +121,7 @@ gtk_text_cell_accessible_finalize (GObject *object) G_OBJECT_CLASS (gtk_text_cell_accessible_parent_class)->finalize (object); } -static const gchar * +static const char * gtk_text_cell_accessible_get_name (AtkObject *atk_obj) { GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (atk_obj); @@ -139,7 +139,7 @@ gtk_text_cell_accessible_update_cache (GtkCellAccessible *cell, GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (cell); AtkObject *obj = ATK_OBJECT (cell); int text_length; - gchar *text; + char *text; GtkCellRenderer *renderer; if (text_cell->priv->layout) @@ -201,12 +201,12 @@ gtk_text_cell_accessible_init (GtkTextCellAccessible *text_cell) text_cell->priv->caret_pos = -1; } -static gchar * +static char * gtk_text_cell_accessible_get_text (AtkText *atk_text, int start_pos, int end_pos) { - gchar *text; + char *text; text = GTK_TEXT_CELL_ACCESSIBLE (atk_text)->priv->cell_text; if (text) @@ -215,7 +215,7 @@ gtk_text_cell_accessible_get_text (AtkText *atk_text, return g_strdup (""); } -static gchar * +static char * gtk_text_cell_accessible_get_text_before_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -223,14 +223,14 @@ gtk_text_cell_accessible_get_text_before_offset (AtkText *atk_text, int *end_offset) { GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (atk_text); - gchar *text; + char *text; text = _gtk_pango_get_text_before (text_cell->priv->layout, boundary_type, offset, start_offset, end_offset); return text; } -static gchar * +static char * gtk_text_cell_accessible_get_text_at_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -238,14 +238,14 @@ gtk_text_cell_accessible_get_text_at_offset (AtkText *atk_text, int *end_offset) { GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (atk_text); - gchar *text; + char *text; text = _gtk_pango_get_text_at (text_cell->priv->layout, boundary_type, offset, start_offset, end_offset); return text; } -static gchar * +static char * gtk_text_cell_accessible_get_text_after_offset (AtkText *atk_text, int offset, AtkTextBoundary boundary_type, @@ -253,7 +253,7 @@ gtk_text_cell_accessible_get_text_after_offset (AtkText *atk_text, int *end_offset) { GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (atk_text); - gchar *text; + char *text; text = _gtk_pango_get_text_after (text_cell->priv->layout, boundary_type, offset, start_offset, end_offset); @@ -318,7 +318,7 @@ gtk_text_cell_accessible_get_run_attributes (AtkText *text, static AtkAttributeSet * add_attribute (AtkAttributeSet *attributes, AtkTextAttribute attr, - const gchar *value) + const char *value) { AtkAttribute *at; @@ -376,7 +376,7 @@ create_pango_layout (GtkTextCellAccessible *text) PangoFontDescription *font_desc; gboolean foreground_set, strikethrough_set, strikethrough; gboolean scale_set, underline_set, rise_set; - gchar *renderer_text; + char *renderer_text; gdouble scale; int rise; GtkRendererCellAccessible *gail_renderer; @@ -494,7 +494,7 @@ gtk_text_cell_accessible_get_character_extents (AtkText *text, AtkObject *parent; PangoRectangle char_rect; GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (text); - gchar *renderer_text; + char *renderer_text; gfloat xalign, yalign; int x_offset, y_offset, index; int xpad, ypad; @@ -572,7 +572,7 @@ gtk_text_cell_accessible_get_offset_at_point (AtkText *text, GtkWidget *widget; GdkRectangle rendered_rect; GtkTextCellAccessible *text_cell = GTK_TEXT_CELL_ACCESSIBLE (text); - gchar *renderer_text; + char *renderer_text; gfloat xalign, yalign; int x_offset, y_offset, index; int xpad, ypad; @@ -667,8 +667,8 @@ static gunichar gtk_text_cell_accessible_get_character_at_offset (AtkText *text, int offset) { - gchar *index; - gchar *string; + char *index; + char *string; string = GTK_TEXT_CELL_ACCESSIBLE(text)->priv->cell_text; diff --git a/gtk/a11y/gtktextviewaccessible.c b/gtk/a11y/gtktextviewaccessible.c index a937d88ab5..f6cf38fc48 100644 --- a/gtk/a11y/gtktextviewaccessible.c +++ b/gtk/a11y/gtktextviewaccessible.c @@ -41,7 +41,7 @@ struct _GtkTextViewAccessiblePrivate static void insert_text_cb (GtkTextBuffer *buffer, GtkTextIter *arg1, - gchar *arg2, + char *arg2, int arg3, gpointer user_data); static void delete_range_cb (GtkTextBuffer *buffer, @@ -178,7 +178,7 @@ gtk_text_view_accessible_init (GtkTextViewAccessible *accessible) accessible->priv = gtk_text_view_accessible_get_instance_private (accessible); } -static gchar * +static char * gtk_text_view_accessible_get_text (AtkText *text, int start_offset, int end_offset) @@ -200,7 +200,7 @@ gtk_text_view_accessible_get_text (AtkText *text, return gtk_text_buffer_get_text (buffer, &start, &end, FALSE); } -static gchar * +static char * gtk_text_view_accessible_get_text_after_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -243,7 +243,7 @@ gtk_text_view_accessible_get_text_after_offset (AtkText *text, return gtk_text_buffer_get_slice (buffer, &start, &end, FALSE); } -static gchar * +static char * gtk_text_view_accessible_get_text_at_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -288,7 +288,7 @@ gtk_text_view_accessible_get_text_at_offset (AtkText *text, return gtk_text_buffer_get_slice (buffer, &start, &end, FALSE); } -static gchar * +static char * gtk_text_view_accessible_get_text_before_offset (AtkText *text, int offset, AtkTextBoundary boundary_type, @@ -352,7 +352,7 @@ gtk_text_view_accessible_get_character_at_offset (AtkText *text, GtkWidget *widget; GtkTextIter start, end; GtkTextBuffer *buffer; - gchar *string; + char *string; gunichar unichar; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -521,7 +521,7 @@ gtk_text_view_accessible_get_character_extents (AtkText *text, static AtkAttributeSet * add_text_attribute (AtkAttributeSet *attributes, AtkTextAttribute attr, - gchar *value) + char *value) { AtkAttribute *at; @@ -538,7 +538,7 @@ add_text_int_attribute (AtkAttributeSet *attributes, int i) { - gchar *value; + char *value; value = g_strdup (atk_text_attribute_get_value (attr, i)); @@ -686,7 +686,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { GdkRGBA *rgba; - gchar *value; + char *value; g_object_get (tag, "foreground-rgba", &rgba, NULL); value = g_strdup_printf ("%u,%u,%u", @@ -709,7 +709,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { GdkRGBA *rgba; - gchar *value; + char *value; g_object_get (tag, "background-rgba", &rgba, NULL); value = g_strdup_printf ("%u,%u,%u", @@ -732,7 +732,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { - gchar *value; + char *value; g_object_get (tag, "family", &value, NULL); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_FAMILY_NAME, value); } @@ -749,7 +749,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { - gchar *value; + char *value; g_object_get (tag, "language", &value, NULL); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_LANGUAGE, value); } @@ -767,7 +767,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int weight; - gchar *value; + char *value; g_object_get (tag, "weight", &weight, NULL); value = g_strdup_printf ("%d", weight); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_WEIGHT, value); @@ -797,7 +797,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, } if (val_set) { - gchar *value; + char *value; value = g_strdup_printf ("%g", scale); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_SCALE, value); } @@ -812,7 +812,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int size; - gchar *value; + char *value; g_object_get (tag, "size", &size, NULL); value = g_strdup_printf ("%i", size); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_SIZE, value); @@ -862,7 +862,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int rise; - gchar *value; + char *value; g_object_get (tag, "rise", &rise, NULL); value = g_strdup_printf ("%i", rise); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_RISE, value); @@ -896,7 +896,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int pixels; - gchar *value; + char *value; g_object_get (tag, "pixels-inside-wrap", &pixels, NULL); value = g_strdup_printf ("%i", pixels); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP, value); @@ -914,7 +914,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int pixels; - gchar *value; + char *value; g_object_get (tag, "pixels-below-lines", &pixels, NULL); value = g_strdup_printf ("%i", pixels); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_PIXELS_BELOW_LINES, value); @@ -932,7 +932,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int pixels; - gchar *value; + char *value; g_object_get (tag, "pixels-above-lines", &pixels, NULL); value = g_strdup_printf ("%i", pixels); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_PIXELS_ABOVE_LINES, value); @@ -982,7 +982,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int indent; - gchar *value; + char *value; g_object_get (tag, "indent", &indent, NULL); value = g_strdup_printf ("%i", indent); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_INDENT, value); @@ -1000,7 +1000,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int margin; - gchar *value; + char *value; g_object_get (tag, "right-margin", &margin, NULL); value = g_strdup_printf ("%i", margin); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_RIGHT_MARGIN, value); @@ -1018,7 +1018,7 @@ gtk_text_view_accessible_get_run_attributes (AtkText *text, if (val_set) { int margin; - gchar *value; + char *value; g_object_get (tag, "left-margin", &margin, NULL); value = g_strdup_printf ("%i", margin); attrib_set = add_text_attribute (attrib_set, ATK_TEXT_ATTR_LEFT_MARGIN, value); @@ -1039,7 +1039,7 @@ gtk_text_view_accessible_get_default_attributes (AtkText *text) GtkTextAttributes *text_attrs; AtkAttributeSet *attributes; PangoFontDescription *font; - gchar *value; + char *value; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); if (widget == NULL) @@ -1100,7 +1100,7 @@ gtk_text_view_accessible_get_default_attributes (AtkText *text) value = g_strdup_printf ("%g", text_attrs->font_scale); attributes = add_text_attribute (attributes, ATK_TEXT_ATTR_SCALE, value); - value = g_strdup ((gchar *)(text_attrs->language)); + value = g_strdup ((char *)(text_attrs->language)); attributes = add_text_attribute (attributes, ATK_TEXT_ATTR_LANGUAGE, value); value = g_strdup_printf ("%i", text_attrs->appearance.rise); @@ -1145,7 +1145,7 @@ gtk_text_view_accessible_get_n_selections (AtkText *text) return 0; } -static gchar * +static char * gtk_text_view_accessible_get_selection (AtkText *atk_text, int selection_num, int *start_pos, @@ -1155,7 +1155,7 @@ gtk_text_view_accessible_get_selection (AtkText *atk_text, GtkWidget *widget; GtkTextBuffer *buffer; GtkTextIter start, end; - gchar *text; + char *text; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (atk_text)); if (widget == NULL) @@ -1304,7 +1304,7 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text, GtkTextIter end; int j; GdkRGBA *color; - gchar** RGB_vals; + char ** RGB_vals; GSList *l; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -1327,8 +1327,8 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text, for (l = attributes; l; l = l->next) { - gchar *name; - gchar *value; + char *name; + char *value; AtkAttribute *at; at = l->data; @@ -1512,7 +1512,7 @@ gtk_text_view_accessible_set_run_attributes (AtkEditableText *text, static void gtk_text_view_accessible_set_text_contents (AtkEditableText *text, - const gchar *string) + const char *string) { GtkTextView *view; GtkWidget *widget; @@ -1532,7 +1532,7 @@ gtk_text_view_accessible_set_text_contents (AtkEditableText *text, static void gtk_text_view_accessible_insert_text (AtkEditableText *text, - const gchar *string, + const char *string, int length, int *position) { @@ -1562,7 +1562,7 @@ gtk_text_view_accessible_copy_text (AtkEditableText *text, GtkWidget *widget; GtkTextBuffer *buffer; GtkTextIter start, end; - gchar *str; + char *str; GdkClipboard *clipboard; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -1588,7 +1588,7 @@ gtk_text_view_accessible_cut_text (AtkEditableText *text, GtkWidget *widget; GtkTextBuffer *buffer; GtkTextIter start, end; - gchar *str; + char *str; GdkClipboard *clipboard; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (text)); @@ -1732,7 +1732,7 @@ gtk_text_view_accessible_update_cursor (GtkTextViewAccessible *accessible, static void insert_text_cb (GtkTextBuffer *buffer, GtkTextIter *iter, - gchar *text, + char *text, int len, gpointer data) { diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c index 8956dfa1bc..5566939f8e 100644 --- a/gtk/a11y/gtktreeviewaccessible.c +++ b/gtk/a11y/gtktreeviewaccessible.c @@ -828,7 +828,7 @@ gtk_tree_view_accessible_get_column_header (AtkTable *table, return get_header_from_column (tv_col); } -static const gchar * +static const char * gtk_tree_view_accessible_get_column_description (AtkTable *table, int in_col) { diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c index 594ad6ca57..65f746e80d 100644 --- a/gtk/a11y/gtkwindowaccessible.c +++ b/gtk/a11y/gtkwindowaccessible.c @@ -71,10 +71,10 @@ on_title_changed (GObject *gobject, g_signal_emit_by_name (atk_obj, "visible-data-changed"); } -static const gchar * +static const char * gtk_window_accessible_get_name (AtkObject *accessible) { - const gchar* name; + const char * name; GtkWidget* widget; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); diff --git a/gtk/css/gtkcsstokenizer.c b/gtk/css/gtkcsstokenizer.c index 754c84ecb1..7aa3ff25e7 100644 --- a/gtk/css/gtkcsstokenizer.c +++ b/gtk/css/gtkcsstokenizer.c @@ -31,8 +31,8 @@ struct _GtkCssTokenizer int ref_count; GBytes *bytes; - const gchar *data; - const gchar *end; + const char *data; + const char *end; GtkCssLocation position; }; diff --git a/gtk/gen-paper-names.c b/gtk/gen-paper-names.c index afec5796d8..8d9ea390b5 100644 --- a/gtk/gen-paper-names.c +++ b/gtk/gen-paper-names.c @@ -27,7 +27,7 @@ static const int n_infos = G_N_ELEMENTS (standard_names); static const int n_extra = G_N_ELEMENTS (extra_ppd_names); typedef struct { - const gchar *s; + const char *s; int len; int suffix; int offset; @@ -37,7 +37,7 @@ static NameInfo *names = NULL; static int n_names = 0; static void -add_name (const gchar *name) +add_name (const char *name) { names[n_names].s = name; names[n_names].len = strlen (name); @@ -48,7 +48,7 @@ add_name (const gchar *name) } static int -find_name (const gchar *name) +find_name (const char *name) { int i; @@ -70,12 +70,12 @@ find_name (const gchar *name) #define POINTS_PER_INCH 72 static gboolean -parse_media_size (const gchar *size, +parse_media_size (const char *size, gdouble *width_mm, gdouble *height_mm) { - const gchar *p; - gchar *e; + const char *p; + char *e; gdouble short_dim, long_dim; p = size; diff --git a/gtk/gsettings-mapping.c b/gtk/gsettings-mapping.c index d7d69b139c..7eadca3d27 100644 --- a/gtk/gsettings-mapping.c +++ b/gtk/gsettings-mapping.c @@ -330,7 +330,7 @@ g_settings_set_mapping (const GValue *value, const GVariantType *expected_type, gpointer user_data) { - gchar *type_string; + char *type_string; if (G_VALUE_HOLDS_BOOLEAN (value)) { @@ -379,7 +379,7 @@ g_settings_set_mapping (const GValue *value, { if (g_value_get_boxed (value) == NULL) return NULL; - return g_variant_new_strv ((const gchar **) g_value_get_boxed (value), + return g_variant_new_strv ((const char **) g_value_get_boxed (value), -1); } @@ -485,7 +485,7 @@ g_settings_get_mapping (GValue *value, { GEnumClass *eclass; GEnumValue *evalue; - const gchar *nick; + const char *nick; /* GParamSpecEnum holds a ref on the class so we just peek... */ eclass = g_type_class_peek (G_VALUE_TYPE (value)); @@ -514,7 +514,7 @@ g_settings_get_mapping (GValue *value, { GFlagsClass *fclass; GFlagsValue *fvalue; - const gchar *nick; + const char *nick; GVariantIter iter; guint flags = 0; diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 7aa62b5072..2bafb769e3 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -111,8 +111,8 @@ typedef struct { - const gchar *name; - const gchar *url; + const char *name; + const char *url; } LicenseInfo; /* LicenseInfo for each GtkLicense type; keep in the same order as the enumeration */ @@ -142,8 +142,8 @@ G_STATIC_ASSERT (G_N_ELEMENTS (gtk_license_info) - 1 == GTK_LICENSE_MPL_2_0); typedef struct { - gchar *heading; - gchar **people; + char *heading; + char **people; } CreditSection; typedef struct _GtkAboutDialogClass GtkAboutDialogClass; @@ -152,19 +152,19 @@ struct _GtkAboutDialog { GtkDialog parent_instance; - gchar *name; - gchar *version; - gchar *copyright; - gchar *comments; - gchar *website_url; - gchar *website_text; - gchar *translator_credits; - gchar *license; - gchar *system_information; + char *name; + char *version; + char *copyright; + char *comments; + char *website_url; + char *website_text; + char *translator_credits; + char *license; + char *system_information; - gchar **authors; - gchar **documenters; - gchar **artists; + char **authors; + char **documenters; + char **artists; GSList *credit_sections; @@ -209,7 +209,7 @@ struct _GtkAboutDialogClass GtkDialogClass parent_class; gboolean (*activate_link) (GtkAboutDialog *dialog, - const gchar *uri); + const char *uri); }; enum @@ -255,9 +255,9 @@ static void populate_credits_page (GtkAboutDialog static void populate_license_page (GtkAboutDialog *about); static void populate_system_page (GtkAboutDialog *about); static gboolean gtk_about_dialog_activate_link (GtkAboutDialog *about, - const gchar *uri); + const char *uri); static gboolean emit_activate_link (GtkAboutDialog *about, - const gchar *uri); + const char *uri); static gboolean text_view_key_pressed (GtkEventController *controller, guint keyval, guint keycode, @@ -630,7 +630,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass) static gboolean emit_activate_link (GtkAboutDialog *about, - const gchar *uri) + const char *uri) { gboolean handled = FALSE; @@ -704,7 +704,7 @@ update_credits_button_visibility (GtkAboutDialog *about) static void switch_page (GtkAboutDialog *about, - const gchar *name) + const char *name) { gtk_stack_set_visible_child_name (GTK_STACK (about->stack), name); @@ -855,13 +855,13 @@ gtk_about_dialog_set_property (GObject *object, gtk_about_dialog_set_logo (about, g_value_get_object (value)); break; case PROP_AUTHORS: - gtk_about_dialog_set_authors (about, (const gchar**)g_value_get_boxed (value)); + gtk_about_dialog_set_authors (about, (const char **)g_value_get_boxed (value)); break; case PROP_DOCUMENTERS: - gtk_about_dialog_set_documenters (about, (const gchar**)g_value_get_boxed (value)); + gtk_about_dialog_set_documenters (about, (const char **)g_value_get_boxed (value)); break; case PROP_ARTISTS: - gtk_about_dialog_set_artists (about, (const gchar**)g_value_get_boxed (value)); + gtk_about_dialog_set_artists (about, (const char **)g_value_get_boxed (value)); break; case PROP_TRANSLATOR_CREDITS: gtk_about_dialog_set_translator_credits (about, g_value_get_string (value)); @@ -978,7 +978,7 @@ toggle_license (GtkToggleButton *button, static gboolean gtk_about_dialog_activate_link (GtkAboutDialog *about, - const gchar *uri) + const char *uri) { gtk_show_uri (GTK_WINDOW (about), uri, GDK_CURRENT_TIME); return TRUE; @@ -991,11 +991,11 @@ update_website (GtkAboutDialog *about) if (about->website_url) { - gchar *markup; + char *markup; if (about->website_text) { - gchar *escaped; + char *escaped; escaped = g_markup_escape_text (about->website_text, -1); markup = g_strdup_printf ("<a href=\"%s\">%s</a>", @@ -1029,7 +1029,7 @@ update_website (GtkAboutDialog *about) * Returns: The program name. The string is owned by the about * dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_program_name (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1040,7 +1040,7 @@ gtk_about_dialog_get_program_name (GtkAboutDialog *about) static void update_name_version (GtkAboutDialog *about) { - gchar *title_string, *name_string; + char *title_string, *name_string; title_string = g_strdup_printf (_("About %s"), about->name); gtk_window_set_title (GTK_WINDOW (about), title_string); @@ -1070,9 +1070,9 @@ update_name_version (GtkAboutDialog *about) */ void gtk_about_dialog_set_program_name (GtkAboutDialog *about, - const gchar *name) + const char *name) { - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1095,7 +1095,7 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about, * Returns: The version string. The string is owned by the about * dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_version (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1112,9 +1112,9 @@ gtk_about_dialog_get_version (GtkAboutDialog *about) */ void gtk_about_dialog_set_version (GtkAboutDialog *about, - const gchar *version) + const char *version) { - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1136,7 +1136,7 @@ gtk_about_dialog_set_version (GtkAboutDialog *about, * Returns: The copyright string. The string is owned by the about * dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_copyright (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1154,9 +1154,9 @@ gtk_about_dialog_get_copyright (GtkAboutDialog *about) */ void gtk_about_dialog_set_copyright (GtkAboutDialog *about, - const gchar *copyright) + const char *copyright) { - gchar *copyright_string, *tmp; + char *copyright_string, *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1188,7 +1188,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about, * Returns: The comments. The string is owned by the about * dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_comments (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1206,9 +1206,9 @@ gtk_about_dialog_get_comments (GtkAboutDialog *about) */ void gtk_about_dialog_set_comments (GtkAboutDialog *about, - const gchar *comments) + const char *comments) { - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1238,7 +1238,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about, * Returns: The license information. The string is owned by the about * dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_license (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1257,9 +1257,9 @@ gtk_about_dialog_get_license (GtkAboutDialog *about) */ void gtk_about_dialog_set_license (GtkAboutDialog *about, - const gchar *license) + const char *license) { - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1292,7 +1292,7 @@ gtk_about_dialog_set_license (GtkAboutDialog *about, * * Returns: the system information */ -const gchar * +const char * gtk_about_dialog_get_system_information (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1313,7 +1313,7 @@ gtk_about_dialog_get_system_information (GtkAboutDialog *about) */ void gtk_about_dialog_set_system_information (GtkAboutDialog *about, - const gchar *system_information) + const char *system_information) { g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1374,7 +1374,7 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about, * Returns: The website URL. The string is owned by the about * dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_website (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1391,9 +1391,9 @@ gtk_about_dialog_get_website (GtkAboutDialog *about) */ void gtk_about_dialog_set_website (GtkAboutDialog *about, - const gchar *website) + const char *website) { - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1415,7 +1415,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about, * Returns: The label used for the website link. The string is * owned by the about dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_website_label (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1432,9 +1432,9 @@ gtk_about_dialog_get_website_label (GtkAboutDialog *about) */ void gtk_about_dialog_set_website_label (GtkAboutDialog *about, - const gchar *website_label) + const char *website_label) { - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1458,12 +1458,12 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about, * %NULL-terminated string array containing the authors. The array is * owned by the about dialog and must not be modified. */ -const gchar * const * +const char * const * gtk_about_dialog_get_authors (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); - return (const gchar * const *) about->authors; + return (const char * const *) about->authors; } /** @@ -1476,14 +1476,14 @@ gtk_about_dialog_get_authors (GtkAboutDialog *about) */ void gtk_about_dialog_set_authors (GtkAboutDialog *about, - const gchar **authors) + const char **authors) { - gchar **tmp; + char **tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); tmp = about->authors; - about->authors = g_strdupv ((gchar **)authors); + about->authors = g_strdupv ((char **)authors); g_strfreev (tmp); update_credits_button_visibility (about); @@ -1502,12 +1502,12 @@ gtk_about_dialog_set_authors (GtkAboutDialog *about, * %NULL-terminated string array containing the documenters. The * array is owned by the about dialog and must not be modified. */ -const gchar * const * +const char * const * gtk_about_dialog_get_documenters (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); - return (const gchar * const *)about->documenters; + return (const char * const *)about->documenters; } /** @@ -1520,14 +1520,14 @@ gtk_about_dialog_get_documenters (GtkAboutDialog *about) */ void gtk_about_dialog_set_documenters (GtkAboutDialog *about, - const gchar **documenters) + const char **documenters) { - gchar **tmp; + char **tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); tmp = about->documenters; - about->documenters = g_strdupv ((gchar **)documenters); + about->documenters = g_strdupv ((char **)documenters); g_strfreev (tmp); update_credits_button_visibility (about); @@ -1546,12 +1546,12 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about, * %NULL-terminated string array containing the artists. The array is * owned by the about dialog and must not be modified. */ -const gchar * const * +const char * const * gtk_about_dialog_get_artists (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); - return (const gchar * const *)about->artists; + return (const char * const *)about->artists; } /** @@ -1564,14 +1564,14 @@ gtk_about_dialog_get_artists (GtkAboutDialog *about) */ void gtk_about_dialog_set_artists (GtkAboutDialog *about, - const gchar **artists) + const char **artists) { - gchar **tmp; + char **tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); tmp = about->artists; - about->artists = g_strdupv ((gchar **)artists); + about->artists = g_strdupv ((char **)artists); g_strfreev (tmp); update_credits_button_visibility (about); @@ -1589,7 +1589,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about, * Returns: The translator credits string. The string is * owned by the about dialog and must not be modified. */ -const gchar * +const char * gtk_about_dialog_get_translator_credits (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1621,9 +1621,9 @@ gtk_about_dialog_get_translator_credits (GtkAboutDialog *about) */ void gtk_about_dialog_set_translator_credits (GtkAboutDialog *about, - const gchar *translator_credits) + const char *translator_credits) { - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1696,7 +1696,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about, * The string is owned by the dialog. If you want to keep a reference * to it, you have to call g_strdup() on it. */ -const gchar * +const char * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1716,7 +1716,7 @@ gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about) */ void gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about, - const gchar *icon_name) + const char *icon_name) { g_return_if_fail (GTK_IS_ABOUT_DIALOG (about)); @@ -1772,7 +1772,7 @@ follow_if_link (GtkAboutDialog *about, GtkTextIter *iter) { GSList *tags = NULL, *tagp = NULL; - gchar *uri = NULL; + char *uri = NULL; tags = gtk_text_iter_get_tags (iter); for (tagp = tags; tagp != NULL && !uri; tagp = tagp->next) @@ -1880,7 +1880,7 @@ set_cursor_if_appropriate (GtkAboutDialog *about, for (tagp = tags; tagp != NULL; tagp = tagp->next) { GtkTextTag *tag = tagp->data; - gchar *uri = g_object_get_data (G_OBJECT (tag), "uri"); + char *uri = g_object_get_data (G_OBJECT (tag), "uri"); if (uri != NULL) { @@ -1922,10 +1922,10 @@ text_view_motion (GtkEventControllerMotion *motion, static GtkTextBuffer * text_buffer_new (GtkAboutDialog *about, - gchar **strings) + char **strings) { - gchar **p; - gchar *q0, *q1, *q2, *r1, *r2; + char **p; + char *q0, *q1, *q2, *r1, *r2; GtkTextBuffer *buffer; GdkRGBA color; GdkRGBA link_color; @@ -1972,9 +1972,9 @@ text_buffer_new (GtkAboutDialog *about, if (q1 && q2) { GtkTextIter end; - gchar *link; - gchar *uri; - const gchar *link_type; + char *link; + char *uri; + const char *link_type; if (*q1 == '<') { @@ -2005,7 +2005,7 @@ text_buffer_new (GtkAboutDialog *about, NULL); if (strcmp (link_type, "email") == 0) { - gchar *escaped; + char *escaped; escaped = g_uri_escape_string (link, NULL, FALSE); uri = g_strconcat ("mailto:", escaped, NULL); @@ -2046,13 +2046,13 @@ static void add_credits_section (GtkAboutDialog *about, GtkGrid *grid, int *row, - gchar *title, - gchar **people) + char *title, + char **people) { GtkWidget *label; - gchar *markup; - gchar **p; - gchar *q0, *q1, *q2, *r1, *r2; + char *markup; + char **p; + char *q0, *q1, *q2, *r1, *r2; if (people == NULL) return; @@ -2102,14 +2102,14 @@ add_credits_section (GtkAboutDialog *about, if (q1 && q2) { - gchar *link; - gchar *text; - gchar *name; + char *link; + char *text; + char *name; if (*q1 == '<') { /* email */ - gchar *escaped; + char *escaped; text = g_strstrip (g_strndup (q0, q1 - q0)); name = g_markup_escape_text (text, -1); @@ -2188,7 +2188,7 @@ populate_credits_page (GtkAboutDialog *about) strcmp (about->translator_credits, "translator_credits") != 0 && strcmp (about->translator_credits, "translator-credits") != 0) { - gchar **translators; + char **translators; translators = g_strsplit (about->translator_credits, "\n", 0); add_credits_section (about, GTK_GRID (about->credits_grid), &row, _("Translated by"), translators); @@ -2213,7 +2213,7 @@ static void populate_license_page (GtkAboutDialog *about) { GtkTextBuffer *buffer; - gchar *strings[2]; + char *strings[2]; gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (about->license_view), about->wrap_license ? GTK_WRAP_WORD : GTK_WRAP_NONE); @@ -2228,7 +2228,7 @@ static void populate_system_page (GtkAboutDialog *about) { GtkTextBuffer *buffer; - gchar *strings[2]; + char *strings[2]; strings[0] = about->system_information; strings[1] = NULL; @@ -2275,7 +2275,7 @@ close_cb (GtkAboutDialog *about, */ void gtk_show_about_dialog (GtkWindow *parent, - const gchar *first_property_name, + const char *first_property_name, ...) { static GtkWidget *global_about_dialog = NULL; @@ -2349,9 +2349,9 @@ gtk_about_dialog_set_license_type (GtkAboutDialog *about, /* custom licenses use the contents of the :license property */ if (about->license_type != GTK_LICENSE_CUSTOM) { - const gchar *name; - const gchar *url; - gchar *license_string; + const char *name; + const char *url; + char *license_string; GString *str; name = _(gtk_license_info[about->license_type].name); @@ -2417,8 +2417,8 @@ gtk_about_dialog_get_license_type (GtkAboutDialog *about) */ void gtk_about_dialog_add_credit_section (GtkAboutDialog *about, - const gchar *section_name, - const gchar **people) + const char *section_name, + const char **people) { CreditSection *new_entry; @@ -2427,8 +2427,8 @@ gtk_about_dialog_add_credit_section (GtkAboutDialog *about, g_return_if_fail (people != NULL); new_entry = g_slice_new (CreditSection); - new_entry->heading = g_strdup ((gchar *)section_name); - new_entry->people = g_strdupv ((gchar **)people); + new_entry->heading = g_strdup ((char *)section_name); + new_entry->people = g_strdupv ((char **)people); about->credit_sections = g_slist_append (about->credit_sections, new_entry); update_credits_button_visibility (about); diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h index 1624f4628f..76a2d187ee 100644 --- a/gtk/gtkaboutdialog.h +++ b/gtk/gtkaboutdialog.h @@ -98,33 +98,33 @@ GDK_AVAILABLE_IN_ALL GtkWidget *gtk_about_dialog_new (void); GDK_AVAILABLE_IN_ALL void gtk_show_about_dialog (GtkWindow *parent, - const gchar *first_property_name, + const char *first_property_name, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_program_name (GtkAboutDialog *about); +const char * gtk_about_dialog_get_program_name (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_program_name (GtkAboutDialog *about, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_version (GtkAboutDialog *about); +const char * gtk_about_dialog_get_version (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_version (GtkAboutDialog *about, - const gchar *version); + const char *version); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_copyright (GtkAboutDialog *about); +const char * gtk_about_dialog_get_copyright (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_copyright (GtkAboutDialog *about, - const gchar *copyright); + const char *copyright); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_comments (GtkAboutDialog *about); +const char * gtk_about_dialog_get_comments (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_comments (GtkAboutDialog *about, - const gchar *comments); + const char *comments); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_license (GtkAboutDialog *about); +const char * gtk_about_dialog_get_license (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_license (GtkAboutDialog *about, - const gchar *license); + const char *license); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_license_type (GtkAboutDialog *about, GtkLicense license_type); @@ -138,54 +138,54 @@ void gtk_about_dialog_set_wrap_license (GtkAboutDialog gboolean wrap_license); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_system_information (GtkAboutDialog *about); +const char * gtk_about_dialog_get_system_information (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_system_information (GtkAboutDialog *about, - const gchar *system_information); + const char *system_information); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_website (GtkAboutDialog *about); +const char * gtk_about_dialog_get_website (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_website (GtkAboutDialog *about, - const gchar *website); + const char *website); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_website_label (GtkAboutDialog *about); +const char * gtk_about_dialog_get_website_label (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_website_label (GtkAboutDialog *about, - const gchar *website_label); + const char *website_label); GDK_AVAILABLE_IN_ALL -const gchar* const * gtk_about_dialog_get_authors (GtkAboutDialog *about); +const char * const * gtk_about_dialog_get_authors (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_authors (GtkAboutDialog *about, - const gchar **authors); + const char **authors); GDK_AVAILABLE_IN_ALL -const gchar* const * gtk_about_dialog_get_documenters (GtkAboutDialog *about); +const char * const * gtk_about_dialog_get_documenters (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_documenters (GtkAboutDialog *about, - const gchar **documenters); + const char **documenters); GDK_AVAILABLE_IN_ALL -const gchar* const * gtk_about_dialog_get_artists (GtkAboutDialog *about); +const char * const * gtk_about_dialog_get_artists (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_artists (GtkAboutDialog *about, - const gchar **artists); + const char **artists); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_translator_credits (GtkAboutDialog *about); +const char * gtk_about_dialog_get_translator_credits (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_translator_credits (GtkAboutDialog *about, - const gchar *translator_credits); + const char *translator_credits); GDK_AVAILABLE_IN_ALL GdkPaintable *gtk_about_dialog_get_logo (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_logo (GtkAboutDialog *about, GdkPaintable *logo); GDK_AVAILABLE_IN_ALL -const gchar * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about); +const char * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about, - const gchar *icon_name); + const char *icon_name); GDK_AVAILABLE_IN_ALL void gtk_about_dialog_add_credit_section (GtkAboutDialog *about, - const gchar *section_name, - const gchar **people); + const char *section_name, + const char **people); G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAboutDialog, g_object_unref) diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index 0e45b3635a..f5417dbcd0 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -114,7 +114,7 @@ gtk_accelerator_valid (guint keyval, } static inline gboolean -is_alt (const gchar *string) +is_alt (const char *string) { return ((string[0] == '<') && (string[1] == 'a' || string[1] == 'A') && @@ -124,7 +124,7 @@ is_alt (const gchar *string) } static inline gboolean -is_ctl (const gchar *string) +is_ctl (const char *string) { return ((string[0] == '<') && (string[1] == 'c' || string[1] == 'C') && @@ -134,7 +134,7 @@ is_ctl (const gchar *string) } static inline gboolean -is_ctrl (const gchar *string) +is_ctrl (const char *string) { return ((string[0] == '<') && (string[1] == 'c' || string[1] == 'C') && @@ -145,7 +145,7 @@ is_ctrl (const gchar *string) } static inline gboolean -is_shft (const gchar *string) +is_shft (const char *string) { return ((string[0] == '<') && (string[1] == 's' || string[1] == 'S') && @@ -156,7 +156,7 @@ is_shft (const gchar *string) } static inline gboolean -is_shift (const gchar *string) +is_shift (const char *string) { return ((string[0] == '<') && (string[1] == 's' || string[1] == 'S') && @@ -168,7 +168,7 @@ is_shift (const gchar *string) } static inline gboolean -is_control (const gchar *string) +is_control (const char *string) { return ((string[0] == '<') && (string[1] == 'c' || string[1] == 'C') && @@ -182,7 +182,7 @@ is_control (const gchar *string) } static inline gboolean -is_meta (const gchar *string) +is_meta (const char *string) { return ((string[0] == '<') && (string[1] == 'm' || string[1] == 'M') && @@ -193,7 +193,7 @@ is_meta (const gchar *string) } static inline gboolean -is_super (const gchar *string) +is_super (const char *string) { return ((string[0] == '<') && (string[1] == 's' || string[1] == 'S') && @@ -205,7 +205,7 @@ is_super (const gchar *string) } static inline gboolean -is_hyper (const gchar *string) +is_hyper (const char *string) { return ((string[0] == '<') && (string[1] == 'h' || string[1] == 'H') && @@ -217,7 +217,7 @@ is_hyper (const gchar *string) } static inline gboolean -is_primary (const gchar *string) +is_primary (const char *string) { return ((string[0] == '<') && (string[1] == 'p' || string[1] == 'P') && @@ -231,7 +231,7 @@ is_primary (const gchar *string) } static inline gboolean -is_keycode (const gchar *string) +is_keycode (const char *string) { return (string[0] == '0' && string[1] == 'x' && @@ -267,7 +267,7 @@ is_keycode (const gchar *string) * Returns: %TRUE if parsing succeeded */ gboolean -gtk_accelerator_parse_with_keycode (const gchar *accelerator, +gtk_accelerator_parse_with_keycode (const char *accelerator, GdkDisplay *display, guint *accelerator_key, guint **accelerator_codes, @@ -360,7 +360,7 @@ gtk_accelerator_parse_with_keycode (const gchar *accelerator, } else { - gchar last_ch; + char last_ch; last_ch = *accelerator; while (last_ch && last_ch != '>') @@ -376,7 +376,7 @@ gtk_accelerator_parse_with_keycode (const gchar *accelerator, if (len >= 4 && is_keycode (accelerator)) { char keystring[5]; - gchar *endptr; + char *endptr; int tmp_keycode; memcpy (keystring, accelerator, 4); @@ -510,7 +510,7 @@ out: * be set to 0 (zero). */ gboolean -gtk_accelerator_parse (const gchar *accelerator, +gtk_accelerator_parse (const char *accelerator, guint *accelerator_key, GdkModifierType *accelerator_mods) { @@ -532,19 +532,19 @@ gtk_accelerator_parse (const gchar *accelerator, * * Returns: a newly allocated accelerator name. */ -gchar * +char * gtk_accelerator_name_with_keycode (GdkDisplay *display, guint accelerator_key, guint keycode, GdkModifierType accelerator_mods) { - gchar *gtk_name; + char *gtk_name; gtk_name = gtk_accelerator_name (accelerator_key, accelerator_mods); if (!accelerator_key) { - gchar *name; + char *name; name = g_strdup_printf ("%s0x%02x", gtk_name, keycode); g_free (gtk_name); return name; @@ -647,19 +647,19 @@ gtk_accelerator_name (guint accelerator_key, * * Returns: a newly-allocated string representing the accelerator. */ -gchar * +char * gtk_accelerator_get_label_with_keycode (GdkDisplay *display, guint accelerator_key, guint keycode, GdkModifierType accelerator_mods) { - gchar *gtk_label; + char *gtk_label; gtk_label = gtk_accelerator_get_label (accelerator_key, accelerator_mods); if (!accelerator_key) { - gchar *label; + char *label; label = g_strdup_printf ("%s0x%02x", gtk_label, keycode); g_free (gtk_label); return label; @@ -803,7 +803,7 @@ append_separator (GString *string) * * Returns: a newly-allocated string representing the accelerator. */ -gchar* +char * gtk_accelerator_get_label (guint accelerator_key, GdkModifierType accelerator_mods) { diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index 6e38622223..54ddba5bc1 100644 --- a/gtk/gtkaccelgroup.h +++ b/gtk/gtkaccelgroup.h @@ -41,28 +41,28 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_accelerator_valid (guint keyval, GdkModifierType modifiers) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -gboolean gtk_accelerator_parse (const gchar *accelerator, +gboolean gtk_accelerator_parse (const char *accelerator, guint *accelerator_key, GdkModifierType *accelerator_mods); GDK_AVAILABLE_IN_ALL -gboolean gtk_accelerator_parse_with_keycode (const gchar *accelerator, +gboolean gtk_accelerator_parse_with_keycode (const char *accelerator, GdkDisplay *display, guint *accelerator_key, guint **accelerator_codes, GdkModifierType *accelerator_mods); GDK_AVAILABLE_IN_ALL -gchar* gtk_accelerator_name (guint accelerator_key, +char * gtk_accelerator_name (guint accelerator_key, GdkModifierType accelerator_mods); GDK_AVAILABLE_IN_ALL -gchar* gtk_accelerator_name_with_keycode (GdkDisplay *display, +char * gtk_accelerator_name_with_keycode (GdkDisplay *display, guint accelerator_key, guint keycode, GdkModifierType accelerator_mods); GDK_AVAILABLE_IN_ALL -gchar* gtk_accelerator_get_label (guint accelerator_key, +char * gtk_accelerator_get_label (guint accelerator_key, GdkModifierType accelerator_mods); GDK_AVAILABLE_IN_ALL -gchar* gtk_accelerator_get_label_with_keycode (GdkDisplay *display, +char * gtk_accelerator_get_label_with_keycode (GdkDisplay *display, guint accelerator_key, guint keycode, GdkModifierType accelerator_mods); diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index 7b83dbad5b..2a498a907c 100644 --- a/gtk/gtkaccellabel.c +++ b/gtk/gtkaccellabel.c @@ -216,7 +216,7 @@ gtk_accel_label_init (GtkAccelLabel *accel_label) * Returns: a new #GtkAccelLabel. */ GtkWidget * -gtk_accel_label_new (const gchar *string) +gtk_accel_label_new (const char *string) { return g_object_new (GTK_TYPE_ACCEL_LABEL, "label", string, diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index 7177b79ceb..cf8f0998d0 100644 --- a/gtk/gtkaccellabel.h +++ b/gtk/gtkaccellabel.h @@ -44,7 +44,7 @@ typedef struct _GtkAccelLabel GtkAccelLabel; GDK_AVAILABLE_IN_ALL GType gtk_accel_label_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_accel_label_new (const gchar *string); +GtkWidget *gtk_accel_label_new (const char *string); GDK_AVAILABLE_IN_ALL guint gtk_accel_label_get_accel_width (GtkAccelLabel *accel_label); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkactionable.c b/gtk/gtkactionable.c index 58c7d459cd..150a91055b 100644 --- a/gtk/gtkactionable.c +++ b/gtk/gtkactionable.c @@ -86,7 +86,7 @@ gtk_actionable_default_init (GtkActionableInterface *iface) * * Returns: (nullable): the action name, or %NULL if none is set **/ -const gchar * +const char * gtk_actionable_get_action_name (GtkActionable *actionable) { g_return_val_if_fail (GTK_IS_ACTIONABLE (actionable), NULL); @@ -114,7 +114,7 @@ gtk_actionable_get_action_name (GtkActionable *actionable) **/ void gtk_actionable_set_action_name (GtkActionable *actionable, - const gchar *action_name) + const char *action_name) { g_return_if_fail (GTK_IS_ACTIONABLE (actionable)); @@ -194,7 +194,7 @@ gtk_actionable_set_action_target_value (GtkActionable *actionable, **/ void gtk_actionable_set_action_target (GtkActionable *actionable, - const gchar *format_string, + const char *format_string, ...) { va_list ap; @@ -223,11 +223,11 @@ gtk_actionable_set_action_target (GtkActionable *actionable, **/ void gtk_actionable_set_detailed_action_name (GtkActionable *actionable, - const gchar *detailed_action_name) + const char *detailed_action_name) { GError *error = NULL; GVariant *target; - gchar *name; + char *name; if (detailed_action_name == NULL) { diff --git a/gtk/gtkactionable.h b/gtk/gtkactionable.h index af42e5e1d4..db82446cba 100644 --- a/gtk/gtkactionable.h +++ b/gtk/gtkactionable.h @@ -43,9 +43,9 @@ struct _GtkActionableInterface /*< public >*/ - const gchar * (* get_action_name) (GtkActionable *actionable); + const char * (* get_action_name) (GtkActionable *actionable); void (* set_action_name) (GtkActionable *actionable, - const gchar *action_name); + const char *action_name); GVariant * (* get_action_target_value) (GtkActionable *actionable); void (* set_action_target_value) (GtkActionable *actionable, GVariant *target_value); @@ -55,10 +55,10 @@ GDK_AVAILABLE_IN_ALL GType gtk_actionable_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -const gchar * gtk_actionable_get_action_name (GtkActionable *actionable); +const char * gtk_actionable_get_action_name (GtkActionable *actionable); GDK_AVAILABLE_IN_ALL void gtk_actionable_set_action_name (GtkActionable *actionable, - const gchar *action_name); + const char *action_name); GDK_AVAILABLE_IN_ALL GVariant * gtk_actionable_get_action_target_value (GtkActionable *actionable); @@ -68,12 +68,12 @@ void gtk_actionable_set_action_target_value (GtkActi GDK_AVAILABLE_IN_ALL void gtk_actionable_set_action_target (GtkActionable *actionable, - const gchar *format_string, + const char *format_string, ...); GDK_AVAILABLE_IN_ALL void gtk_actionable_set_detailed_action_name (GtkActionable *actionable, - const gchar *detailed_action_name); + const char *detailed_action_name); G_END_DECLS diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c index 77a1981a3b..ae4393966a 100644 --- a/gtk/gtkactionbar.c +++ b/gtk/gtkactionbar.c @@ -191,7 +191,7 @@ static void gtk_action_bar_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { GtkActionBar *self = GTK_ACTION_BAR (buildable); diff --git a/gtk/gtkactionhelper.c b/gtk/gtkactionhelper.c index 99a0b796d5..ccc2153c33 100644 --- a/gtk/gtkactionhelper.c +++ b/gtk/gtkactionhelper.c @@ -60,7 +60,7 @@ struct _GtkActionHelper GtkActionHelperGroup *group; GtkActionMuxer *action_context; - gchar *action_name; + char *action_name; GVariant *target; @@ -301,7 +301,7 @@ gtk_action_helper_finalize (GObject *object) static void gtk_action_helper_observer_action_added (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, const GVariantType *parameter_type, gboolean enabled, GVariant *state) @@ -312,7 +312,7 @@ gtk_action_helper_observer_action_added (GtkActionObserver *observer, static void gtk_action_helper_observer_action_enabled_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, gboolean enabled) { gtk_action_helper_action_enabled_changed (GTK_ACTION_HELPER (observer), enabled); @@ -321,7 +321,7 @@ gtk_action_helper_observer_action_enabled_changed (GtkActionObserver *observer static void gtk_action_helper_observer_action_state_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GVariant *state) { gtk_action_helper_action_state_changed (GTK_ACTION_HELPER (observer), state); @@ -330,7 +330,7 @@ gtk_action_helper_observer_action_state_changed (GtkActionObserver *observer, static void gtk_action_helper_observer_action_removed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name) + const char *action_name) { gtk_action_helper_action_removed (GTK_ACTION_HELPER (observer), TRUE); } @@ -405,7 +405,7 @@ gtk_action_helper_new (GtkActionable *widget) void gtk_action_helper_set_action_name (GtkActionHelper *helper, - const gchar *action_name) + const char *action_name) { gboolean was_enabled, was_active; const GVariantType *parameter_type; @@ -552,7 +552,7 @@ gtk_action_helper_set_action_target_value (GtkActionHelper *helper, g_object_notify (G_OBJECT (helper->widget), "action-target"); } -const gchar * +const char * gtk_action_helper_get_action_name (GtkActionHelper *helper) { if (helper == NULL) diff --git a/gtk/gtkactionhelperprivate.h b/gtk/gtkactionhelperprivate.h index 7a3b334e4a..f68ef104f9 100644 --- a/gtk/gtkactionhelperprivate.h +++ b/gtk/gtkactionhelperprivate.h @@ -39,12 +39,12 @@ GtkActionHelper * gtk_action_helper_new (GtkActi G_GNUC_INTERNAL void gtk_action_helper_set_action_name (GtkActionHelper *helper, - const gchar *action_name); + const char *action_name); G_GNUC_INTERNAL void gtk_action_helper_set_action_target_value (GtkActionHelper *helper, GVariant *action_target); G_GNUC_INTERNAL -const gchar * gtk_action_helper_get_action_name (GtkActionHelper *helper); +const char * gtk_action_helper_get_action_name (GtkActionHelper *helper); G_GNUC_INTERNAL GVariant * gtk_action_helper_get_action_target_value (GtkActionHelper *helper); diff --git a/gtk/gtkactionmuxer.c b/gtk/gtkactionmuxer.c index 2ad00251ad..d10b813a0f 100644 --- a/gtk/gtkactionmuxer.c +++ b/gtk/gtkactionmuxer.c @@ -181,14 +181,14 @@ typedef struct { GtkActionMuxer *muxer; GSList *watchers; - gchar *fullname; + char *fullname; } Action; typedef struct { GtkActionMuxer *muxer; GActionGroup *group; - gchar *prefix; + char *prefix; gulong handler_ids[4]; } Group; @@ -210,8 +210,8 @@ gtk_action_muxer_append_group_actions (const char *prefix, Group *group, GHashTable *actions) { - gchar **group_actions; - gchar **action; + char **group_actions; + char **action; group_actions = g_action_group_list_actions (group->group); for (action = group_actions; *action; action++) @@ -265,11 +265,11 @@ gtk_action_muxer_list_actions (GtkActionMuxer *muxer) static Group * gtk_action_muxer_find_group (GtkActionMuxer *muxer, - const gchar *full_name, - const gchar **action_name) + const char *full_name, + const char **action_name) { - const gchar *dot; - gchar *prefix; + const char *dot; + char *prefix; const char *name; Group *group; @@ -323,7 +323,7 @@ find_observers (GtkActionMuxer *muxer, void gtk_action_muxer_action_enabled_changed (GtkActionMuxer *muxer, - const gchar *action_name, + const char *action_name, gboolean enabled) { GtkWidgetAction *iter; @@ -355,12 +355,12 @@ gtk_action_muxer_action_enabled_changed (GtkActionMuxer *muxer, static void gtk_action_muxer_group_action_enabled_changed (GActionGroup *action_group, - const gchar *action_name, + const char *action_name, gboolean enabled, gpointer user_data) { Group *group = user_data; - gchar *fullname; + char *fullname; fullname = g_strconcat (group->prefix, ".", action_name, NULL); gtk_action_muxer_action_enabled_changed (group->muxer, fullname, enabled); @@ -369,7 +369,7 @@ gtk_action_muxer_group_action_enabled_changed (GActionGroup *action_group, void gtk_action_muxer_action_state_changed (GtkActionMuxer *muxer, - const gchar *action_name, + const char *action_name, GVariant *state) { Action *action; @@ -382,12 +382,12 @@ gtk_action_muxer_action_state_changed (GtkActionMuxer *muxer, static void gtk_action_muxer_group_action_state_changed (GActionGroup *action_group, - const gchar *action_name, + const char *action_name, GVariant *state, gpointer user_data) { Group *group = user_data; - gchar *fullname; + char *fullname; fullname = g_strconcat (group->prefix, ".", action_name, NULL); gtk_action_muxer_action_state_changed (group->muxer, fullname, state); @@ -496,7 +496,7 @@ gtk_action_muxer_action_added (GtkActionMuxer *muxer, static void gtk_action_muxer_action_added_to_group (GActionGroup *action_group, - const gchar *action_name, + const char *action_name, gpointer user_data) { Group *group = user_data; @@ -543,7 +543,7 @@ gtk_action_muxer_action_removed (GtkActionMuxer *muxer, static void gtk_action_muxer_action_removed_from_group (GActionGroup *action_group, - const gchar *action_name, + const char *action_name, gpointer user_data) { Group *group = user_data; @@ -570,8 +570,8 @@ gtk_action_muxer_action_removed_from_group (GActionGroup *action_group, static void gtk_action_muxer_primary_accel_changed (GtkActionMuxer *muxer, - const gchar *action_name, - const gchar *action_and_target) + const char *action_name, + const char *action_and_target) { Action *action; GSList *node; @@ -719,7 +719,7 @@ prop_actions_connect (GtkActionMuxer *muxer) static gboolean action_muxer_query_action (GtkActionMuxer *muxer, - const gchar *action_name, + const char *action_name, gboolean *enabled, const GVariantType **parameter_type, const GVariantType **state_type, @@ -729,7 +729,7 @@ action_muxer_query_action (GtkActionMuxer *muxer, { GtkWidgetAction *action; Group *group; - const gchar *unprefixed_name; + const char *unprefixed_name; if (muxer->widget) { @@ -785,7 +785,7 @@ action_muxer_query_action (GtkActionMuxer *muxer, gboolean gtk_action_muxer_query_action (GtkActionMuxer *muxer, - const gchar *action_name, + const char *action_name, gboolean *enabled, const GVariantType **parameter_type, const GVariantType **state_type, @@ -809,10 +809,10 @@ gtk_action_muxer_has_action (GtkActionMuxer *muxer, void gtk_action_muxer_activate_action (GtkActionMuxer *muxer, - const gchar *action_name, + const char *action_name, GVariant *parameter) { - const gchar *unprefixed_name; + const char *unprefixed_name; Group *group; if (muxer->widget) @@ -854,7 +854,7 @@ gtk_action_muxer_change_action_state (GtkActionMuxer *muxer, GVariant *state) { GtkWidgetAction *action; - const gchar *unprefixed_name; + const char *unprefixed_name; Group *group; if (muxer->widget) @@ -920,7 +920,7 @@ static void gtk_action_muxer_free_action (gpointer data); static void gtk_action_muxer_register_observer (GtkActionObservable *observable, - const gchar *name, + const char *name, GtkActionObserver *observer) { GtkActionMuxer *muxer = GTK_ACTION_MUXER (observable); @@ -972,7 +972,7 @@ gtk_action_muxer_register_observer (GtkActionObservable *observable, static void gtk_action_muxer_unregister_observer (GtkActionObservable *observable, - const gchar *name, + const char *name, GtkActionObserver *observer) { GtkActionMuxer *muxer = GTK_ACTION_MUXER (observable); @@ -1225,10 +1225,10 @@ gtk_action_muxer_class_init (GObjectClass *class) */ void gtk_action_muxer_insert (GtkActionMuxer *muxer, - const gchar *prefix, + const char *prefix, GActionGroup *action_group) { - gchar **actions; + char **actions; Group *group; int i; @@ -1272,7 +1272,7 @@ gtk_action_muxer_insert (GtkActionMuxer *muxer, */ void gtk_action_muxer_remove (GtkActionMuxer *muxer, - const gchar *prefix) + const char *prefix) { Group *group; @@ -1283,7 +1283,7 @@ gtk_action_muxer_remove (GtkActionMuxer *muxer, if (group != NULL) { - gchar **actions; + char **actions; int i; g_hash_table_steal (muxer->groups, prefix); @@ -1372,9 +1372,9 @@ gtk_action_muxer_set_primary_accel (GtkActionMuxer *muxer, gtk_action_muxer_primary_accel_changed (muxer, NULL, action_and_target); } -const gchar * +const char * gtk_action_muxer_get_primary_accel (GtkActionMuxer *muxer, - const gchar *action_and_target) + const char *action_and_target) { guint position; @@ -1388,9 +1388,9 @@ gtk_action_muxer_get_primary_accel (GtkActionMuxer *muxer, return gtk_action_muxer_get_primary_accel (muxer->parent, action_and_target); } -gchar * -gtk_print_action_and_target (const gchar *action_namespace, - const gchar *action_name, +char * +gtk_print_action_and_target (const char *action_namespace, + const char *action_name, GVariant *target) { GString *result; @@ -1415,12 +1415,12 @@ gtk_print_action_and_target (const gchar *action_namespace, return g_string_free (result, FALSE); } -gchar * -gtk_normalise_detailed_action_name (const gchar *detailed_action_name) +char * +gtk_normalise_detailed_action_name (const char *detailed_action_name) { GError *error = NULL; - gchar *action_and_target; - gchar *action_name; + char *action_and_target; + char *action_name; GVariant *target; g_action_parse_detailed_name (detailed_action_name, &action_name, &target, &error); diff --git a/gtk/gtkactionmuxerprivate.h b/gtk/gtkactionmuxerprivate.h index 19e3365672..cd1786b2c3 100644 --- a/gtk/gtkactionmuxerprivate.h +++ b/gtk/gtkactionmuxerprivate.h @@ -56,7 +56,7 @@ void gtk_action_muxer_insert (GtkActi GActionGroup *action_group); void gtk_action_muxer_remove (GtkActionMuxer *muxer, - const gchar *prefix); + const char *prefix); GActionGroup * gtk_action_muxer_find (GtkActionMuxer *muxer, const char *action_name, const char **unprefixed_name); diff --git a/gtk/gtkactionobservable.c b/gtk/gtkactionobservable.c index 914f24b052..27fb7dbd99 100644 --- a/gtk/gtkactionobservable.c +++ b/gtk/gtkactionobservable.c @@ -45,7 +45,7 @@ gtk_action_observable_default_init (GtkActionObservableInterface *iface) */ void gtk_action_observable_register_observer (GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GtkActionObserver *observer) { g_return_if_fail (GTK_IS_ACTION_OBSERVABLE (observable)); @@ -68,7 +68,7 @@ gtk_action_observable_register_observer (GtkActionObservable *observable, */ void gtk_action_observable_unregister_observer (GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GtkActionObserver *observer) { g_return_if_fail (GTK_IS_ACTION_OBSERVABLE (observable)); diff --git a/gtk/gtkactionobservableprivate.h b/gtk/gtkactionobservableprivate.h index d82c89729f..4ab688855a 100644 --- a/gtk/gtkactionobservableprivate.h +++ b/gtk/gtkactionobservableprivate.h @@ -40,19 +40,19 @@ struct _GtkActionObservableInterface GTypeInterface g_iface; void (* register_observer) (GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GtkActionObserver *observer); void (* unregister_observer) (GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GtkActionObserver *observer); }; GType gtk_action_observable_get_type (void); void gtk_action_observable_register_observer (GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GtkActionObserver *observer); void gtk_action_observable_unregister_observer (GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GtkActionObserver *observer); G_END_DECLS diff --git a/gtk/gtkactionobserver.c b/gtk/gtkactionobserver.c index 3a5a9abb19..ea3d2eb98e 100644 --- a/gtk/gtkactionobserver.c +++ b/gtk/gtkactionobserver.c @@ -74,7 +74,7 @@ gtk_action_observer_default_init (GtkActionObserverInterface *class) void gtk_action_observer_action_added (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, const GVariantType *parameter_type, gboolean enabled, GVariant *state) @@ -101,7 +101,7 @@ gtk_action_observer_action_added (GtkActionObserver *observer, void gtk_action_observer_action_enabled_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, gboolean enabled) { g_return_if_fail (GTK_IS_ACTION_OBSERVER (observer)); @@ -126,7 +126,7 @@ gtk_action_observer_action_enabled_changed (GtkActionObserver *observer, void gtk_action_observer_action_state_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GVariant *state) { g_return_if_fail (GTK_IS_ACTION_OBSERVER (observer)); @@ -150,7 +150,7 @@ gtk_action_observer_action_state_changed (GtkActionObserver *observer, void gtk_action_observer_action_removed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name) + const char *action_name) { g_return_if_fail (GTK_IS_ACTION_OBSERVER (observer)); @@ -175,8 +175,8 @@ gtk_action_observer_action_removed (GtkActionObserver *observer, void gtk_action_observer_primary_accel_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, - const gchar *action_and_target) + const char *action_name, + const char *action_and_target) { GtkActionObserverInterface *iface; diff --git a/gtk/gtkactionobserverprivate.h b/gtk/gtkactionobserverprivate.h index a1a31cc25f..a9ea3cdb57 100644 --- a/gtk/gtkactionobserverprivate.h +++ b/gtk/gtkactionobserverprivate.h @@ -42,49 +42,49 @@ struct _GtkActionObserverInterface void (* action_added) (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, const GVariantType *parameter_type, gboolean enabled, GVariant *state); void (* action_enabled_changed) (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, gboolean enabled); void (* action_state_changed) (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GVariant *state); void (* action_removed) (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name); + const char *action_name); void (* primary_accel_changed) (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, - const gchar *action_and_target); + const char *action_name, + const char *action_and_target); }; GType gtk_action_observer_get_type (void); void gtk_action_observer_action_added (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, const GVariantType *parameter_type, gboolean enabled, GVariant *state); void gtk_action_observer_action_enabled_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, gboolean enabled); void gtk_action_observer_action_state_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GVariant *state); void gtk_action_observer_action_removed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name); + const char *action_name); void gtk_action_observer_primary_accel_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, - const gchar *action_and_target); + const char *action_name, + const char *action_and_target); G_END_DECLS diff --git a/gtk/gtkappchooser.c b/gtk/gtkappchooser.c index 35fc9cdbf2..697174d5d9 100644 --- a/gtk/gtkappchooser.c +++ b/gtk/gtkappchooser.c @@ -87,10 +87,10 @@ gtk_app_chooser_default_init (GtkAppChooserIface *iface) * * Returns: the content type of @self. Free with g_free() */ -gchar * +char * gtk_app_chooser_get_content_type (GtkAppChooser *self) { - gchar *retval = NULL; + char *retval = NULL; g_return_val_if_fail (GTK_IS_APP_CHOOSER (self), NULL); diff --git a/gtk/gtkappchooser.h b/gtk/gtkappchooser.h index 7a522550fd..21d2cbbca1 100644 --- a/gtk/gtkappchooser.h +++ b/gtk/gtkappchooser.h @@ -44,7 +44,7 @@ GType gtk_app_chooser_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GAppInfo * gtk_app_chooser_get_app_info (GtkAppChooser *self); GDK_AVAILABLE_IN_ALL -gchar * gtk_app_chooser_get_content_type (GtkAppChooser *self); +char * gtk_app_chooser_get_content_type (GtkAppChooser *self); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_refresh (GtkAppChooser *self); diff --git a/gtk/gtkappchooserbutton.c b/gtk/gtkappchooserbutton.c index e86873f14d..518f2c64be 100644 --- a/gtk/gtkappchooserbutton.c +++ b/gtk/gtkappchooserbutton.c @@ -94,8 +94,8 @@ enum { static void app_chooser_iface_init (GtkAppChooserIface *iface); static void real_insert_custom_item (GtkAppChooserButton *self, - const gchar *name, - const gchar *label, + const char *name, + const char *label, GIcon *icon, gboolean custom, GtkTreeIter *iter); @@ -115,8 +115,8 @@ struct _GtkAppChooserButton { GtkWidget *combobox; GtkListStore *store; - gchar *content_type; - gchar *heading; + char *content_type; + char *heading; int last_active; gboolean show_dialog_item; gboolean show_default_item; @@ -130,7 +130,7 @@ struct _GtkAppChooserButtonClass { void (* changed) (GtkAppChooserButton *self); void (* custom_item_activated) (GtkAppChooserButton *self, - const gchar *item_name); + const char *item_name); }; G_DEFINE_TYPE_WITH_CODE (GtkAppChooserButton, gtk_app_chooser_button, GTK_TYPE_WIDGET, @@ -463,7 +463,7 @@ gtk_app_chooser_button_changed (GtkComboBox *object, { GtkAppChooserButton *self = user_data; GtkTreeIter iter; - gchar *name = NULL; + char *name = NULL; gboolean custom; GQuark name_quark; @@ -765,11 +765,11 @@ gtk_app_chooser_button_init (GtkAppChooserButton *self) static gboolean app_chooser_button_iter_from_custom_name (GtkAppChooserButton *self, - const gchar *name, + const char *name, GtkTreeIter *set_me) { GtkTreeIter iter; - gchar *custom_name = NULL; + char *custom_name = NULL; if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->store), &iter)) return FALSE; @@ -795,8 +795,8 @@ app_chooser_button_iter_from_custom_name (GtkAppChooserButton *self, static void real_insert_custom_item (GtkAppChooserButton *self, - const gchar *name, - const gchar *label, + const char *name, + const char *label, GIcon *icon, gboolean custom, GtkTreeIter *iter) @@ -844,7 +844,7 @@ real_insert_separator (GtkAppChooserButton *self, * Returns: a newly created #GtkAppChooserButton */ GtkWidget * -gtk_app_chooser_button_new (const gchar *content_type) +gtk_app_chooser_button_new (const char *content_type) { g_return_val_if_fail (content_type != NULL, NULL); @@ -887,8 +887,8 @@ gtk_app_chooser_button_append_separator (GtkAppChooserButton *self) */ void gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self, - const gchar *name, - const gchar *label, + const char *name, + const char *label, GIcon *icon) { GtkTreeIter iter; @@ -913,7 +913,7 @@ gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self, */ void gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self, - const gchar *name) + const char *name) { GtkTreeIter iter; @@ -1020,7 +1020,7 @@ gtk_app_chooser_button_set_show_default_item (GtkAppChooserButton *self, */ void gtk_app_chooser_button_set_heading (GtkAppChooserButton *self, - const gchar *heading) + const char *heading) { g_return_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self)); @@ -1039,7 +1039,7 @@ gtk_app_chooser_button_set_heading (GtkAppChooserButton *self, * Returns: (nullable): the text to display at the top of the dialog, * or %NULL, in which case a default text is displayed */ -const gchar * +const char * gtk_app_chooser_button_get_heading (GtkAppChooserButton *self) { g_return_val_if_fail (GTK_IS_APP_CHOOSER_BUTTON (self), NULL); diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h index 91083b28eb..1f8b33d11e 100644 --- a/gtk/gtkappchooserbutton.h +++ b/gtk/gtkappchooserbutton.h @@ -41,18 +41,18 @@ GDK_AVAILABLE_IN_ALL GType gtk_app_chooser_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_app_chooser_button_new (const gchar *content_type); +GtkWidget * gtk_app_chooser_button_new (const char *content_type); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_button_append_separator (GtkAppChooserButton *self); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_button_append_custom_item (GtkAppChooserButton *self, - const gchar *name, - const gchar *label, + const char *name, + const char *label, GIcon *icon); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_button_set_active_custom_item (GtkAppChooserButton *self, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_button_set_show_dialog_item (GtkAppChooserButton *self, @@ -61,9 +61,9 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_app_chooser_button_get_show_dialog_item (GtkAppChooserButton *self); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_button_set_heading (GtkAppChooserButton *self, - const gchar *heading); + const char *heading); GDK_AVAILABLE_IN_ALL -const gchar * +const char * gtk_app_chooser_button_get_heading (GtkAppChooserButton *self); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_button_set_show_default_item (GtkAppChooserButton *self, diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index 3444af1174..6999eabf4f 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -175,13 +175,13 @@ get_extension (const char *basename) static void set_dialog_properties (GtkAppChooserDialog *self) { - gchar *name; - gchar *extension; - gchar *description; - gchar *string; + char *name; + char *extension; + char *description; + char *string; gboolean unknown; - gchar *title; - gchar *subtitle; + char *title; + char *subtitle; gboolean use_header; GtkWidget *header; @@ -381,8 +381,8 @@ gtk_app_chooser_dialog_refresh (GtkAppChooser *object) } static void -show_error_dialog (const gchar *primary, - const gchar *secondary, +show_error_dialog (const char *primary, + const char *secondary, GtkWindow *parent) { GtkWidget *message_dialog; @@ -409,7 +409,7 @@ software_button_clicked_cb (GtkButton *button, { GSubprocess *process; GError *error = NULL; - gchar *option; + char *option; if (self->content_type) option = g_strconcat ("--search=", self->content_type, NULL); @@ -432,7 +432,7 @@ software_button_clicked_cb (GtkButton *button, static void ensure_software_button (GtkAppChooserDialog *self) { - gchar *path; + char *path; path = g_find_program_in_path ("gnome-software"); if (path != NULL) @@ -705,7 +705,7 @@ gtk_app_chooser_dialog_new (GtkWindow *parent, GtkWidget * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, GtkDialogFlags flags, - const gchar *content_type) + const char *content_type) { GtkWidget *retval; @@ -746,7 +746,7 @@ gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self) */ void gtk_app_chooser_dialog_set_heading (GtkAppChooserDialog *self, - const gchar *heading) + const char *heading) { g_return_if_fail (GTK_IS_APP_CHOOSER_DIALOG (self)); @@ -778,7 +778,7 @@ gtk_app_chooser_dialog_set_heading (GtkAppChooserDialog *self, * Returns: (nullable): the text to display at the top of the dialog, or %NULL, in which * case a default text is displayed */ -const gchar * +const char * gtk_app_chooser_dialog_get_heading (GtkAppChooserDialog *self) { g_return_val_if_fail (GTK_IS_APP_CHOOSER_DIALOG (self), NULL); diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h index 45c7d8b66b..422610bcc5 100644 --- a/gtk/gtkappchooserdialog.h +++ b/gtk/gtkappchooserdialog.h @@ -50,15 +50,15 @@ GtkWidget * gtk_app_chooser_dialog_new (GtkWindow * GDK_AVAILABLE_IN_ALL GtkWidget * gtk_app_chooser_dialog_new_for_content_type (GtkWindow *parent, GtkDialogFlags flags, - const gchar *content_type); + const char *content_type); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_app_chooser_dialog_get_widget (GtkAppChooserDialog *self); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_dialog_set_heading (GtkAppChooserDialog *self, - const gchar *heading); + const char *heading); GDK_AVAILABLE_IN_ALL -const gchar * gtk_app_chooser_dialog_get_heading (GtkAppChooserDialog *self); +const char * gtk_app_chooser_dialog_get_heading (GtkAppChooserDialog *self); G_END_DECLS diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c index 746fcf75d7..7c4da1d85f 100644 --- a/gtk/gtkappchooserwidget.c +++ b/gtk/gtkappchooserwidget.c @@ -81,8 +81,8 @@ struct _GtkAppChooserWidget { GtkWidget *overlay; - gchar *content_type; - gchar *default_text; + char *content_type; + char *default_text; guint show_default : 1; guint show_recommended : 1; @@ -231,12 +231,12 @@ program_list_selection_activated (GtkTreeView *view, static gboolean gtk_app_chooser_search_equal_func (GtkTreeModel *model, int column, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer user_data) { - gchar *name; - gchar *exec_name; + char *name; + char *exec_name; gboolean ret; if (key != NULL) @@ -273,7 +273,7 @@ gtk_app_chooser_sort_func (GtkTreeModel *model, gboolean a_fallback, b_fallback; gboolean a_heading, b_heading; gboolean a_default, b_default; - gchar *a_name, *b_name, *a_casefold, *b_casefold; + char *a_name, *b_name, *a_casefold, *b_casefold; int retval = 0; /* this returns: @@ -424,7 +424,7 @@ compare_apps_func (gconstpointer a, static gboolean gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self, - const gchar *heading_title, + const char *heading_title, gboolean show_headings, gboolean recommended, gboolean fallback, @@ -434,7 +434,7 @@ gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self, gboolean heading_added, unref_icon; GtkTreeIter iter; GAppInfo *app; - gchar *app_string, *bold_string; + char *app_string, *bold_string; GIcon *icon; GList *l; gboolean retval; @@ -512,7 +512,7 @@ gtk_app_chooser_add_default (GtkAppChooserWidget *self, { GtkTreeIter iter; GIcon *icon; - gchar *string; + char *string; gboolean unref_icon; unref_icon = FALSE; @@ -558,8 +558,8 @@ gtk_app_chooser_add_default (GtkAppChooserWidget *self, static void update_no_applications_label (GtkAppChooserWidget *self) { - gchar *text = NULL, *desc = NULL; - const gchar *string; + char *text = NULL, *desc = NULL; + const char *string; if (self->default_text == NULL) { @@ -1125,7 +1125,7 @@ gtk_app_chooser_widget_iface_init (GtkAppChooserIface *iface) * Returns: a newly created #GtkAppChooserWidget */ GtkWidget * -gtk_app_chooser_widget_new (const gchar *content_type) +gtk_app_chooser_widget_new (const char *content_type) { return g_object_new (GTK_TYPE_APP_CHOOSER_WIDGET, "content-type", content_type, @@ -1347,7 +1347,7 @@ gtk_app_chooser_widget_get_show_all (GtkAppChooserWidget *self) */ void gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, - const gchar *text) + const char *text) { g_return_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self)); @@ -1371,7 +1371,7 @@ gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, * * Returns: the value of #GtkAppChooserWidget:default-text */ -const gchar * +const char * gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self) { g_return_val_if_fail (GTK_IS_APP_CHOOSER_WIDGET (self), NULL); diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h index c71919e494..066da1bb04 100644 --- a/gtk/gtkappchooserwidget.h +++ b/gtk/gtkappchooserwidget.h @@ -44,7 +44,7 @@ GDK_AVAILABLE_IN_ALL GType gtk_app_chooser_widget_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_app_chooser_widget_new (const gchar *content_type); +GtkWidget * gtk_app_chooser_widget_new (const char *content_type); GDK_AVAILABLE_IN_ALL void gtk_app_chooser_widget_set_show_default (GtkAppChooserWidget *self, @@ -78,9 +78,9 @@ gboolean gtk_app_chooser_widget_get_show_all (GtkAppChooserWidget * GDK_AVAILABLE_IN_ALL void gtk_app_chooser_widget_set_default_text (GtkAppChooserWidget *self, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL -const gchar * gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self); +const char * gtk_app_chooser_widget_get_default_text (GtkAppChooserWidget *self); G_END_DECLS diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c index 99e7d0c832..d946e0594e 100644 --- a/gtk/gtkapplication-dbus.c +++ b/gtk/gtkapplication-dbus.c @@ -75,7 +75,7 @@ unregister_client (GtkApplicationImplDBus *dbus) static void send_quit_response (GtkApplicationImplDBus *dbus, gboolean will_quit, - const gchar *reason) + const char *reason) { g_debug ("Calling EndSessionResponse %d '%s'", will_quit, reason); @@ -89,8 +89,8 @@ send_quit_response (GtkApplicationImplDBus *dbus, static void client_proxy_signal (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, + const char *sender_name, + const char *signal_name, GVariant *parameters, gpointer user_data) { @@ -124,13 +124,13 @@ client_proxy_signal (GDBusProxy *proxy, static GDBusProxy* gtk_application_get_proxy_if_service_present (GDBusConnection *connection, GDBusProxyFlags flags, - const gchar *bus_name, - const gchar *object_path, - const gchar *interface, + const char *bus_name, + const char *object_path, + const char *interface, GError **error) { GDBusProxy *proxy; - gchar *owner; + char *owner; proxy = g_dbus_proxy_new_sync (connection, flags, @@ -442,8 +442,8 @@ gtk_application_impl_dbus_startup (GtkApplicationImpl *impl, if (dbus->session) { - const gchar *id; - const gchar *id2; + const char *id; + const char *id2; GValue value = G_VALUE_INIT; g_value_init (&value, G_TYPE_STRING); @@ -549,7 +549,7 @@ gtk_application_impl_dbus_window_added (GtkApplicationImpl *impl, { GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) impl; GActionGroup *actions; - gchar *path; + char *path; guint id; if (!dbus->session || !GTK_IS_APPLICATION_WINDOW (window)) @@ -588,10 +588,10 @@ gtk_application_impl_dbus_active_window_changed (GtkApplicationImpl *impl, static void gtk_application_impl_dbus_publish_menu (GtkApplicationImplDBus *dbus, - const gchar *type, + const char *type, GMenuModel *model, guint *id, - gchar **path) + char **path) { int i; @@ -677,7 +677,7 @@ static guint gtk_application_impl_dbus_inhibit (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason) + const char *reason) { GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) impl; GVariant *res; @@ -897,7 +897,7 @@ gtk_application_impl_dbus_class_init (GtkApplicationImplDBusClass *class) gobject_class->finalize = gtk_application_impl_dbus_finalize; } -gchar * +char * gtk_application_impl_dbus_get_window_path (GtkApplicationImplDBus *dbus, GtkWindow *window) { diff --git a/gtk/gtkapplication-quartz-menu.c b/gtk/gtkapplication-quartz-menu.c index 2f6402a044..61e4ad741d 100644 --- a/gtk/gtkapplication-quartz-menu.c +++ b/gtk/gtkapplication-quartz-menu.c @@ -81,7 +81,7 @@ tracker_item_changed (GObject *object, gpointer user_data) { GNSMenuItem *item = user_data; - const gchar *name = g_param_spec_get_name (pspec); + const char *name = g_param_spec_get_name (pspec); if (name != NULL) { @@ -170,7 +170,7 @@ icon_loaded (GObject *object, if (self != nil) { - const gchar *special = gtk_menu_tracker_item_get_special (aTrackerItem); + const char *special = gtk_menu_tracker_item_get_special (aTrackerItem); if (special && g_str_equal (special, "hide-this")) { @@ -229,7 +229,7 @@ icon_loaded (GObject *object, - (void)didChangeLabel { - gchar *label = _gtk_toolbar_elide_underscores (gtk_menu_tracker_item_get_label (trackerItem)); + char *label = _gtk_toolbar_elide_underscores (gtk_menu_tracker_item_get_label (trackerItem)); NSString *title = [NSString stringWithUTF8String:label ? : ""]; @@ -327,7 +327,7 @@ icon_loaded (GObject *object, - (void)didChangeAccel { - const gchar *accel = gtk_menu_tracker_item_get_accel (trackerItem); + const char *accel = gtk_menu_tracker_item_get_accel (trackerItem); if (accel != NULL) { diff --git a/gtk/gtkapplication-quartz.c b/gtk/gtkapplication-quartz.c index f80497f547..7be91424e4 100644 --- a/gtk/gtkapplication-quartz.c +++ b/gtk/gtkapplication-quartz.c @@ -154,10 +154,10 @@ gtk_application_impl_quartz_startup (GtkApplicationImpl *impl, GtkApplicationImplQuartz *quartz = (GtkApplicationImplQuartz *) impl; GSimpleActionGroup *gtkinternal; GMenuModel *app_menu; - const gchar *pref_accel[] = {"<Control>comma", NULL}; - const gchar *hide_others_accel[] = {"<Control><Alt>h", NULL}; - const gchar *hide_accel[] = {"<Control>h", NULL}; - const gchar *quit_accel[] = {"<Control>q", NULL}; + const char *pref_accel[] = {"<Control>comma", NULL}; + const char *hide_others_accel[] = {"<Control><Alt>h", NULL}; + const char *hide_accel[] = {"<Control>h", NULL}; + const char *quit_accel[] = {"<Control>q", NULL}; if (register_session) { @@ -279,7 +279,7 @@ static guint gtk_application_impl_quartz_inhibit (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason) + const char *reason) { GtkApplicationImplQuartz *quartz = (GtkApplicationImplQuartz *) impl; GtkApplicationQuartzInhibitor *inhibitor; diff --git a/gtk/gtkapplication-wayland.c b/gtk/gtkapplication-wayland.c index face15505c..a5731769d2 100644 --- a/gtk/gtkapplication-wayland.c +++ b/gtk/gtkapplication-wayland.c @@ -36,7 +36,7 @@ typedef struct guint (*dbus_inhibit) (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason); + const char *reason); void (*dbus_uninhibit) (GtkApplicationImpl *impl, guint cookie); } GtkApplicationImplWaylandClass; @@ -74,7 +74,7 @@ gtk_application_impl_wayland_handle_window_realize (GtkApplicationImpl *impl, GTK_APPLICATION_IMPL_CLASS (gtk_application_impl_wayland_parent_class); GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) impl; GdkSurface *gdk_surface; - gchar *window_path; + char *window_path; gdk_surface = gtk_native_get_surface (GTK_NATIVE (window)); @@ -107,7 +107,7 @@ static guint gtk_application_impl_wayland_inhibit (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason) + const char *reason) { GtkApplicationImplWayland *wayland = (GtkApplicationImplWayland *) impl; GdkSurface *surface; diff --git a/gtk/gtkapplication-x11.c b/gtk/gtkapplication-x11.c index 933b160b25..f834c78e04 100644 --- a/gtk/gtkapplication-x11.c +++ b/gtk/gtkapplication-x11.c @@ -41,7 +41,7 @@ gtk_application_impl_x11_handle_window_realize (GtkApplicationImpl *impl, { GtkApplicationImplDBus *dbus = (GtkApplicationImplDBus *) impl; GdkSurface *gdk_surface; - gchar *window_path; + char *window_path; gdk_surface = gtk_native_get_surface (GTK_NATIVE (window)); diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index d736e34a8b..62e83fe7ac 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -156,7 +156,7 @@ typedef struct gboolean screensaver_active; GtkActionMuxer *muxer; GtkBuilder *menus_builder; - gchar *help_overlay_path; + char *help_overlay_path; guint profiler_id; } GtkApplicationPrivate; @@ -191,7 +191,7 @@ static void gtk_application_load_resources (GtkApplication *application) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); - const gchar *base_path; + const char *base_path; base_path = g_application_get_resource_base_path (G_APPLICATION (application)); @@ -201,7 +201,7 @@ gtk_application_load_resources (GtkApplication *application) /* Expand the icon search path */ { GtkIconTheme *default_theme; - gchar *iconspath; + char *iconspath; default_theme = gtk_icon_theme_get_for_display (gdk_display_get_default ()); iconspath = g_strconcat (base_path, "/icons/", NULL); @@ -211,7 +211,7 @@ gtk_application_load_resources (GtkApplication *application) /* Load the menus */ { - gchar *menuspath; + char *menuspath; menuspath = g_strconcat (base_path, "/gtk/menus.ui", NULL); if (g_resources_get_info (menuspath, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL)) @@ -230,12 +230,12 @@ gtk_application_load_resources (GtkApplication *application) /* Help overlay */ { - gchar *path; + char *path; path = g_strconcat (base_path, "/gtk/help-overlay.ui", NULL); if (g_resources_get_info (path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL)) { - const gchar * const accels[] = { "<Control>question", NULL }; + const char * const accels[] = { "<Control>question", NULL }; priv->help_overlay_path = path; gtk_application_set_accels_for_action (application, "win.show-help-overlay", accels); @@ -295,7 +295,7 @@ gtk_application_shutdown (GApplication *g_application) static gboolean gtk_application_local_command_line (GApplication *application, - gchar ***arguments, + char ***arguments, int *exit_status) { return G_APPLICATION_CLASS (gtk_application_parent_class)->local_command_line (application, arguments, exit_status); @@ -317,7 +317,7 @@ gtk_application_add_platform_data (GApplication *application, display = gdk_display_get_default (); if (display) { - const gchar *startup_id; + const char *startup_id; startup_id = gdk_display_get_startup_notification_id (display); if (startup_id && g_utf8_validate (startup_id, -1, NULL)) @@ -504,7 +504,7 @@ gtk_application_finalize (GObject *object) #ifdef G_OS_UNIX -static const gchar org_gnome_Sysprof3_Profiler_xml[] = +static const char org_gnome_Sysprof3_Profiler_xml[] = "<node>" "<interface name='org.gnome.Sysprof3.Profiler'>" "<property name='Capabilities' type='a{sv}' access='read'/>" @@ -521,10 +521,10 @@ static GDBusInterfaceInfo *org_gnome_Sysprof3_Profiler; static void sysprof_profiler_method_call (GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *method_name, + const char *sender, + const char *object_path, + const char *interface_name, + const char *method_name, GVariant *parameters, GDBusMethodInvocation *invocation, gpointer user_data) @@ -797,7 +797,7 @@ gtk_application_class_init (GtkApplicationClass *class) * Returns: a new #GtkApplication instance */ GtkApplication * -gtk_application_new (const gchar *application_id, +gtk_application_new (const char *application_id, GApplicationFlags flags) { g_return_val_if_fail (application_id == NULL || g_application_id_is_valid (application_id), NULL); @@ -1084,7 +1084,7 @@ guint gtk_application_inhibit (GtkApplication *application, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason) + const char *reason) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); @@ -1146,7 +1146,7 @@ gtk_application_get_application_accels (GtkApplication *application) * Returns: (transfer full): a %NULL-terminated array of strings, * free with g_strfreev() when done */ -gchar ** +char ** gtk_application_list_action_descriptions (GtkApplication *application) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); @@ -1176,11 +1176,11 @@ gtk_application_list_action_descriptions (GtkApplication *application) */ void gtk_application_set_accels_for_action (GtkApplication *application, - const gchar *detailed_action_name, - const gchar * const *accels) + const char *detailed_action_name, + const char * const *accels) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); - gchar *action_and_target; + char *action_and_target; g_return_if_fail (GTK_IS_APPLICATION (application)); g_return_if_fail (detailed_action_name != NULL); @@ -1209,9 +1209,9 @@ gtk_application_set_accels_for_action (GtkApplication *application, * Returns: (transfer full): accelerators for @detailed_action_name, as * a %NULL-terminated array. Free with g_strfreev() when no longer needed */ -gchar ** +char ** gtk_application_get_accels_for_action (GtkApplication *application, - const gchar *detailed_action_name) + const char *detailed_action_name) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); @@ -1245,9 +1245,9 @@ gtk_application_get_accels_for_action (GtkApplication *application, * * Returns: (transfer full): a %NULL-terminated array of actions for @accel */ -gchar ** +char ** gtk_application_get_actions_for_accel (GtkApplication *application, - const gchar *accel) + const char *accel) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); @@ -1269,7 +1269,7 @@ gtk_application_get_action_muxer (GtkApplication *application) void gtk_application_insert_action_group (GtkApplication *application, - const gchar *name, + const char *name, GActionGroup *action_group) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); @@ -1311,7 +1311,7 @@ gtk_application_handle_window_map (GtkApplication *application, */ GMenu * gtk_application_get_menu_by_id (GtkApplication *application, - const gchar *id) + const char *id) { GtkApplicationPrivate *priv = gtk_application_get_instance_private (application); GObject *object; diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h index a749adfd2a..56e51a18a6 100644 --- a/gtk/gtkapplication.h +++ b/gtk/gtkapplication.h @@ -72,7 +72,7 @@ GDK_AVAILABLE_IN_ALL GType gtk_application_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkApplication * gtk_application_new (const gchar *application_id, +GtkApplication * gtk_application_new (const char *application_id, GApplicationFlags flags); GDK_AVAILABLE_IN_ALL @@ -103,7 +103,7 @@ GDK_AVAILABLE_IN_ALL guint gtk_application_inhibit (GtkApplication *application, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason); + const char *reason); GDK_AVAILABLE_IN_ALL void gtk_application_uninhibit (GtkApplication *application, guint cookie); @@ -116,24 +116,24 @@ GDK_AVAILABLE_IN_ALL GtkWindow * gtk_application_get_active_window (GtkApplication *application); GDK_AVAILABLE_IN_ALL -gchar ** gtk_application_list_action_descriptions (GtkApplication *application); +char ** gtk_application_list_action_descriptions (GtkApplication *application); GDK_AVAILABLE_IN_ALL -gchar ** gtk_application_get_accels_for_action (GtkApplication *application, - const gchar *detailed_action_name); +char ** gtk_application_get_accels_for_action (GtkApplication *application, + const char *detailed_action_name); GDK_AVAILABLE_IN_ALL -gchar ** gtk_application_get_actions_for_accel (GtkApplication *application, - const gchar *accel); +char ** gtk_application_get_actions_for_accel (GtkApplication *application, + const char *accel); GDK_AVAILABLE_IN_ALL void gtk_application_set_accels_for_action (GtkApplication *application, - const gchar *detailed_action_name, - const gchar * const *accels); + const char *detailed_action_name, + const char * const *accels); GDK_AVAILABLE_IN_ALL GMenu * gtk_application_get_menu_by_id (GtkApplication *application, - const gchar *id); + const char *id); G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkApplication, g_object_unref) diff --git a/gtk/gtkapplicationaccels.c b/gtk/gtkapplicationaccels.c index cdbaafe3cb..8ac33f8526 100644 --- a/gtk/gtkapplicationaccels.c +++ b/gtk/gtkapplicationaccels.c @@ -70,10 +70,10 @@ gtk_application_accels_new (void) void gtk_application_accels_set_accels_for_action (GtkApplicationAccels *accels, - const gchar *detailed_action_name, - const gchar * const *accelerators) + const char *detailed_action_name, + const char * const *accelerators) { - gchar *action_name; + char *action_name; GVariant *target; GtkShortcut *shortcut; GtkShortcutTrigger *trigger = NULL; @@ -173,9 +173,9 @@ append_accelerators (GPtrArray *accels, } } -gchar ** +char ** gtk_application_accels_get_accels_for_action (GtkApplicationAccels *accels, - const gchar *detailed_action_name) + const char *detailed_action_name) { GPtrArray *result; char *action_name; @@ -190,7 +190,7 @@ gtk_application_accels_get_accels_for_action (GtkApplicationAccels *accels, g_critical ("Error parsing action name: %s", error->message); g_error_free (error); g_ptr_array_add (result, NULL); - return (gchar **) g_ptr_array_free (result, FALSE); + return (char **) g_ptr_array_free (result, FALSE); } for (i = 0; i < g_list_model_get_n_items (accels->shortcuts); i++) @@ -222,7 +222,7 @@ gtk_application_accels_get_accels_for_action (GtkApplicationAccels *accels, if (target) g_variant_unref (target); g_ptr_array_add (result, NULL); - return (gchar **) g_ptr_array_free (result, FALSE); + return (char **) g_ptr_array_free (result, FALSE); } static gboolean @@ -262,9 +262,9 @@ get_detailed_name_for_shortcut (GtkShortcut *shortcut) gtk_shortcut_get_arguments (shortcut)); } -gchar ** +char ** gtk_application_accels_get_actions_for_accel (GtkApplicationAccels *accels, - const gchar *accel) + const char *accel) { GPtrArray *result; guint key, modifiers; @@ -297,10 +297,10 @@ gtk_application_accels_get_actions_for_accel (GtkApplicationAccels *accels, } g_ptr_array_add (result, NULL); - return (gchar **) g_ptr_array_free (result, FALSE); + return (char **) g_ptr_array_free (result, FALSE); } -gchar ** +char ** gtk_application_accels_list_action_descriptions (GtkApplicationAccels *accels) { GPtrArray *result; @@ -321,7 +321,7 @@ gtk_application_accels_list_action_descriptions (GtkApplicationAccels *accels) } g_ptr_array_add (result, NULL); - return (gchar **) g_ptr_array_free (result, FALSE); + return (char **) g_ptr_array_free (result, FALSE); } GListModel * diff --git a/gtk/gtkapplicationaccelsprivate.h b/gtk/gtkapplicationaccelsprivate.h index fbde7da368..a33f7618b9 100644 --- a/gtk/gtkapplicationaccelsprivate.h +++ b/gtk/gtkapplicationaccelsprivate.h @@ -36,16 +36,16 @@ GtkApplicationAccels * gtk_application_accels_new (void); void gtk_application_accels_set_accels_for_action (GtkApplicationAccels *accels, - const gchar *detailed_action_name, - const gchar * const *accelerators); + const char *detailed_action_name, + const char * const *accelerators); -gchar ** gtk_application_accels_get_accels_for_action (GtkApplicationAccels *accels, - const gchar *detailed_action_name); +char ** gtk_application_accels_get_accels_for_action (GtkApplicationAccels *accels, + const char *detailed_action_name); -gchar ** gtk_application_accels_get_actions_for_accel (GtkApplicationAccels *accels, - const gchar *accel); +char ** gtk_application_accels_get_actions_for_accel (GtkApplicationAccels *accels, + const char *accel); -gchar ** gtk_application_accels_list_action_descriptions (GtkApplicationAccels *accels); +char ** gtk_application_accels_list_action_descriptions (GtkApplicationAccels *accels); GListModel * gtk_application_accels_get_shortcuts (GtkApplicationAccels *accels); diff --git a/gtk/gtkapplicationimpl.c b/gtk/gtkapplicationimpl.c index c72514d0af..fa9475905d 100644 --- a/gtk/gtkapplicationimpl.c +++ b/gtk/gtkapplicationimpl.c @@ -135,7 +135,7 @@ guint gtk_application_impl_inhibit (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason) + const char *reason) { return GTK_APPLICATION_IMPL_GET_CLASS (impl)->inhibit (impl, window, flags, reason); } diff --git a/gtk/gtkapplicationprivate.h b/gtk/gtkapplicationprivate.h index 24ef7c4a40..8288c2b093 100644 --- a/gtk/gtkapplicationprivate.h +++ b/gtk/gtkapplicationprivate.h @@ -40,7 +40,7 @@ GtkActionMuxer * gtk_application_get_parent_muxer_for_window (GtkWind GtkActionMuxer * gtk_application_get_action_muxer (GtkApplication *application); void gtk_application_insert_action_group (GtkApplication *application, - const gchar *name, + const char *name, GActionGroup *action_group); GtkApplicationAccels * gtk_application_get_application_accels (GtkApplication *application); @@ -93,7 +93,7 @@ typedef struct guint (* inhibit) (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason); + const char *reason); void (* uninhibit) (GtkApplicationImpl *impl, guint cookie); gboolean (* is_inhibited) (GtkApplicationImpl *impl, @@ -118,20 +118,20 @@ typedef struct GDBusConnection *session; - const gchar *application_id; - const gchar *unique_name; - const gchar *object_path; + const char *application_id; + const char *unique_name; + const char *object_path; - gchar *app_menu_path; + char *app_menu_path; guint app_menu_id; - gchar *menubar_path; + char *menubar_path; guint menubar_id; /* Session management... */ GDBusProxy *sm_proxy; GDBusProxy *client_proxy; - gchar *client_path; + char *client_path; GDBusProxy *ss_proxy; /* Portal support */ @@ -181,13 +181,13 @@ void gtk_application_impl_set_menubar (GtkAppl guint gtk_application_impl_inhibit (GtkApplicationImpl *impl, GtkWindow *window, GtkApplicationInhibitFlags flags, - const gchar *reason); + const char *reason); void gtk_application_impl_uninhibit (GtkApplicationImpl *impl, guint cookie); gboolean gtk_application_impl_is_inhibited (GtkApplicationImpl *impl, GtkApplicationInhibitFlags flags); -gchar * gtk_application_impl_dbus_get_window_path (GtkApplicationImplDBus *dbus, +char * gtk_application_impl_dbus_get_window_path (GtkApplicationImplDBus *dbus, GtkWindow *window); gboolean gtk_application_impl_prefers_app_menu (GtkApplicationImpl *impl); diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c index bc711301e2..eff8257e62 100644 --- a/gtk/gtkapplicationwindow.c +++ b/gtk/gtkapplicationwindow.c @@ -119,7 +119,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkApplicationWindowActions, gtk_application_window_act static void gtk_application_window_actions_activate_action_full (GRemoteActionGroup *remote, - const gchar *action_name, + const char *action_name, GVariant *parameter, GVariant *platform_data) { @@ -137,7 +137,7 @@ gtk_application_window_actions_activate_action_full (GRemoteActionGroup *remote, static void gtk_application_window_actions_change_action_state_full (GRemoteActionGroup *remote, - const gchar *action_name, + const char *action_name, GVariant *value, GVariant *platform_data) { @@ -278,7 +278,7 @@ gtk_application_window_shell_shows_menubar_changed (GObject *object, gtk_application_window_update_menubar (window); } -static gchar ** +static char ** gtk_application_window_list_actions (GActionGroup *group) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (group); @@ -293,7 +293,7 @@ gtk_application_window_list_actions (GActionGroup *group) static gboolean gtk_application_window_query_action (GActionGroup *group, - const gchar *action_name, + const char *action_name, gboolean *enabled, const GVariantType **parameter_type, const GVariantType **state_type, @@ -312,7 +312,7 @@ gtk_application_window_query_action (GActionGroup *group, static void gtk_application_window_activate_action (GActionGroup *group, - const gchar *action_name, + const char *action_name, GVariant *parameter) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (group); @@ -326,7 +326,7 @@ gtk_application_window_activate_action (GActionGroup *group, static void gtk_application_window_change_action_state (GActionGroup *group, - const gchar *action_name, + const char *action_name, GVariant *state) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (group); @@ -340,7 +340,7 @@ gtk_application_window_change_action_state (GActionGroup *group, static GAction * gtk_application_window_lookup_action (GActionMap *action_map, - const gchar *action_name) + const char *action_name) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (action_map); GtkApplicationWindowPrivate *priv = gtk_application_window_get_instance_private (window); @@ -366,7 +366,7 @@ gtk_application_window_add_action (GActionMap *action_map, static void gtk_application_window_remove_action (GActionMap *action_map, - const gchar *action_name) + const char *action_name) { GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (action_map); GtkApplicationWindowPrivate *priv = gtk_application_window_get_instance_private (window); diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index af8365a1c5..558f5bda5f 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -96,7 +96,7 @@ struct _GtkAssistantPage guint complete : 1; guint complete_set : 1; - gchar *title; + char *title; GtkWidget *page; GtkWidget *regular_title; @@ -178,13 +178,13 @@ static void gtk_assistant_buildable_add_child (GtkBuildable *bu static gboolean gtk_assistant_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_assistant_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); static GList* find_page (GtkAssistant *assistant, @@ -1881,7 +1881,7 @@ gtk_assistant_remove_action_widget (GtkAssistant *assistant, void gtk_assistant_set_page_title (GtkAssistant *assistant, GtkWidget *page, - const gchar *title) + const char *title) { GtkAssistantPage *page_info; GList *child; @@ -1907,7 +1907,7 @@ gtk_assistant_set_page_title (GtkAssistant *assistant, * * Returns: the title for @page */ -const gchar* +const char * gtk_assistant_get_page_title (GtkAssistant *assistant, GtkWidget *page) { @@ -2122,7 +2122,7 @@ gtk_assistant_accessible_ref_child (AtkObject *accessible, GtkWidget *widget, *child; int n_pages; AtkObject *obj; - const gchar *title; + const char *title; widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); if (widget == NULL) @@ -2211,7 +2211,7 @@ gboolean gtk_assistant_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -2223,7 +2223,7 @@ static void gtk_assistant_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { parent_buildable_iface->custom_finished (buildable, builder, child, diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h index 753703f93c..6037acb3d1 100644 --- a/gtk/gtkassistant.h +++ b/gtk/gtkassistant.h @@ -144,9 +144,9 @@ GtkAssistantPageType gtk_assistant_get_page_type (GtkAssistant GDK_AVAILABLE_IN_ALL void gtk_assistant_set_page_title (GtkAssistant *assistant, GtkWidget *page, - const gchar *title); + const char *title); GDK_AVAILABLE_IN_ALL -const gchar * gtk_assistant_get_page_title (GtkAssistant *assistant, +const char * gtk_assistant_get_page_title (GtkAssistant *assistant, GtkWidget *page); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkbookmarklist.c b/gtk/gtkbookmarklist.c index 537389e316..f900a94246 100644 --- a/gtk/gtkbookmarklist.c +++ b/gtk/gtkbookmarklist.c @@ -355,7 +355,7 @@ gtk_bookmark_list_start_loading (GtkBookmarkList *self) for (i = 0; i < len; i++) { - const gchar *uri = uris[i]; + const char *uri = uris[i]; GFile *file; /* add this item */ diff --git a/gtk/gtkbookmarksmanager.c b/gtk/gtkbookmarksmanager.c index 42ec6b1296..4fce669113 100644 --- a/gtk/gtkbookmarksmanager.c +++ b/gtk/gtkbookmarksmanager.c @@ -43,7 +43,7 @@ _gtk_bookmark_free (gpointer data) static void set_error_bookmark_doesnt_exist (GFile *file, GError **error) { - gchar *uri = g_file_get_uri (file); + char *uri = g_file_get_uri (file); g_set_error (error, GTK_FILE_CHOOSER_ERROR, @@ -58,7 +58,7 @@ static GFile * get_legacy_bookmarks_file (void) { GFile *file; - gchar *filename; + char *filename; filename = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL); file = g_file_new_for_path (filename); @@ -71,7 +71,7 @@ static GFile * get_bookmarks_file (void) { GFile *file; - gchar *filename; + char *filename; /* Use gtk-3.0's bookmarks file as the format didn't change. * Add the 3.0 file format to get_legacy_bookmarks_file() when @@ -87,7 +87,7 @@ get_bookmarks_file (void) static GSList * parse_bookmarks (const char *contents) { - gchar **lines, *space; + char **lines, *space; GSList *bookmarks = NULL; int i; @@ -124,7 +124,7 @@ parse_bookmarks (const char *contents) static GSList * read_bookmarks (GFile *file) { - gchar *contents; + char *contents; GSList *bookmarks = NULL; if (!g_file_load_contents (file, NULL, &contents, @@ -184,7 +184,7 @@ save_bookmarks (GFile *bookmarks_file, for (l = bookmarks; l; l = l->next) { GtkBookmark *bookmark = l->data; - gchar *uri; + char *uri; uri = g_file_get_uri (bookmark->file); if (!uri) @@ -393,7 +393,7 @@ _gtk_bookmarks_manager_insert_bookmark (GtkBookmarksManager *manager, if (link) { - gchar *uri; + char *uri; bookmark = link->data; uri = g_file_get_uri (bookmark->file); @@ -508,12 +508,12 @@ _gtk_bookmarks_manager_reorder_bookmark (GtkBookmarksManager *manager, return TRUE; } -gchar * +char * _gtk_bookmarks_manager_get_bookmark_label (GtkBookmarksManager *manager, GFile *file) { GSList *bookmarks; - gchar *label = NULL; + char *label = NULL; g_return_val_if_fail (manager != NULL, NULL); g_return_val_if_fail (file != NULL, NULL); @@ -540,7 +540,7 @@ _gtk_bookmarks_manager_get_bookmark_label (GtkBookmarksManager *manager, gboolean _gtk_bookmarks_manager_set_bookmark_label (GtkBookmarksManager *manager, GFile *file, - const gchar *label, + const char *label, GError **error) { GFile *bookmarks_file; @@ -580,7 +580,7 @@ _gtk_bookmarks_manager_get_xdg_type (GtkBookmarksManager *manager, GSList *link; gboolean match; GFile *location; - const gchar *path; + const char *path; GUserDirectory dir; GtkBookmark *bookmark; diff --git a/gtk/gtkbookmarksmanagerprivate.h b/gtk/gtkbookmarksmanagerprivate.h index e61c713a46..7333f771a5 100644 --- a/gtk/gtkbookmarksmanagerprivate.h +++ b/gtk/gtkbookmarksmanagerprivate.h @@ -43,7 +43,7 @@ typedef struct typedef struct { GFile *file; - gchar *label; + char *label; } GtkBookmark; GtkBookmarksManager *_gtk_bookmarks_manager_new (GtkBookmarksChangedFunc changed_func, @@ -71,12 +71,12 @@ gboolean _gtk_bookmarks_manager_reorder_bookmark (GtkBookmarksManager *manager, gboolean _gtk_bookmarks_manager_has_bookmark (GtkBookmarksManager *manager, GFile *file); -gchar * _gtk_bookmarks_manager_get_bookmark_label (GtkBookmarksManager *manager, +char * _gtk_bookmarks_manager_get_bookmark_label (GtkBookmarksManager *manager, GFile *file); gboolean _gtk_bookmarks_manager_set_bookmark_label (GtkBookmarksManager *manager, GFile *file, - const gchar *label, + const char *label, GError **error); gboolean _gtk_bookmarks_manager_get_is_builtin (GtkBookmarksManager *manager, diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 4e6a228cb3..11d430ffab 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -296,7 +296,7 @@ static void gtk_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_box_append (GTK_BOX (buildable), GTK_WIDGET (child)); diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c index 7211c3b300..85bf0485d0 100644 --- a/gtk/gtkbuildable.c +++ b/gtk/gtkbuildable.c @@ -57,7 +57,7 @@ gtk_buildable_default_init (GtkBuildableInterface *iface) **/ void gtk_buildable_set_name (GtkBuildable *buildable, - const gchar *name) + const char *name) { GtkBuildableIface *iface; @@ -87,7 +87,7 @@ gtk_buildable_set_name (GtkBuildable *buildable, * * Returns: the name set with gtk_buildable_set_name() **/ -const gchar * +const char * gtk_buildable_get_name (GtkBuildable *buildable) { GtkBuildableIface *iface; @@ -99,7 +99,7 @@ gtk_buildable_get_name (GtkBuildable *buildable) if (iface->get_name) return (* iface->get_name) (buildable); else - return (const gchar*)g_object_get_data (G_OBJECT (buildable), + return (const char *)g_object_get_data (G_OBJECT (buildable), "gtk-builder-name"); } @@ -117,7 +117,7 @@ void gtk_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { GtkBuildableIface *iface; @@ -142,7 +142,7 @@ gtk_buildable_add_child (GtkBuildable *buildable, void gtk_buildable_set_buildable_property (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name, + const char *name, const GValue *value) { GtkBuildableIface *iface; @@ -200,7 +200,7 @@ gtk_buildable_parser_finished (GtkBuildable *buildable, GObject * gtk_buildable_construct_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name) + const char *name) { GtkBuildableIface *iface; @@ -233,7 +233,7 @@ gboolean gtk_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -265,7 +265,7 @@ void gtk_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { GtkBuildableIface *iface; @@ -294,7 +294,7 @@ void gtk_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { GtkBuildableIface *iface; @@ -320,7 +320,7 @@ gtk_buildable_custom_finished (GtkBuildable *buildable, GObject * gtk_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname) + const char *childname) { GtkBuildableIface *iface; diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h index 560fe9dcce..7450103f57 100644 --- a/gtk/gtkbuildable.h +++ b/gtk/gtkbuildable.h @@ -43,22 +43,22 @@ struct _GtkBuildableParser { /* Called for open tags <foo bar="baz"> */ void (*start_element) (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, + const char *element_name, + const char **attribute_names, + const char **attribute_values, gpointer user_data, GError **error); /* Called for close tags </foo> */ void (*end_element) (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error); /* Called for character data */ /* text is not nul-terminated */ void (*text) (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error); @@ -127,41 +127,41 @@ struct _GtkBuildableIface /* virtual table */ void (* set_name) (GtkBuildable *buildable, - const gchar *name); - const gchar * (* get_name) (GtkBuildable *buildable); + const char *name); + const char * (* get_name) (GtkBuildable *buildable); void (* add_child) (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); void (* set_buildable_property) (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name, + const char *name, const GValue *value); GObject * (* construct_child) (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name); + const char *name); gboolean (* custom_tag_start) (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); void (* custom_tag_end) (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); void (* custom_finished) (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); void (* parser_finished) (GtkBuildable *buildable, GtkBuilder *builder); GObject * (* get_internal_child) (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); }; @@ -170,41 +170,41 @@ GType gtk_buildable_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL void gtk_buildable_set_name (GtkBuildable *buildable, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL -const gchar * gtk_buildable_get_name (GtkBuildable *buildable); +const char * gtk_buildable_get_name (GtkBuildable *buildable); GDK_AVAILABLE_IN_ALL void gtk_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); GDK_AVAILABLE_IN_ALL void gtk_buildable_set_buildable_property (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name, + const char *name, const GValue *value); GDK_AVAILABLE_IN_ALL GObject * gtk_buildable_construct_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL gboolean gtk_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); GDK_AVAILABLE_IN_ALL void gtk_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); GDK_AVAILABLE_IN_ALL void gtk_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); GDK_AVAILABLE_IN_ALL void gtk_buildable_parser_finished (GtkBuildable *buildable, @@ -212,7 +212,7 @@ void gtk_buildable_parser_finished (GtkBuildable *buildable, GDK_AVAILABLE_IN_ALL GObject * gtk_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); GDK_AVAILABLE_IN_ALL void gtk_buildable_parse_context_push (GtkBuildableParseContext *context, diff --git a/gtk/gtkbuilder-menus.c b/gtk/gtkbuilder-menus.c index 14d54cc832..aca07e3f2e 100644 --- a/gtk/gtkbuilder-menus.c +++ b/gtk/gtkbuilder-menus.c @@ -38,12 +38,12 @@ typedef struct struct frame frame; /* attributes */ - gchar *attribute; + char *attribute; GVariantType *type; GString *string; /* translation */ - gchar *context; + char *context; gboolean translatable; } GtkBuilderMenuState; @@ -81,9 +81,9 @@ gtk_builder_menu_pop_frame (GtkBuilderMenuState *state) static void gtk_builder_menu_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, + const char *element_name, + const char **attribute_names, + const char **attribute_values, gpointer user_data, GError **error) { @@ -115,7 +115,7 @@ gtk_builder_menu_start_element (GtkBuildableParseContext *context, else if (g_str_equal (element_name, "submenu")) { - const gchar *id; + const char *id; if (COLLECT (STRING | OPTIONAL, "id", &id)) { @@ -136,7 +136,7 @@ gtk_builder_menu_start_element (GtkBuildableParseContext *context, else if (g_str_equal (element_name, "section")) { - const gchar *id; + const char *id; if (COLLECT (STRING | OPTIONAL, "id", &id)) { @@ -161,9 +161,9 @@ gtk_builder_menu_start_element (GtkBuildableParseContext *context, /* Can have '<attribute>' or '<link>' here. */ if (g_str_equal (element_name, "attribute")) { - const gchar *typestr; - const gchar *name; - const gchar *ctxt; + const char *typestr; + const char *name; + const char *ctxt; if (COLLECT (STRING, "name", &name, OPTIONAL | BOOLEAN, "translatable", &state->translatable, @@ -192,8 +192,8 @@ gtk_builder_menu_start_element (GtkBuildableParseContext *context, if (g_str_equal (element_name, "link")) { - const gchar *name; - const gchar *id; + const char *name; + const char *id; if (COLLECT (STRING, "name", &name, STRING | OPTIONAL, "id", &id)) @@ -222,7 +222,7 @@ gtk_builder_menu_start_element (GtkBuildableParseContext *context, g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT, _("Element <%s> not allowed inside <%s>"), element_name, - (const gchar *) g_ptr_array_index (element_stack, element_stack->len - 2)); + (const char *) g_ptr_array_index (element_stack, element_stack->len - 2)); else g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT, @@ -232,7 +232,7 @@ gtk_builder_menu_start_element (GtkBuildableParseContext *context, static void gtk_builder_menu_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -243,7 +243,7 @@ gtk_builder_menu_end_element (GtkBuildableParseContext *context, if (state->string) { GVariant *value; - gchar *text; + char *text; text = g_string_free (state->string, FALSE); state->string = NULL; @@ -251,7 +251,7 @@ gtk_builder_menu_end_element (GtkBuildableParseContext *context, /* do the translation if necessary */ if (state->translatable) { - const gchar *translated; + const char *translated; if (state->context) translated = g_dpgettext2 (state->parser_data->domain, state->context, text); @@ -299,7 +299,7 @@ gtk_builder_menu_end_element (GtkBuildableParseContext *context, static void gtk_builder_menu_text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -359,13 +359,13 @@ static GtkBuildableParser gtk_builder_menu_subparser = void _gtk_builder_menu_start (ParserData *parser_data, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, + const char *element_name, + const char **attribute_names, + const char **attribute_values, GError **error) { GtkBuilderMenuState *state; - gchar *id; + char *id; state = g_slice_new0 (GtkBuilderMenuState); state->parser_data = parser_data; diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 705bc52ec4..7dd1035442 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -260,13 +260,13 @@ struct _GtkBuilderClass typedef struct { - gchar *domain; + char *domain; GHashTable *objects; GSList *delayed_properties; GSList *signals; GSList *bindings; - gchar *filename; - gchar *resource_prefix; + char *filename; + char *resource_prefix; GType template_type; GObject *current_object; GtkBuilderScope *scope; @@ -447,9 +447,9 @@ gtk_builder_get_property (GObject *object, typedef struct { - gchar *object; + char *object; GParamSpec *pspec; - gchar *value; + char *value; int line; int col; } DelayedProperty; @@ -529,7 +529,7 @@ object_properties_get_value (const ObjectProperties *self, static void gtk_builder_get_parameters (GtkBuilder *builder, GType object_type, - const gchar *object_name, + const char *object_name, GSList *properties, GParamFlags filter_flags, ObjectProperties *parameters, @@ -625,7 +625,7 @@ gtk_builder_get_parameters (GtkBuilder *builder, } } -static const gchar * +static const char * object_get_name (GObject *object) { if (GTK_IS_BUILDABLE (object)) @@ -637,7 +637,7 @@ object_get_name (GObject *object) static GObject * gtk_builder_get_internal_child (GtkBuilder *builder, ObjectInfo *info, - const gchar *childname, + const char *childname, GError **error) { GObject *obj = NULL; @@ -673,7 +673,7 @@ gtk_builder_get_internal_child (GtkBuilder *builder, static inline void object_set_name (GObject *object, - const gchar *name) + const char *name) { if (GTK_IS_BUILDABLE (object)) gtk_buildable_set_name (GTK_BUILDABLE (object), name); @@ -683,7 +683,7 @@ object_set_name (GObject *object, void _gtk_builder_add_object (GtkBuilder *builder, - const gchar *id, + const char *id, GObject *object) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); @@ -825,7 +825,7 @@ _gtk_builder_construct (GtkBuilder *builder, info->parent->tag_type == TAG_CHILD && ((ChildInfo*)info->parent)->internal_child != NULL) { - gchar *childname = ((ChildInfo*)info->parent)->internal_child; + char *childname = ((ChildInfo*)info->parent)->internal_child; obj = gtk_builder_get_internal_child (builder, info, childname, error); if (!obj) { @@ -890,7 +890,7 @@ _gtk_builder_construct (GtkBuilder *builder, #ifdef G_ENABLE_DEBUG if (GTK_DEBUG_CHECK (BUILDER)) { - gchar *str = g_strdup_value_contents (value); + char *str = g_strdup_value_contents (value); g_message ("set %s: %s = %s", info->id, name, str); g_free (str); } @@ -957,7 +957,7 @@ _gtk_builder_apply_properties (GtkBuilder *builder, #ifdef G_ENABLE_DEBUG if (GTK_DEBUG_CHECK (BUILDER)) { - gchar *str = g_strdup_value_contents (value); + char *str = g_strdup_value_contents (value); g_message ("set %s: %s = %s", info->id, name, str); g_free (str); } @@ -1193,11 +1193,11 @@ gtk_builder_new (void) **/ gboolean gtk_builder_add_from_file (GtkBuilder *builder, - const gchar *filename, + const char *filename, GError **error) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); - gchar *buffer; + char *buffer; gsize length; GError *tmp_error; @@ -1257,12 +1257,12 @@ gtk_builder_add_from_file (GtkBuilder *builder, **/ gboolean gtk_builder_add_objects_from_file (GtkBuilder *builder, - const gchar *filename, + const char *filename, const char **object_ids, GError **error) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); - gchar *buffer; + char *buffer; gsize length; GError *tmp_error; @@ -1322,7 +1322,7 @@ gboolean gtk_builder_extend_with_template (GtkBuilder *builder, GObject *object, GType template_type, - const gchar *buffer, + const char *buffer, gssize length, GError **error) { @@ -1384,7 +1384,7 @@ gtk_builder_extend_with_template (GtkBuilder *builder, **/ gboolean gtk_builder_add_from_resource (GtkBuilder *builder, - const gchar *resource_path, + const char *resource_path, GError **error) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); @@ -1458,7 +1458,7 @@ gtk_builder_add_from_resource (GtkBuilder *builder, **/ gboolean gtk_builder_add_objects_from_resource (GtkBuilder *builder, - const gchar *resource_path, + const char *resource_path, const char **object_ids, GError **error) { @@ -1534,7 +1534,7 @@ gtk_builder_add_objects_from_resource (GtkBuilder *builder, **/ gboolean gtk_builder_add_from_string (GtkBuilder *builder, - const gchar *buffer, + const char *buffer, gssize length, GError **error) { @@ -1588,7 +1588,7 @@ gtk_builder_add_from_string (GtkBuilder *builder, **/ gboolean gtk_builder_add_objects_from_string (GtkBuilder *builder, - const gchar *buffer, + const char *buffer, gssize length, const char **object_ids, GError **error) @@ -1635,7 +1635,7 @@ gtk_builder_add_objects_from_string (GtkBuilder *builder, **/ GObject * gtk_builder_get_object (GtkBuilder *builder, - const gchar *name) + const char *name) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); @@ -1684,10 +1684,10 @@ gtk_builder_get_objects (GtkBuilder *builder) **/ void gtk_builder_set_translation_domain (GtkBuilder *builder, - const gchar *domain) + const char *domain) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); - gchar *new_domain; + char *new_domain; g_return_if_fail (GTK_IS_BUILDER (builder)); @@ -1708,7 +1708,7 @@ gtk_builder_set_translation_domain (GtkBuilder *builder, * in case it was never set or explicitly unset via gtk_builder_set_translation_domain(). * This string is owned by the builder object and must not be modified or freed. **/ -const gchar * +const char * gtk_builder_get_translation_domain (GtkBuilder *builder) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); @@ -1729,7 +1729,7 @@ gtk_builder_get_translation_domain (GtkBuilder *builder) **/ void gtk_builder_expose_object (GtkBuilder *builder, - const gchar *name, + const char *name, GObject *object) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); @@ -1946,7 +1946,7 @@ _gtk_builder_finish (GtkBuilder *builder, gboolean gtk_builder_value_from_string (GtkBuilder *builder, GParamSpec *pspec, - const gchar *string, + const char *string, GValue *value, GError **error) { @@ -2021,7 +2021,7 @@ gtk_builder_value_from_string (GtkBuilder *builder, gboolean gtk_builder_value_from_string_type (GtkBuilder *builder, GType type, - const gchar *string, + const char *string, GValue *value, GError **error) { @@ -2058,7 +2058,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, case G_TYPE_INT64: { gint64 l; - gchar *endptr = NULL; + char *endptr = NULL; errno = 0; l = g_ascii_strtoll (string, &endptr, 0); @@ -2085,7 +2085,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, case G_TYPE_UINT64: { guint64 ul; - gchar *endptr = NULL; + char *endptr = NULL; errno = 0; ul = g_ascii_strtoull (string, &endptr, 0); if (errno || endptr == string) @@ -2133,7 +2133,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, case G_TYPE_DOUBLE: { gdouble d; - gchar *endptr = NULL; + char *endptr = NULL; errno = 0; d = g_ascii_strtod (string, &endptr); if (errno || endptr == string) @@ -2201,7 +2201,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, } else if (G_VALUE_HOLDS (value, G_TYPE_STRV)) { - gchar **vector = g_strsplit (string, "\n", 0); + char **vector = g_strsplit (string, "\n", 0); g_value_take_boxed (value, vector); } else if (G_VALUE_HOLDS (value, G_TYPE_BYTES)) @@ -2224,7 +2224,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, G_VALUE_HOLDS (value, GDK_TYPE_PAINTABLE) || G_VALUE_HOLDS (value, GDK_TYPE_TEXTURE)) { - gchar *filename; + char *filename; GError *tmp_error = NULL; GdkPixbuf *pixbuf = NULL; GObject *object; @@ -2407,13 +2407,13 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, gboolean _gtk_builder_enum_from_string (GType type, - const gchar *string, + const char *string, int *enum_value, GError **error) { GEnumClass *eclass; GEnumValue *ev; - gchar *endptr; + char *endptr; int value; gboolean ret; @@ -2455,16 +2455,16 @@ _gtk_builder_enum_from_string (GType type, gboolean _gtk_builder_flags_from_string (GType type, GFlagsValue *aliases, - const gchar *string, + const char *string, guint *flags_value, GError **error) { GFlagsClass *fclass; - gchar *endptr, *prevptr; + char *endptr, *prevptr; guint i, j, k, value; - gchar *flagstr; + char *flagstr; GFlagsValue *fv; - const gchar *flag; + const char *flag; gunichar ch; gboolean eos, ret; @@ -2572,7 +2572,7 @@ _gtk_builder_flags_from_string (GType type, } gboolean -_gtk_builder_boolean_from_string (const gchar *string, +_gtk_builder_boolean_from_string (const char *string, gboolean *value, GError **error) { @@ -2580,7 +2580,7 @@ _gtk_builder_boolean_from_string (const gchar *string, goto error; else if (string[1] == '\0') { - gchar c; + char c; c = string[0]; if (c == '1' || @@ -2631,7 +2631,7 @@ error: */ GType gtk_builder_get_type_from_name (GtkBuilder *builder, - const gchar *type_name) + const char *type_name) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); GType type; @@ -2655,8 +2655,8 @@ gtk_builder_error_quark (void) return g_quark_from_static_string ("gtk-builder-error-quark"); } -gchar * -_gtk_builder_get_resource_path (GtkBuilder *builder, const gchar *string) +char * +_gtk_builder_get_resource_path (GtkBuilder *builder, const char *string) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); @@ -2670,13 +2670,13 @@ _gtk_builder_get_resource_path (GtkBuilder *builder, const gchar *string) return g_build_path ("/", priv->resource_prefix, string, NULL); } -gchar * +char * _gtk_builder_get_absolute_filename (GtkBuilder *builder, - const gchar *string) + const char *string) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); - gchar *filename; - gchar *dirname = NULL; + char *filename; + char *dirname = NULL; if (g_path_is_absolute (string)) return g_strdup (string); @@ -2759,7 +2759,7 @@ gtk_builder_create_closure (GtkBuilder *builder, * Returns: a #GtkBuilder containing the described interface **/ GtkBuilder * -gtk_builder_new_from_file (const gchar *filename) +gtk_builder_new_from_file (const char *filename) { GError *error = NULL; GtkBuilder *builder; @@ -2784,7 +2784,7 @@ gtk_builder_new_from_file (const gchar *filename) * Returns: a #GtkBuilder containing the described interface **/ GtkBuilder * -gtk_builder_new_from_resource (const gchar *resource_path) +gtk_builder_new_from_resource (const char *resource_path) { GError *error = NULL; GtkBuilder *builder; @@ -2814,7 +2814,7 @@ gtk_builder_new_from_resource (const gchar *resource_path) * Returns: a #GtkBuilder containing the interface described by @string **/ GtkBuilder * -gtk_builder_new_from_string (const gchar *string, +gtk_builder_new_from_string (const char *string, gssize length) { GError *error = NULL; @@ -2869,8 +2869,8 @@ _gtk_builder_prefix_error (GtkBuilder *builder, void _gtk_builder_error_unhandled_tag (GtkBuilder *builder, GtkBuildableParseContext *context, - const gchar *object, - const gchar *element_name, + const char *object, + const char *element_name, GError **error) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); @@ -2902,14 +2902,14 @@ _gtk_builder_error_unhandled_tag (GtkBuilder *builder, gboolean _gtk_builder_check_parent (GtkBuilder *builder, GtkBuildableParseContext *context, - const gchar *parent_name, + const char *parent_name, GError **error) { GtkBuilderPrivate *priv = gtk_builder_get_instance_private (builder); GPtrArray *stack; int line, col; - const gchar *parent; - const gchar *element; + const char *parent; + const char *element; stack = gtk_buildable_parse_context_get_element_stack (context); @@ -2932,7 +2932,7 @@ _gtk_builder_check_parent (GtkBuilder *builder, GObject * gtk_builder_lookup_object (GtkBuilder *builder, - const gchar *name, + const char *name, int line, int col, GError **error) @@ -2969,7 +2969,7 @@ gtk_builder_lookup_object (GtkBuilder *builder, */ GObject * _gtk_builder_lookup_object (GtkBuilder *builder, - const gchar *name, + const char *name, int line, int col) { diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h index 724c4f499c..34c37bf315 100644 --- a/gtk/gtkbuilder.h +++ b/gtk/gtkbuilder.h @@ -100,41 +100,41 @@ GtkBuilder* gtk_builder_new (void); GDK_AVAILABLE_IN_ALL gboolean gtk_builder_add_from_file (GtkBuilder *builder, - const gchar *filename, + const char *filename, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_builder_add_from_resource (GtkBuilder *builder, - const gchar *resource_path, + const char *resource_path, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_builder_add_from_string (GtkBuilder *builder, - const gchar *buffer, + const char *buffer, gssize length, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_builder_add_objects_from_file (GtkBuilder *builder, - const gchar *filename, + const char *filename, const char **object_ids, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_builder_add_objects_from_resource(GtkBuilder *builder, - const gchar *resource_path, + const char *resource_path, const char **object_ids, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_builder_add_objects_from_string (GtkBuilder *builder, - const gchar *buffer, + const char *buffer, gssize length, const char **object_ids, GError **error); GDK_AVAILABLE_IN_ALL GObject* gtk_builder_get_object (GtkBuilder *builder, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL GSList* gtk_builder_get_objects (GtkBuilder *builder); GDK_AVAILABLE_IN_ALL void gtk_builder_expose_object (GtkBuilder *builder, - const gchar *name, + const char *name, GObject *object); GDK_AVAILABLE_IN_ALL GObject * gtk_builder_get_current_object (GtkBuilder *builder); @@ -143,9 +143,9 @@ void gtk_builder_set_current_object (GtkBuilder *builder, GObject *current_object); GDK_AVAILABLE_IN_ALL void gtk_builder_set_translation_domain (GtkBuilder *builder, - const gchar *domain); + const char *domain); GDK_AVAILABLE_IN_ALL -const gchar* gtk_builder_get_translation_domain (GtkBuilder *builder); +const char * gtk_builder_get_translation_domain (GtkBuilder *builder); GDK_AVAILABLE_IN_ALL GtkBuilderScope *gtk_builder_get_scope (GtkBuilder *builder); GDK_AVAILABLE_IN_ALL @@ -158,21 +158,21 @@ GType gtk_builder_get_type_from_name (GtkBuilder *builder, GDK_AVAILABLE_IN_ALL gboolean gtk_builder_value_from_string (GtkBuilder *builder, GParamSpec *pspec, - const gchar *string, + const char *string, GValue *value, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_builder_value_from_string_type (GtkBuilder *builder, GType type, - const gchar *string, + const char *string, GValue *value, GError **error); GDK_AVAILABLE_IN_ALL -GtkBuilder * gtk_builder_new_from_file (const gchar *filename); +GtkBuilder * gtk_builder_new_from_file (const char *filename); GDK_AVAILABLE_IN_ALL -GtkBuilder * gtk_builder_new_from_resource (const gchar *resource_path); +GtkBuilder * gtk_builder_new_from_resource (const char *resource_path); GDK_AVAILABLE_IN_ALL -GtkBuilder * gtk_builder_new_from_string (const gchar *string, +GtkBuilder * gtk_builder_new_from_string (const char *string, gssize length); GDK_AVAILABLE_IN_ALL @@ -199,7 +199,7 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_builder_extend_with_template (GtkBuilder *builder, GObject *object, GType template_type, - const gchar *buffer, + const char *buffer, gssize length, GError **error); diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c index 345cfb0f30..e222813e68 100644 --- a/gtk/gtkbuilderparser.c +++ b/gtk/gtkbuilderparser.c @@ -70,9 +70,9 @@ possibly_finish_subparser (GtkBuildableParseContext *context) static void proxy_start_element (GMarkupParseContext *gm_context, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, + const char *element_name, + const char **attribute_names, + const char **attribute_values, gpointer user_data, GError **error) { @@ -89,7 +89,7 @@ proxy_start_element (GMarkupParseContext *gm_context, static void proxy_end_element (GMarkupParseContext *gm_context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -105,7 +105,7 @@ proxy_end_element (GMarkupParseContext *gm_context, static void proxy_text (GMarkupParseContext *gm_context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -172,7 +172,7 @@ gtk_buildable_parse_context_free (GtkBuildableParseContext *context) static gboolean gtk_buildable_parse_context_parse (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gssize text_len, GError **error) { @@ -393,8 +393,8 @@ state_pop (ParserData *data) static void error_missing_attribute (ParserData *data, - const gchar *tag, - const gchar *attribute, + const char *tag, + const char *attribute, GError **error) { int line, col; @@ -410,8 +410,8 @@ error_missing_attribute (ParserData *data, static void error_invalid_tag (ParserData *data, - const gchar *tag, - const gchar *expected, + const char *tag, + const char *expected, GError **error) { int line, col; @@ -434,7 +434,7 @@ error_invalid_tag (ParserData *data, static void error_unhandled_tag (ParserData *data, - const gchar *tag, + const char *tag, GError **error) { int line, col; @@ -487,15 +487,15 @@ builder_construct (ParserData *data, static void parse_requires (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { RequiresInfo *req_info; - const gchar *library = NULL; - const gchar *version = NULL; - gchar **split; + const char *library = NULL; + const char *version = NULL; + char **split; int version_major = 0; int version_minor = 0; @@ -530,7 +530,7 @@ parse_requires (ParserData *data, } static gboolean -is_requested_object (const gchar *object, +is_requested_object (const char *object, ParserData *data) { int i; @@ -547,19 +547,19 @@ is_requested_object (const gchar *object, static void parse_object (GtkBuildableParseContext *context, ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { ObjectInfo *object_info; ChildInfo* child_info; GType object_type = G_TYPE_INVALID; - const gchar *object_class = NULL; - const gchar *constructor = NULL; - const gchar *type_func = NULL; - const gchar *object_id = NULL; - gchar *internal_id = NULL; + const char *object_class = NULL; + const char *constructor = NULL; + const char *type_func = NULL; + const char *object_id = NULL; + char *internal_id = NULL; int line; child_info = state_peek_info (data, ChildInfo); @@ -680,14 +680,14 @@ parse_object (GtkBuildableParseContext *context, static void parse_template (GtkBuildableParseContext *context, ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { ObjectInfo *object_info; - const gchar *object_class = NULL; - const gchar *parent_class = NULL; + const char *object_class = NULL; + const char *parent_class = NULL; int line; GType template_type; GType parsed_type; @@ -796,16 +796,16 @@ free_object_info (ObjectInfo *info) static void parse_child (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { ObjectInfo* object_info; ChildInfo *child_info; - const gchar *type = NULL; - const gchar *internal_child = NULL; + const char *type = NULL; + const char *internal_child = NULL; object_info = state_peek_info (data, ObjectInfo); if (!object_info || @@ -845,17 +845,17 @@ free_child_info (ChildInfo *info) static void parse_property (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { PropertyInfo *info; - const gchar *name = NULL; - const gchar *context = NULL; - const gchar *bind_source = NULL; - const gchar *bind_property = NULL; - const gchar *bind_flags_str = NULL; + const char *name = NULL; + const char *context = NULL; + const char *bind_source = NULL; + const char *bind_property = NULL; + const char *bind_flags_str = NULL; GBindingFlags bind_flags = G_BINDING_DEFAULT; gboolean translatable = FALSE; ObjectInfo *object_info; @@ -948,9 +948,9 @@ parse_property (ParserData *data, static void parse_binding (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { BindingExpressionInfo *info; @@ -1111,9 +1111,9 @@ check_expression_parent (ParserData *data) static void parse_constant_expression (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { ExpressionInfo *info; @@ -1161,9 +1161,9 @@ parse_constant_expression (ParserData *data, static void parse_closure_expression (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { ExpressionInfo *info; @@ -1223,9 +1223,9 @@ parse_closure_expression (ParserData *data, static void parse_lookup_expression (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { ExpressionInfo *info; @@ -1445,15 +1445,15 @@ expression_info_construct (GtkBuilder *builder, static void parse_signal (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { SignalInfo *info; - const gchar *name; - const gchar *handler = NULL; - const gchar *object = NULL; + const char *name; + const char *handler = NULL; + const char *object = NULL; gboolean after = FALSE; gboolean swapped = -1; ObjectInfo *object_info; @@ -1555,12 +1555,12 @@ free_requires_info (RequiresInfo *info, static void parse_interface (ParserData *data, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, GError **error) { - const gchar *domain = NULL; + const char *domain = NULL; if (!g_markup_collect_attributes (element_name, names, values, error, G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL, "domain", &domain, @@ -1587,7 +1587,7 @@ parse_interface (ParserData *data, static SubParser * create_subparser (GObject *object, GObject *child, - const gchar *element_name, + const char *element_name, GtkBuildableParser *parser, gpointer user_data) { @@ -1613,9 +1613,9 @@ free_subparser (SubParser *subparser) static gboolean subparser_start (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, ParserData *data, GError **error) { @@ -1638,7 +1638,7 @@ subparser_start (GtkBuildableParseContext *context, static void subparser_end (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, ParserData *data, GError **error) { @@ -1673,9 +1673,9 @@ subparser_end (GtkBuildableParseContext *context, static gboolean parse_custom (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, ParserData *data, GError **error) { @@ -1738,9 +1738,9 @@ parse_custom (GtkBuildableParseContext *context, static void start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -1815,12 +1815,12 @@ start_element (GtkBuildableParseContext *context, error_unhandled_tag (data, element_name, error); } -const gchar * -_gtk_builder_parser_translate (const gchar *domain, - const gchar *context, - const gchar *text) +const char * +_gtk_builder_parser_translate (const char *domain, + const char *context, + const char *text) { - const gchar *s; + const char *s; if (context) s = g_dpgettext2 (domain, context, text); @@ -1832,7 +1832,7 @@ _gtk_builder_parser_translate (const gchar *domain, static void end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -1865,7 +1865,7 @@ end_element (GtkBuildableParseContext *context, if (prop_info->translatable && prop_info->text->len) { - const gchar *translated; + const char *translated; translated = _gtk_builder_parser_translate (data->domain, prop_info->context, @@ -2054,7 +2054,7 @@ end_element (GtkBuildableParseContext *context, /* text is not nul-terminated */ static void text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -2159,13 +2159,13 @@ static const GtkBuildableParser parser = { void _gtk_builder_parser_parse_buffer (GtkBuilder *builder, - const gchar *filename, - const gchar *buffer, + const char *filename, + const char *buffer, gssize length, const char **requested_objs, GError **error) { - const gchar* domain; + const char * domain; ParserData data; GSList *l; gint64 before = g_get_monotonic_time (); diff --git a/gtk/gtkbuilderprecompile.c b/gtk/gtkbuilderprecompile.c index 647d478114..9360dc1606 100644 --- a/gtk/gtkbuilderprecompile.c +++ b/gtk/gtkbuilderprecompile.c @@ -119,9 +119,9 @@ typedef struct { static void record_start_element (GMarkupParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -147,7 +147,7 @@ record_start_element (GMarkupParseContext *context, static void record_end_element (GMarkupParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -158,7 +158,7 @@ record_end_element (GMarkupParseContext *context, static void record_text (GMarkupParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -303,7 +303,7 @@ marshal_tree (GString *marshaled, * returns: A #GByte with the precompiled data **/ GBytes * -_gtk_buildable_parser_precompile (const gchar *text, +_gtk_buildable_parser_precompile (const char *text, gssize text_len, GError **error) { @@ -424,15 +424,15 @@ replay_start_element (GtkBuildableParseContext *context, { const char *element_name; guint32 i, n_attrs; - const gchar **attr_names; - const gchar **attr_values; + const char **attr_names; + const char **attr_values; GError *tmp_error = NULL; element_name = demarshal_string (tree, strings); n_attrs = demarshal_uint32 (tree); - attr_names = g_newa (const gchar *, n_attrs + 1); - attr_values = g_newa (const gchar *, n_attrs + 1); + attr_names = g_newa (const char *, n_attrs + 1); + attr_values = g_newa (const char *, n_attrs + 1); for (i = 0; i < n_attrs; i++) { attr_names[i] = demarshal_string (tree, strings); @@ -505,7 +505,7 @@ replay_text (GtkBuildableParseContext *context, } gboolean -_gtk_buildable_parser_is_precompiled (const gchar *data, +_gtk_buildable_parser_is_precompiled (const char *data, gssize data_len) { return @@ -518,7 +518,7 @@ _gtk_buildable_parser_is_precompiled (const gchar *data, gboolean _gtk_buildable_parser_replay_precompiled (GtkBuildableParseContext *context, - const gchar *data, + const char *data, gssize data_len, GError **error) { diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h index a401f69a33..87287d4e78 100644 --- a/gtk/gtkbuilderprivate.h +++ b/gtk/gtkbuilderprivate.h @@ -44,8 +44,8 @@ typedef struct { guint tag_type; GType type; GObjectClass *oclass; - gchar *id; - gchar *constructor; + char *id; + char *constructor; GSList *properties; GSList *signals; GSList *bindings; @@ -59,8 +59,8 @@ typedef struct { GSList *packing_properties; GObject *object; CommonInfo *parent; - gchar *type; - gchar *internal_child; + char *type; + char *internal_child; gboolean added; } ChildInfo; @@ -71,7 +71,7 @@ typedef struct { GString *text; gboolean translatable:1; gboolean bound:1; - gchar *context; + char *context; int line; int col; } PropertyInfo; @@ -108,12 +108,12 @@ struct _ExpressionInfo { typedef struct { guint tag_type; - gchar *object_name; + char *object_name; guint id; GQuark detail; - gchar *handler; + char *handler; GConnectFlags flags; - gchar *connect_object_name; + char *connect_object_name; } SignalInfo; typedef struct @@ -121,8 +121,8 @@ typedef struct guint tag_type; GObject *target; GParamSpec *target_pspec; - gchar *source; - gchar *source_property; + char *source; + char *source_property; GBindingFlags flags; int line; int col; @@ -141,7 +141,7 @@ typedef struct typedef struct { guint tag_type; - gchar *library; + char *library; int major; int minor; } RequiresInfo; @@ -162,21 +162,21 @@ struct _GtkBuildableParseContext { typedef struct { GtkBuildableParser *parser; - gchar *tagname; - const gchar *start; + char *tagname; + const char *start; gpointer data; GObject *object; GObject *child; } SubParser; typedef struct { - const gchar *last_element; + const char *last_element; GtkBuilder *builder; - gchar *domain; + char *domain; GSList *stack; SubParser *subparser; GtkBuildableParseContext ctx; - const gchar *filename; + const char *filename; GSList *finalizers; GSList *custom_finalizers; @@ -193,18 +193,18 @@ typedef struct { typedef GType (*GTypeGetFunc) (void); /* Things only GtkBuilder should use */ -GBytes * _gtk_buildable_parser_precompile (const gchar *text, +GBytes * _gtk_buildable_parser_precompile (const char *text, gssize text_len, GError **error); -gboolean _gtk_buildable_parser_is_precompiled (const gchar *data, +gboolean _gtk_buildable_parser_is_precompiled (const char *data, gssize data_len); gboolean _gtk_buildable_parser_replay_precompiled (GtkBuildableParseContext *context, - const gchar *data, + const char *data, gssize data_len, GError **error); void _gtk_builder_parser_parse_buffer (GtkBuilder *builder, - const gchar *filename, - const gchar *buffer, + const char *filename, + const char *buffer, gssize length, const char **requested_objs, GError **error); @@ -215,7 +215,7 @@ void _gtk_builder_apply_properties (GtkBuilder *builder, ObjectInfo *info, GError **error); void _gtk_builder_add_object (GtkBuilder *builder, - const gchar *id, + const char *id, GObject *object); void _gtk_builder_add (GtkBuilder *builder, ChildInfo *child_info); @@ -233,11 +233,11 @@ GtkExpression * expression_info_construct (GtkBuilder *builder, GError **error); /* Internal API which might be made public at some point */ -gboolean _gtk_builder_boolean_from_string (const gchar *string, +gboolean _gtk_builder_boolean_from_string (const char *string, gboolean *value, GError **error); gboolean _gtk_builder_enum_from_string (GType type, - const gchar *string, + const char *string, int *enum_value, GError **error); gboolean _gtk_builder_flags_from_string (GType type, @@ -245,18 +245,18 @@ gboolean _gtk_builder_flags_from_string (GType type, const char *string, guint *value, GError **error); -const gchar * _gtk_builder_parser_translate (const gchar *domain, - const gchar *context, - const gchar *text); -gchar * _gtk_builder_get_resource_path (GtkBuilder *builder, - const gchar *string); -gchar * _gtk_builder_get_absolute_filename (GtkBuilder *builder, - const gchar *string); +const char * _gtk_builder_parser_translate (const char *domain, + const char *context, + const char *text); +char * _gtk_builder_get_resource_path (GtkBuilder *builder, + const char *string); +char * _gtk_builder_get_absolute_filename (GtkBuilder *builder, + const char *string); void _gtk_builder_menu_start (ParserData *parser_data, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, + const char *element_name, + const char **attribute_names, + const char **attribute_values, GError **error); void _gtk_builder_menu_end (ParserData *parser_data); @@ -267,20 +267,20 @@ void _gtk_builder_prefix_error (GtkBuilder *builder, GError **error); void _gtk_builder_error_unhandled_tag (GtkBuilder *builder, GtkBuildableParseContext *context, - const gchar *object, - const gchar *element_name, + const char *object, + const char *element_name, GError **error); gboolean _gtk_builder_check_parent (GtkBuilder *builder, GtkBuildableParseContext *context, - const gchar *parent_name, + const char *parent_name, GError **error); GObject *gtk_builder_lookup_object (GtkBuilder *builder, - const gchar *name, + const char *name, int line, int col, GError **error); GObject *_gtk_builder_lookup_object (GtkBuilder *builder, - const gchar *name, + const char *name, int line, int col); gboolean _gtk_builder_lookup_failed (GtkBuilder *builder, diff --git a/gtk/gtkbuilderscope.c b/gtk/gtkbuilderscope.c index 4b121568a2..5612dbdfbe 100644 --- a/gtk/gtkbuilderscope.c +++ b/gtk/gtkbuilderscope.c @@ -192,8 +192,8 @@ gtk_builder_cscope_get_module (GtkBuilderCScope *self) * * Keep in sync with testsuite/gtk/typename.c ! */ -static gchar * -type_name_mangle (const gchar *name, +static char * +type_name_mangle (const char *name, gboolean split_first_cap) { GString *symbol_name = g_string_new (""); @@ -218,7 +218,7 @@ type_name_mangle (const gchar *name, static GType gtk_builder_cscope_resolve_type_lazily (GtkBuilderCScope *self, - const gchar *name) + const char *name) { GModule *module; GType (*func) (void); @@ -435,7 +435,7 @@ gtk_builder_cscope_new (void) */ void gtk_builder_cscope_add_callback_symbol (GtkBuilderCScope *self, - const gchar *callback_name, + const char *callback_name, GCallback callback_symbol) { GtkBuilderCScopePrivate *priv = gtk_builder_cscope_get_instance_private (self); @@ -463,12 +463,12 @@ gtk_builder_cscope_add_callback_symbol (GtkBuilderCScope *self, */ void gtk_builder_cscope_add_callback_symbols (GtkBuilderCScope *self, - const gchar *first_callback_name, + const char *first_callback_name, GCallback first_callback_symbol, ...) { va_list var_args; - const gchar *callback_name; + const char *callback_name; GCallback callback_symbol; g_return_if_fail (GTK_IS_BUILDER_CSCOPE (self)); @@ -484,7 +484,7 @@ gtk_builder_cscope_add_callback_symbols (GtkBuilderCScope *self, gtk_builder_cscope_add_callback_symbol (self, callback_name, callback_symbol); - callback_name = va_arg (var_args, const gchar*); + callback_name = va_arg (var_args, const char *); if (callback_name) callback_symbol = va_arg (var_args, GCallback); @@ -506,7 +506,7 @@ gtk_builder_cscope_add_callback_symbols (GtkBuilderCScope *self, */ GCallback gtk_builder_cscope_lookup_callback_symbol (GtkBuilderCScope *self, - const gchar *callback_name) + const char *callback_name) { GtkBuilderCScopePrivate *priv = gtk_builder_cscope_get_instance_private (self); diff --git a/gtk/gtkbuilderscope.h b/gtk/gtkbuilderscope.h index 723e1dd766..23f44fd485 100644 --- a/gtk/gtkbuilderscope.h +++ b/gtk/gtkbuilderscope.h @@ -107,16 +107,16 @@ GDK_AVAILABLE_IN_ALL GtkBuilderScope * gtk_builder_cscope_new (void); GDK_AVAILABLE_IN_ALL void gtk_builder_cscope_add_callback_symbol (GtkBuilderCScope *self, - const gchar *callback_name, + const char *callback_name, GCallback callback_symbol); GDK_AVAILABLE_IN_ALL void gtk_builder_cscope_add_callback_symbols (GtkBuilderCScope *self, - const gchar *first_callback_name, + const char *first_callback_name, GCallback first_callback_symbol, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL GCallback gtk_builder_cscope_lookup_callback_symbol(GtkBuilderCScope *self, - const gchar *callback_name); + const char *callback_name); G_END_DECLS diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 2cb79cc483..a5c1700017 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -470,7 +470,7 @@ gtk_button_dispose (GObject *object) static void gtk_button_set_action_name (GtkActionable *actionable, - const gchar *action_name) + const char *action_name) { GtkButton *button = GTK_BUTTON (actionable); GtkButtonPrivate *priv = gtk_button_get_instance_private (button); @@ -573,7 +573,7 @@ gtk_button_get_property (GObject *object, } } -static const gchar * +static const char * gtk_button_get_action_name (GtkActionable *actionable) { GtkButton *button = GTK_BUTTON (actionable); @@ -606,7 +606,7 @@ static void gtk_button_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_button_set_child (GTK_BUTTON (buildable), GTK_WIDGET (child)); @@ -646,7 +646,7 @@ gtk_button_new (void) * Returns: The newly created #GtkButton widget. */ GtkWidget* -gtk_button_new_with_label (const gchar *label) +gtk_button_new_with_label (const char *label) { return g_object_new (GTK_TYPE_BUTTON, "label", label, NULL); } @@ -664,7 +664,7 @@ gtk_button_new_with_label (const gchar *label) * Returns: a new #GtkButton displaying the themed icon */ GtkWidget* -gtk_button_new_from_icon_name (const gchar *icon_name) +gtk_button_new_from_icon_name (const char *icon_name) { GtkWidget *button; @@ -690,7 +690,7 @@ gtk_button_new_from_icon_name (const gchar *icon_name) * Returns: a new #GtkButton */ GtkWidget* -gtk_button_new_with_mnemonic (const gchar *label) +gtk_button_new_with_mnemonic (const char *label) { return g_object_new (GTK_TYPE_BUTTON, "label", label, "use-underline", TRUE, NULL); } @@ -824,7 +824,7 @@ gtk_button_finish_activate (GtkButton *button, */ void gtk_button_set_label (GtkButton *button, - const gchar *label) + const char *label) { GtkButtonPrivate *priv = gtk_button_get_instance_private (button); GtkWidget *child; @@ -874,7 +874,7 @@ gtk_button_set_label (GtkButton *button, * Returns: (nullable): The text of the label widget. This string is owned * by the widget and must not be modified or freed. */ -const gchar * +const char * gtk_button_get_label (GtkButton *button) { GtkButtonPrivate *priv = gtk_button_get_instance_private (button); diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index fd4b54122f..f7e992fd62 100644 --- a/gtk/gtkbutton.h +++ b/gtk/gtkbutton.h @@ -79,11 +79,11 @@ GType gtk_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GtkWidget* gtk_button_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_button_new_with_label (const gchar *label); +GtkWidget* gtk_button_new_with_label (const char *label); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_button_new_from_icon_name (const gchar *icon_name); +GtkWidget* gtk_button_new_from_icon_name (const char *icon_name); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_button_new_with_mnemonic (const gchar *label); +GtkWidget* gtk_button_new_with_mnemonic (const char *label); GDK_AVAILABLE_IN_ALL void gtk_button_set_has_frame (GtkButton *button, @@ -92,9 +92,9 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_button_get_has_frame (GtkButton *button); GDK_AVAILABLE_IN_ALL void gtk_button_set_label (GtkButton *button, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL -const gchar * gtk_button_get_label (GtkButton *button); +const char * gtk_button_get_label (GtkButton *button); GDK_AVAILABLE_IN_ALL void gtk_button_set_use_underline (GtkButton *button, gboolean use_underline); diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 0c727174d1..353d8358f7 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -529,7 +529,7 @@ gtk_calendar_drag_prepare (GtkDragSource *source, GtkCalendar *calendar) { GDate *date; - gchar str[128]; + char str[128]; date = g_date_new_dmy (g_date_time_get_day_of_month (calendar->date), g_date_time_get_month (calendar->date), @@ -559,14 +559,14 @@ gtk_calendar_init (GtkCalendar *calendar) char buffer[255]; time_t tmp_time; #endif - gchar *year_before; + char *year_before; #ifdef HAVE__NL_TIME_FIRST_WEEKDAY union { unsigned int word; char *string; } langinfo; int week_1stday = 0; int first_weekday = 1; guint week_origin; #else - gchar *week_start; + char *week_start; #endif int min_year_width; GDateTime *now; diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c index 8eb34534cf..d59aa41295 100644 --- a/gtk/gtkcellarea.c +++ b/gtk/gtkcellarea.c @@ -449,7 +449,7 @@ static void gtk_cell_area_pack_default (GtkCellLayout static void gtk_cell_area_clear (GtkCellLayout *cell_layout); static void gtk_cell_area_add_attribute (GtkCellLayout *cell_layout, GtkCellRenderer *renderer, - const gchar *attribute, + const char *attribute, int column); static void gtk_cell_area_set_cell_data_func (GtkCellLayout *cell_layout, GtkCellRenderer *cell, @@ -469,7 +469,7 @@ static void gtk_cell_area_buildable_init (GtkBuildableIface static void gtk_cell_area_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); /* Used in foreach loop to check if a child renderer is present */ @@ -506,7 +506,7 @@ typedef struct { /* Attribute/Cell metadata */ typedef struct { - const gchar *attribute; + const char *attribute; int column; } CellAttribute; @@ -524,11 +524,11 @@ static CellInfo *cell_info_new (GtkCellLayoutDataFunc func, GDestroyNotify destroy); static void cell_info_free (CellInfo *info); static CellAttribute *cell_attribute_new (GtkCellRenderer *renderer, - const gchar *attribute, + const char *attribute, int column); static void cell_attribute_free (CellAttribute *attribute); static int cell_attribute_find (CellAttribute *cell_attribute, - const gchar *attribute); + const char *attribute); /* Internal functions/signal emissions */ static void gtk_cell_area_add_editable (GtkCellArea *area, @@ -567,7 +567,7 @@ struct _GtkCellAreaPrivate /* Current path is saved as a side-effect * of gtk_cell_area_apply_attributes() */ - gchar *current_path; + char *current_path; /* Current cell being edited and editable widget used */ GtkCellEditable *edit_widget; @@ -849,7 +849,7 @@ cell_info_free (CellInfo *info) static CellAttribute * cell_attribute_new (GtkCellRenderer *renderer, - const gchar *attribute, + const char *attribute, int column) { GParamSpec *pspec; @@ -882,7 +882,7 @@ cell_attribute_free (CellAttribute *attribute) /* GCompareFunc for g_slist_find_custom() */ static int cell_attribute_find (CellAttribute *cell_attribute, - const gchar *attribute) + const char *attribute) { return g_strcmp0 (cell_attribute->attribute, attribute); } @@ -1492,7 +1492,7 @@ gtk_cell_area_clear (GtkCellLayout *cell_layout) static void gtk_cell_area_add_attribute (GtkCellLayout *cell_layout, GtkCellRenderer *renderer, - const gchar *attribute, + const char *attribute, int column) { gtk_cell_area_attribute_connect (GTK_CELL_AREA (cell_layout), @@ -1579,7 +1579,7 @@ static void gtk_cell_area_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { /* Just ignore the boolean return from here */ @@ -2154,7 +2154,7 @@ gtk_cell_area_get_preferred_width_for_height (GtkCellArea *area, void gtk_cell_area_attribute_connect (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *attribute, + const char *attribute, int column) { GtkCellAreaPrivate *priv = gtk_cell_area_get_instance_private (area); @@ -2220,7 +2220,7 @@ gtk_cell_area_attribute_connect (GtkCellArea *area, void gtk_cell_area_attribute_disconnect (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *attribute) + const char *attribute) { GtkCellAreaPrivate *priv = gtk_cell_area_get_instance_private (area); CellInfo *info; @@ -2263,7 +2263,7 @@ gtk_cell_area_attribute_disconnect (GtkCellArea *area, int gtk_cell_area_attribute_get_column (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *attribute) + const char *attribute) { GtkCellAreaPrivate *priv = gtk_cell_area_get_instance_private (area); CellInfo *info; @@ -2327,7 +2327,7 @@ gtk_cell_area_apply_attributes (GtkCellArea *area, * attributes applied to @area. This string belongs to the area and * should not be freed. */ -const gchar * +const char * gtk_cell_area_get_current_path_string (GtkCellArea *area) { GtkCellAreaPrivate *priv = gtk_cell_area_get_instance_private (area); @@ -2388,7 +2388,7 @@ gtk_cell_area_class_install_cell_property (GtkCellAreaClass *aclass, */ GParamSpec* gtk_cell_area_class_find_cell_property (GtkCellAreaClass *aclass, - const gchar *property_name) + const char *property_name) { g_return_val_if_fail (GTK_IS_CELL_AREA_CLASS (aclass), NULL); g_return_val_if_fail (property_name != NULL, NULL); @@ -2442,7 +2442,7 @@ gtk_cell_area_class_list_cell_properties (GtkCellAreaClass *aclass, void gtk_cell_area_add_with_properties (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_prop_name, + const char *first_prop_name, ...) { GtkCellAreaClass *class; @@ -2480,7 +2480,7 @@ gtk_cell_area_add_with_properties (GtkCellArea *area, void gtk_cell_area_cell_set (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_prop_name, + const char *first_prop_name, ...) { va_list var_args; @@ -2506,7 +2506,7 @@ gtk_cell_area_cell_set (GtkCellArea *area, void gtk_cell_area_cell_get (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_prop_name, + const char *first_prop_name, ...) { va_list var_args; @@ -2548,7 +2548,7 @@ area_set_cell_property (GtkCellArea *area, G_VALUE_TYPE_NAME (value)); else if (g_param_value_validate (pspec, &tmp_value) && !(pspec->flags & G_PARAM_LAX_VALIDATION)) { - gchar *contents = g_strdup_value_contents (value); + char *contents = g_strdup_value_contents (value); g_warning ("value \"%s\" of type '%s' is invalid for property '%s' of type '%s'", contents, @@ -2577,10 +2577,10 @@ area_set_cell_property (GtkCellArea *area, void gtk_cell_area_cell_set_valist (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_property_name, + const char *first_property_name, va_list var_args) { - const gchar *name; + const char *name; g_return_if_fail (GTK_IS_CELL_AREA (area)); g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); @@ -2589,7 +2589,7 @@ gtk_cell_area_cell_set_valist (GtkCellArea *area, while (name) { GValue value = G_VALUE_INIT; - gchar *error = NULL; + char *error = NULL; GParamSpec *pspec = g_param_spec_pool_lookup (cell_property_pool, name, G_OBJECT_TYPE (area), TRUE); @@ -2620,7 +2620,7 @@ gtk_cell_area_cell_set_valist (GtkCellArea *area, } area_set_cell_property (area, renderer, pspec, &value); g_value_unset (&value); - name = va_arg (var_args, gchar*); + name = va_arg (var_args, char *); } } @@ -2637,10 +2637,10 @@ gtk_cell_area_cell_set_valist (GtkCellArea *area, void gtk_cell_area_cell_get_valist (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_property_name, + const char *first_property_name, va_list var_args) { - const gchar *name; + const char *name; g_return_if_fail (GTK_IS_CELL_AREA (area)); g_return_if_fail (GTK_IS_CELL_RENDERER (renderer)); @@ -2650,7 +2650,7 @@ gtk_cell_area_cell_get_valist (GtkCellArea *area, { GValue value = G_VALUE_INIT; GParamSpec *pspec; - gchar *error; + char *error; pspec = g_param_spec_pool_lookup (cell_property_pool, name, G_OBJECT_TYPE (area), TRUE); @@ -2678,7 +2678,7 @@ gtk_cell_area_cell_get_valist (GtkCellArea *area, break; } g_value_unset (&value); - name = va_arg (var_args, gchar*); + name = va_arg (var_args, char *); } } @@ -2694,7 +2694,7 @@ gtk_cell_area_cell_get_valist (GtkCellArea *area, void gtk_cell_area_cell_set_property (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *property_name, + const char *property_name, const GValue *value) { GParamSpec *pspec; @@ -2730,7 +2730,7 @@ gtk_cell_area_cell_set_property (GtkCellArea *area, void gtk_cell_area_cell_get_property (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *property_name, + const char *property_name, GValue *value) { GParamSpec *pspec; diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h index eecb6b3e36..b97baa8ced 100644 --- a/gtk/gtkcellarea.h +++ b/gtk/gtkcellarea.h @@ -358,7 +358,7 @@ void gtk_cell_area_get_preferred_width_for_height (GtkCellArea int *minimum_width, int *natural_width); GDK_AVAILABLE_IN_ALL -const gchar * gtk_cell_area_get_current_path_string (GtkCellArea *area); +const char * gtk_cell_area_get_current_path_string (GtkCellArea *area); /* Attributes */ @@ -371,16 +371,16 @@ void gtk_cell_area_apply_attributes (GtkCellArea GDK_AVAILABLE_IN_ALL void gtk_cell_area_attribute_connect (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *attribute, + const char *attribute, int column); GDK_AVAILABLE_IN_ALL void gtk_cell_area_attribute_disconnect (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *attribute); + const char *attribute); GDK_AVAILABLE_IN_ALL int gtk_cell_area_attribute_get_column (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *attribute); + const char *attribute); /* Cell Properties */ @@ -390,44 +390,44 @@ void gtk_cell_area_class_install_cell_property (GtkCellAreaC GParamSpec *pspec); GDK_AVAILABLE_IN_ALL GParamSpec* gtk_cell_area_class_find_cell_property (GtkCellAreaClass *aclass, - const gchar *property_name); + const char *property_name); GDK_AVAILABLE_IN_ALL GParamSpec** gtk_cell_area_class_list_cell_properties (GtkCellAreaClass *aclass, guint *n_properties); GDK_AVAILABLE_IN_ALL void gtk_cell_area_add_with_properties (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_prop_name, + const char *first_prop_name, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL void gtk_cell_area_cell_set (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_prop_name, + const char *first_prop_name, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL void gtk_cell_area_cell_get (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_prop_name, + const char *first_prop_name, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL void gtk_cell_area_cell_set_valist (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_property_name, + const char *first_property_name, va_list var_args); GDK_AVAILABLE_IN_ALL void gtk_cell_area_cell_get_valist (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *first_property_name, + const char *first_property_name, va_list var_args); GDK_AVAILABLE_IN_ALL void gtk_cell_area_cell_set_property (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *property_name, + const char *property_name, const GValue *value); GDK_AVAILABLE_IN_ALL void gtk_cell_area_cell_get_property (GtkCellArea *area, GtkCellRenderer *renderer, - const gchar *property_name, + const char *property_name, GValue *value); /* Focus */ diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c index b146f42da9..a4f8750680 100644 --- a/gtk/gtkcelllayout.c +++ b/gtk/gtkcelllayout.c @@ -148,7 +148,7 @@ static void gtk_cell_layout_default_pack_end (GtkCellLayout static void gtk_cell_layout_default_clear (GtkCellLayout *cell_layout); static void gtk_cell_layout_default_add_attribute (GtkCellLayout *cell_layout, GtkCellRenderer *cell, - const gchar *attribute, + const char *attribute, int column); static void gtk_cell_layout_default_set_cell_data_func (GtkCellLayout *cell_layout, GtkCellRenderer *cell, @@ -241,7 +241,7 @@ gtk_cell_layout_default_clear (GtkCellLayout *cell_layout) static void gtk_cell_layout_default_add_attribute (GtkCellLayout *cell_layout, GtkCellRenderer *cell, - const gchar *attribute, + const char *attribute, int column) { GtkCellLayoutIface *iface; @@ -413,10 +413,10 @@ gtk_cell_layout_set_attributesv (GtkCellLayout *cell_layout, GtkCellRenderer *cell, va_list args) { - gchar *attribute; + char *attribute; int column; - attribute = va_arg (args, gchar *); + attribute = va_arg (args, char *); gtk_cell_layout_clear_attributes (cell_layout, cell); @@ -426,7 +426,7 @@ gtk_cell_layout_set_attributesv (GtkCellLayout *cell_layout, gtk_cell_layout_add_attribute (cell_layout, cell, attribute, column); - attribute = va_arg (args, gchar *); + attribute = va_arg (args, char *); } } @@ -474,7 +474,7 @@ gtk_cell_layout_set_attributes (GtkCellLayout *cell_layout, void gtk_cell_layout_add_attribute (GtkCellLayout *cell_layout, GtkCellRenderer *cell, - const gchar *attribute, + const char *attribute, int column) { g_return_if_fail (GTK_IS_CELL_LAYOUT (cell_layout)); @@ -604,15 +604,15 @@ typedef struct { GtkCellLayout *cell_layout; GtkCellRenderer *renderer; GtkBuilder *builder; - gchar *attr_name; + char *attr_name; GString *string; } AttributesSubParserData; static void attributes_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -620,7 +620,7 @@ attributes_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "attribute") == 0) { - const gchar *name; + const char *name; if (!_gtk_builder_check_parent (data->builder, context, "attributes", error)) return; @@ -655,7 +655,7 @@ attributes_start_element (GtkBuildableParseContext *context, static void attributes_text_element (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -668,7 +668,7 @@ attributes_text_element (GtkBuildableParseContext *context, static void attributes_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -708,8 +708,8 @@ static void gtk_cell_layout_buildable_set_cell_property (GtkCellArea *area, GtkBuilder *builder, GtkCellRenderer *cell, - gchar *name, - const gchar *value) + char *name, + const char *value) { GParamSpec *pspec; GValue gvalue = G_VALUE_INIT; @@ -744,16 +744,16 @@ typedef struct { GtkCellLayout *cell_layout; GtkCellRenderer *renderer; GString *string; - gchar *cell_prop_name; - gchar *context; + char *cell_prop_name; + char *context; gboolean translatable; } CellPackingSubParserData; static void cell_packing_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -761,9 +761,9 @@ cell_packing_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "property") == 0) { - const gchar *name; + const char *name; gboolean translatable = FALSE; - const gchar *ctx = NULL; + const char *ctx = NULL; if (!_gtk_builder_check_parent (data->builder, context, "cell-packing", error)) return; @@ -803,7 +803,7 @@ cell_packing_start_element (GtkBuildableParseContext *context, static void cell_packing_text_element (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -816,7 +816,7 @@ cell_packing_text_element (GtkBuildableParseContext *context, static void cell_packing_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -830,8 +830,8 @@ cell_packing_end_element (GtkBuildableParseContext *context, /* translate the string */ if (data->string->len && data->translatable) { - const gchar *translated; - const gchar* domain; + const char *translated; + const char * domain; domain = gtk_builder_get_translation_domain (data->builder); @@ -872,7 +872,7 @@ gboolean _gtk_cell_layout_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -917,7 +917,7 @@ gboolean _gtk_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer *data) { AttributesSubParserData *attr_data; @@ -947,7 +947,7 @@ void _gtk_cell_layout_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { g_return_if_fail (GTK_IS_CELL_LAYOUT (buildable)); g_return_if_fail (GTK_IS_CELL_RENDERER (child)); diff --git a/gtk/gtkcelllayout.h b/gtk/gtkcelllayout.h index 4eab78ab22..5ec03ddf6a 100644 --- a/gtk/gtkcelllayout.h +++ b/gtk/gtkcelllayout.h @@ -91,7 +91,7 @@ struct _GtkCellLayoutIface void (* clear) (GtkCellLayout *cell_layout); void (* add_attribute) (GtkCellLayout *cell_layout, GtkCellRenderer *cell, - const gchar *attribute, + const char *attribute, int column); void (* set_cell_data_func) (GtkCellLayout *cell_layout, GtkCellRenderer *cell, @@ -129,7 +129,7 @@ void gtk_cell_layout_set_attributes (GtkCellLayout *cell_layout, GDK_AVAILABLE_IN_ALL void gtk_cell_layout_add_attribute (GtkCellLayout *cell_layout, GtkCellRenderer *cell, - const gchar *attribute, + const char *attribute, int column); GDK_AVAILABLE_IN_ALL void gtk_cell_layout_set_cell_data_func (GtkCellLayout *cell_layout, @@ -150,18 +150,18 @@ GtkCellArea *gtk_cell_layout_get_area (GtkCellLayout *cell_layout); gboolean _gtk_cell_layout_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); gboolean _gtk_cell_layout_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer *data); void _gtk_cell_layout_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); G_END_DECLS diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index df98722ec4..ae7bdf863d 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -258,7 +258,7 @@ gtk_cell_renderer_class_init (GtkCellRendererClass *class) * static void * text_editing_started (GtkCellRenderer *cell, * GtkCellEditable *editable, - * const gchar *path, + * const char *path, * gpointer data) * { * if (GTK_IS_ENTRY (editable)) @@ -769,7 +769,7 @@ gboolean gtk_cell_renderer_activate (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags) @@ -816,7 +816,7 @@ GtkCellEditable * gtk_cell_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags) diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h index 6fb00ec9fc..cc30e5fac7 100644 --- a/gtk/gtkcellrenderer.h +++ b/gtk/gtkcellrenderer.h @@ -154,14 +154,14 @@ struct _GtkCellRendererClass gboolean (* activate) (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); GtkCellEditable * (* start_editing) (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); @@ -170,7 +170,7 @@ struct _GtkCellRendererClass void (* editing_canceled) (GtkCellRenderer *cell); void (* editing_started) (GtkCellRenderer *cell, GtkCellEditable *editable, - const gchar *path); + const char *path); /*< private >*/ @@ -228,7 +228,7 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_cell_renderer_activate (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); @@ -236,7 +236,7 @@ GDK_AVAILABLE_IN_ALL GtkCellEditable *gtk_cell_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c index 451924fd0b..600f59f3d1 100644 --- a/gtk/gtkcellrendereraccel.c +++ b/gtk/gtkcellrendereraccel.c @@ -62,17 +62,17 @@ static GtkCellEditable * gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); -static gchar *convert_keysym_state_to_string (GtkCellRendererAccel *accel, +static char *convert_keysym_state_to_string (GtkCellRendererAccel *accel, guint keysym, GdkModifierType mask, guint keycode); static GtkWidget *gtk_cell_editable_widget_new (GtkCellRenderer *cell, GtkCellRendererAccelMode mode, - const gchar *path); + const char *path); enum { ACCEL_EDITED, @@ -102,13 +102,13 @@ struct _GtkCellRendererAccelClass GtkCellRendererTextClass parent_class; void (* accel_edited) (GtkCellRendererAccel *accel, - const gchar *path_string, + const char *path_string, guint accel_key, GdkModifierType accel_mods, guint hardware_keycode); void (* accel_cleared) (GtkCellRendererAccel *accel, - const gchar *path_string); + const char *path_string); /* Padding for future expansion */ void (*_gtk_reserved0) (void); @@ -133,7 +133,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkCellRendererAccel, gtk_cell_renderer_accel, GTK_T static void gtk_cell_renderer_accel_init (GtkCellRendererAccel *cell_accel) { - gchar *text; + char *text; text = convert_keysym_state_to_string (cell_accel, 0, 0, 0); g_object_set (cell_accel, "text", text, NULL); @@ -282,7 +282,7 @@ gtk_cell_renderer_accel_new (void) return g_object_new (GTK_TYPE_CELL_RENDERER_ACCEL, NULL); } -static gchar * +static char * convert_keysym_state_to_string (GtkCellRendererAccel *accel, guint keysym, GdkModifierType mask, @@ -310,7 +310,7 @@ convert_keysym_state_to_string (GtkCellRendererAccel *accel, } else { - gchar *name; + char *name; name = gtk_accelerator_get_label_with_keycode (NULL, keysym, keycode, mask); if (name == NULL) @@ -416,7 +416,7 @@ gtk_cell_renderer_accel_set_property (GObject *object, if (changed) { - gchar *text; + char *text; text = convert_keysym_state_to_string (accel, priv->accel_key, priv->accel_mods, priv->keycode); g_object_set (accel, "text", text, NULL); @@ -456,7 +456,7 @@ static GtkCellEditable * gtk_cell_renderer_accel_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags) @@ -488,7 +488,7 @@ struct _GtkCellEditableWidget gboolean editing_canceled; GtkCellRendererAccelMode accel_mode; - gchar *path; + char *path; GtkCellRenderer *cell; GtkWidget *label; }; @@ -710,7 +710,7 @@ gtk_cell_editable_widget_init (GtkCellEditableWidget *box) static GtkWidget * gtk_cell_editable_widget_new (GtkCellRenderer *cell, GtkCellRendererAccelMode mode, - const gchar *path) + const char *path) { GtkCellEditableWidget *box; diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c index 8272857e44..b8e9daca8b 100644 --- a/gtk/gtkcellrenderercombo.c +++ b/gtk/gtkcellrenderercombo.c @@ -89,7 +89,7 @@ static void gtk_cell_renderer_combo_set_property (GObject *object, static GtkCellEditable *gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); @@ -347,8 +347,8 @@ gtk_cell_renderer_combo_editing_done (GtkCellEditable *combo, { GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (data); GtkCellRendererComboPrivate *priv = gtk_cell_renderer_combo_get_instance_private (cell); - const gchar *path; - gchar *new_text = NULL; + const char *path; + char *new_text = NULL; GtkTreeModel *model; GtkTreeIter iter; GtkEntry *entry; @@ -416,7 +416,7 @@ find_text (GtkTreeModel *model, { SearchData *search_data = (SearchData *)data; GtkCellRendererComboPrivate *priv = gtk_cell_renderer_combo_get_instance_private (search_data->cell); - gchar *text, *cell_text; + char *text, *cell_text; gtk_tree_model_get (model, iter, priv->text_column, &text, -1); g_object_get (GTK_CELL_RENDERER_TEXT (search_data->cell), @@ -438,7 +438,7 @@ static GtkCellEditable * gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags) @@ -448,7 +448,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell, GtkWidget *combo; SearchData search_data; gboolean editable; - gchar *text; + char *text; g_object_get (cell, "editable", &editable, NULL); if (editable == FALSE) diff --git a/gtk/gtkcellrendererprogress.c b/gtk/gtkcellrendererprogress.c index 831f5ad2e0..5f7ab16e56 100644 --- a/gtk/gtkcellrendererprogress.c +++ b/gtk/gtkcellrendererprogress.c @@ -74,8 +74,8 @@ struct _GtkCellRendererProgressClass struct _GtkCellRendererProgressPrivate { int value; - gchar *text; - gchar *label; + char *text; + char *label; int min_h; int min_w; int pulse; @@ -98,12 +98,12 @@ static void gtk_cell_renderer_progress_set_property (GObject *ob static void gtk_cell_renderer_progress_set_value (GtkCellRendererProgress *cellprogress, int value); static void gtk_cell_renderer_progress_set_text (GtkCellRendererProgress *cellprogress, - const gchar *text); + const char *text); static void gtk_cell_renderer_progress_set_pulse (GtkCellRendererProgress *cellprogress, int pulse); static void compute_dimensions (GtkCellRenderer *cell, GtkWidget *widget, - const gchar *text, + const char *text, int *width, int *height); static void gtk_cell_renderer_progress_get_size (GtkCellRenderer *cell, @@ -368,7 +368,7 @@ static void recompute_label (GtkCellRendererProgress *cellprogress) { GtkCellRendererProgressPrivate *priv = gtk_cell_renderer_progress_get_instance_private (cellprogress); - gchar *label; + char *label; if (priv->text) label = g_strdup (priv->text); @@ -397,10 +397,10 @@ gtk_cell_renderer_progress_set_value (GtkCellRendererProgress *cellprogress, static void gtk_cell_renderer_progress_set_text (GtkCellRendererProgress *cellprogress, - const gchar *text) + const char *text) { GtkCellRendererProgressPrivate *priv = gtk_cell_renderer_progress_get_instance_private (cellprogress); - gchar *new_text; + char *new_text; new_text = g_strdup (text); g_free (priv->text); @@ -431,7 +431,7 @@ gtk_cell_renderer_progress_set_pulse (GtkCellRendererProgress *cellprogress, static void compute_dimensions (GtkCellRenderer *cell, GtkWidget *widget, - const gchar *text, + const char *text, int *width, int *height) { @@ -465,7 +465,7 @@ gtk_cell_renderer_progress_get_size (GtkCellRenderer *cell, GtkCellRendererProgress *cellprogress = GTK_CELL_RENDERER_PROGRESS (cell); GtkCellRendererProgressPrivate *priv = gtk_cell_renderer_progress_get_instance_private (cellprogress); int w, h; - gchar *text; + char *text; if (priv->min_w < 0) { diff --git a/gtk/gtkcellrendererspin.c b/gtk/gtkcellrendererspin.c index 43ee161458..2c5caa0724 100644 --- a/gtk/gtkcellrendererspin.c +++ b/gtk/gtkcellrendererspin.c @@ -92,7 +92,7 @@ static gboolean gtk_cell_renderer_spin_key_pressed (GtkEventControllerKey *contr static GtkCellEditable * gtk_cell_renderer_spin_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); @@ -252,8 +252,8 @@ gtk_cell_renderer_spin_focus_changed (GtkWidget *widget, GParamSpec *pspec, gpointer data) { - const gchar *path; - const gchar *new_text; + const char *path; + const char *new_text; gboolean canceled; if (gtk_widget_has_focus (widget)) @@ -325,7 +325,7 @@ static GtkCellEditable * gtk_cell_renderer_spin_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags) @@ -334,7 +334,7 @@ gtk_cell_renderer_spin_start_editing (GtkCellRenderer *cell, GtkCellRendererText *cell_text = GTK_CELL_RENDERER_TEXT (cell); GtkEventController *key_controller; gboolean editable; - gchar *text; + char *text; g_object_get (cell_text, "editable", &editable, NULL); if (!editable) diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 8e905ab9e8..45bf9fb4a6 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -69,7 +69,7 @@ static void gtk_cell_renderer_text_snapshot (GtkCellRenderer *cell, static GtkCellEditable *gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); @@ -178,8 +178,8 @@ struct _GtkCellRendererTextPrivate PangoUnderline underline_style; PangoWrapMode wrap_mode; - gchar *text; - gchar *placeholder_text; + char *text; + char *placeholder_text; gdouble font_scale; @@ -1073,8 +1073,8 @@ gtk_cell_renderer_text_set_property (GObject *object, break; case PROP_MARKUP: { - const gchar *str; - gchar *text = NULL; + const char *str; + char *text = NULL; GError *error = NULL; PangoAttrList *attrs = NULL; @@ -1143,7 +1143,7 @@ gtk_cell_renderer_text_set_property (GObject *object, case PROP_FONT: { PangoFontDescription *font_desc = NULL; - const gchar *name; + const char *name; name = g_value_get_string (value); @@ -1754,8 +1754,8 @@ gtk_cell_renderer_text_editing_done (GtkCellEditable *entry, { GtkCellRendererText *celltext = GTK_CELL_RENDERER_TEXT (data); GtkCellRendererTextPrivate *priv = gtk_cell_renderer_text_get_instance_private (celltext); - const gchar *path; - const gchar *new_text; + const char *path; + const char *new_text; gboolean canceled; g_clear_object (&priv->entry); @@ -1805,7 +1805,7 @@ static GtkCellEditable * gtk_cell_renderer_text_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags) diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h index d1198aeeb0..c709bb9f6c 100644 --- a/gtk/gtkcellrenderertext.h +++ b/gtk/gtkcellrenderertext.h @@ -49,8 +49,8 @@ struct _GtkCellRendererTextClass GtkCellRendererClass parent_class; void (* edited) (GtkCellRendererText *cell_renderer_text, - const gchar *path, - const gchar *new_text); + const char *path, + const char *new_text); /*< private >*/ diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c index 2b580e4871..472d1c33cc 100644 --- a/gtk/gtkcellrenderertoggle.c +++ b/gtk/gtkcellrenderertoggle.c @@ -69,7 +69,7 @@ static void gtk_cell_renderer_toggle_snapshot (GtkCellRenderer *cel static gboolean gtk_cell_renderer_toggle_activate (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags); @@ -482,7 +482,7 @@ static int gtk_cell_renderer_toggle_activate (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, - const gchar *path, + const char *path, const GdkRectangle *background_area, const GdkRectangle *cell_area, GtkCellRendererState flags) diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index d072ef6f13..1188c7bfc9 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -90,13 +90,13 @@ static void gtk_cell_view_buildable_init (GtkBuildableIface static gboolean gtk_cell_view_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); static GtkSizeRequestMode gtk_cell_view_get_request_mode (GtkWidget *widget); @@ -289,7 +289,7 @@ static void gtk_cell_view_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_CELL_RENDERER (child)) _gtk_cell_layout_buildable_add_child (buildable, builder, child, type); @@ -750,7 +750,7 @@ static gboolean gtk_cell_view_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -767,7 +767,7 @@ static void gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { if (_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, @@ -870,7 +870,7 @@ gtk_cell_view_new_with_context (GtkCellArea *area, * Returns: A newly created #GtkCellView widget. */ GtkWidget * -gtk_cell_view_new_with_text (const gchar *text) +gtk_cell_view_new_with_text (const char *text) { GtkCellView *cellview; GtkCellRenderer *renderer; @@ -901,7 +901,7 @@ gtk_cell_view_new_with_text (const gchar *text) * Returns: A newly created #GtkCellView widget. */ GtkWidget * -gtk_cell_view_new_with_markup (const gchar *markup) +gtk_cell_view_new_with_markup (const char *markup) { GtkCellView *cellview; GtkCellRenderer *renderer; diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h index ebfef56a3c..1cb1adf8d7 100644 --- a/gtk/gtkcellview.h +++ b/gtk/gtkcellview.h @@ -44,9 +44,9 @@ GDK_AVAILABLE_IN_ALL GtkWidget *gtk_cell_view_new_with_context (GtkCellArea *area, GtkCellAreaContext *context); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_cell_view_new_with_text (const gchar *text); +GtkWidget *gtk_cell_view_new_with_text (const char *text); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_cell_view_new_with_markup (const gchar *markup); +GtkWidget *gtk_cell_view_new_with_markup (const char *markup); GDK_AVAILABLE_IN_ALL GtkWidget *gtk_cell_view_new_with_texture (GdkTexture *texture); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkcenterbox.c b/gtk/gtkcenterbox.c index e3536be6d9..3751ea5db3 100644 --- a/gtk/gtkcenterbox.c +++ b/gtk/gtkcenterbox.c @@ -97,7 +97,7 @@ static void gtk_center_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (g_strcmp0 (type, "start") == 0) gtk_center_box_set_start_widget (GTK_CENTER_BOX (buildable), GTK_WIDGET (child)); diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c index dc762d48f1..3799bc1b1e 100644 --- a/gtk/gtkcheckbutton.c +++ b/gtk/gtkcheckbutton.c @@ -283,7 +283,7 @@ gtk_check_button_new (void) * Returns: a #GtkWidget. */ GtkWidget* -gtk_check_button_new_with_label (const gchar *label) +gtk_check_button_new_with_label (const char *label) { return g_object_new (GTK_TYPE_CHECK_BUTTON, "label", label, NULL); } @@ -300,7 +300,7 @@ gtk_check_button_new_with_label (const gchar *label) * Returns: a new #GtkCheckButton */ GtkWidget* -gtk_check_button_new_with_mnemonic (const gchar *label) +gtk_check_button_new_with_mnemonic (const char *label) { return g_object_new (GTK_TYPE_CHECK_BUTTON, "label", label, diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h index 9a7ed350f7..2fd23b33c6 100644 --- a/gtk/gtkcheckbutton.h +++ b/gtk/gtkcheckbutton.h @@ -66,9 +66,9 @@ GType gtk_check_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GtkWidget* gtk_check_button_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_check_button_new_with_label (const gchar *label); +GtkWidget* gtk_check_button_new_with_label (const char *label); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_check_button_new_with_mnemonic (const gchar *label); +GtkWidget* gtk_check_button_new_with_mnemonic (const char *label); GDK_AVAILABLE_IN_ALL void gtk_check_button_set_draw_indicator (GtkCheckButton *check_button, gboolean draw_indicator); diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 28f6de6f7e..f117d8bef7 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -72,7 +72,7 @@ struct _GtkColorButton { GtkWidget *swatch; /* Widget where we draw the color sample */ GtkWidget *cs_dialog; /* Color selection dialog */ - gchar *title; /* Title for the color selection window */ + char *title; /* Title for the color selection window */ GdkRGBA rgba; guint use_alpha : 1; /* Use alpha or not */ @@ -491,9 +491,9 @@ set_use_alpha (GtkColorButton *button, */ void gtk_color_button_set_title (GtkColorButton *button, - const gchar *title) + const char *title) { - gchar *old_title; + char *old_title; g_return_if_fail (GTK_IS_COLOR_BUTTON (button)); @@ -515,7 +515,7 @@ gtk_color_button_set_title (GtkColorButton *button, * * Returns: An internal string, do not free the return value */ -const gchar * +const char * gtk_color_button_get_title (GtkColorButton *button) { g_return_val_if_fail (GTK_IS_COLOR_BUTTON (button), NULL); diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h index f8b7e6883c..dfc0fea348 100644 --- a/gtk/gtkcolorbutton.h +++ b/gtk/gtkcolorbutton.h @@ -54,9 +54,9 @@ GDK_AVAILABLE_IN_ALL GtkWidget * gtk_color_button_new_with_rgba (const GdkRGBA *rgba); GDK_AVAILABLE_IN_ALL void gtk_color_button_set_title (GtkColorButton *button, - const gchar *title); + const char *title); GDK_AVAILABLE_IN_ALL -const gchar *gtk_color_button_get_title (GtkColorButton *button); +const char *gtk_color_button_get_title (GtkColorButton *button); GDK_AVAILABLE_IN_ALL gboolean gtk_color_button_get_modal (GtkColorButton *button); diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c index 5dd68c6532..a6273cdd09 100644 --- a/gtk/gtkcolorchooserdialog.c +++ b/gtk/gtkcolorchooserdialog.c @@ -277,7 +277,7 @@ gtk_color_chooser_dialog_iface_init (GtkColorChooserInterface *iface) * Returns: a new #GtkColorChooserDialog */ GtkWidget * -gtk_color_chooser_dialog_new (const gchar *title, +gtk_color_chooser_dialog_new (const char *title, GtkWindow *parent) { return g_object_new (GTK_TYPE_COLOR_CHOOSER_DIALOG, diff --git a/gtk/gtkcolorchooserdialog.h b/gtk/gtkcolorchooserdialog.h index b4a16d083b..b971b95819 100644 --- a/gtk/gtkcolorchooserdialog.h +++ b/gtk/gtkcolorchooserdialog.h @@ -36,7 +36,7 @@ GDK_AVAILABLE_IN_ALL GType gtk_color_chooser_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_color_chooser_dialog_new (const gchar *title, +GtkWidget * gtk_color_chooser_dialog_new (const char *title, GtkWindow *parent); G_END_DECLS diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c index 12c2aa85aa..0b7f36d0db 100644 --- a/gtk/gtkcolorchooserwidget.c +++ b/gtk/gtkcolorchooserwidget.c @@ -274,7 +274,7 @@ scale_round (gdouble value, gdouble scale) return (guint)value; } -static gchar * +static char * accessible_color_name (GdkRGBA *color) { if (color->alpha < 1.0) @@ -322,7 +322,7 @@ add_palette (GtkColorChooserWidget *cc, int colors_per_line, int n_colors, GdkRGBA *colors, - const gchar **names) + const char **names) { GtkWidget *grid; GtkWidget *p; @@ -363,7 +363,7 @@ add_palette (GtkColorChooserWidget *cc, } else { - gchar *text, *name; + char *text, *name; name = accessible_color_name (&colors[i]); text = g_strdup_printf (_("Color: %s"), name); @@ -411,7 +411,7 @@ remove_default_palette (GtkColorChooserWidget *cc) static void add_default_palette (GtkColorChooserWidget *cc) { - const gchar *default_colors[9][3] = { + const char *default_colors[9][3] = { { "#ef2929", "#cc0000", "#a40000" }, /* Scarlet Red */ { "#fcaf3e", "#f57900", "#ce5c00" }, /* Orange */ { "#fce94f", "#edd400", "#c4a000" }, /* Butter */ @@ -422,7 +422,7 @@ add_default_palette (GtkColorChooserWidget *cc) { "#888a85", "#555753", "#2e3436" }, /* Aluminum 1 */ { "#eeeeec", "#d3d7cf", "#babdb6" } /* Aluminum 2 */ }; - const gchar *color_names[] = { + const char *color_names[] = { NC_("Color name", "Light Scarlet Red"), NC_("Color name", "Scarlet Red"), NC_("Color name", "Dark Scarlet Red"), @@ -451,7 +451,7 @@ add_default_palette (GtkColorChooserWidget *cc) NC_("Color name", "Aluminum 2"), NC_("Color name", "Dark Aluminum 2") }; - const gchar *default_grays[9] = { + const char *default_grays[9] = { "#000000", /* black */ "#2e3436", /* very dark gray */ "#555753", /* darker gray */ @@ -462,7 +462,7 @@ add_default_palette (GtkColorChooserWidget *cc) "#f3f3f3", /* very light gray */ "#ffffff" /* white */ }; - const gchar *gray_names[] = { + const char *gray_names[] = { NC_("Color name", "Black"), NC_("Color name", "Very Dark Gray"), NC_("Color name", "Darker Gray"), @@ -544,7 +544,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc) GVariantIter iter; gboolean selected; AtkObject *atk_obj; - gchar *text, *name; + char *text, *name; cc->use_alpha = TRUE; diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c index f170fb4a73..46c89ca4ef 100644 --- a/gtk/gtkcoloreditor.c +++ b/gtk/gtkcoloreditor.c @@ -107,7 +107,7 @@ static void entry_set_rgba (GtkColorEditor *editor, const GdkRGBA *color) { - gchar *text; + char *text; text = g_strdup_printf ("#%02X%02X%02X", scale_round (color->red, 255), @@ -123,7 +123,7 @@ entry_apply (GtkWidget *entry, GtkColorEditor *editor) { GdkRGBA color; - gchar *text; + char *text; if (!editor->text_changed) return; diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c index 6926bad8b7..ad6ef4deb6 100644 --- a/gtk/gtkcolorswatch.c +++ b/gtk/gtkcolorswatch.c @@ -60,7 +60,7 @@ struct _GtkColorSwatch GdkRGBA color; gdouble radius[4]; - gchar *icon; + char *icon; guint has_color : 1; guint use_alpha : 1; guint selectable : 1; @@ -627,7 +627,7 @@ gtk_color_swatch_get_rgba (GtkColorSwatch *swatch, void gtk_color_swatch_set_icon (GtkColorSwatch *swatch, - const gchar *icon) + const char *icon) { swatch->icon = g_strdup (icon); update_icon (swatch); diff --git a/gtk/gtkcolorswatchprivate.h b/gtk/gtkcolorswatchprivate.h index af28f97f5c..fa8bac76f6 100644 --- a/gtk/gtkcolorswatchprivate.h +++ b/gtk/gtkcolorswatchprivate.h @@ -43,7 +43,7 @@ void gtk_color_swatch_set_hsva (GtkColorSwatch *swatch, void gtk_color_swatch_set_can_drop (GtkColorSwatch *swatch, gboolean can_drop); void gtk_color_swatch_set_icon (GtkColorSwatch *swatch, - const gchar *icon); + const char *icon); void gtk_color_swatch_set_use_alpha (GtkColorSwatch *swatch, gboolean use_alpha); void gtk_color_swatch_set_selectable (GtkColorSwatch *swatch, diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c index 79b725b21c..b7a5b1bbe1 100644 --- a/gtk/gtkcolumnview.c +++ b/gtk/gtkcolumnview.c @@ -170,7 +170,7 @@ static void gtk_column_view_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_COLUMN_VIEW_COLUMN (child)) { diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 046d48e1ca..0874726b17 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -258,7 +258,7 @@ static void gtk_combo_box_model_row_changed (GtkTreeModel *model, gpointer data); static void gtk_combo_box_menu_activate (GtkWidget *menu, - const gchar *path, + const char *path, GtkComboBox *combo_box); static void gtk_combo_box_update_sensitivity (GtkComboBox *combo_box); static gboolean gtk_combo_box_menu_key (GtkEventControllerKey *key, @@ -284,8 +284,8 @@ static void gtk_combo_box_entry_contents_changed (GtkEntry *e gpointer user_data); static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, gpointer user_data); -static gchar *gtk_combo_box_format_entry_text (GtkComboBox *combo_box, - const gchar *path); +static char *gtk_combo_box_format_entry_text (GtkComboBox *combo_box, + const char *path); /* GtkBuildable method implementation */ static GtkBuildableIface *parent_buildable_iface; @@ -294,21 +294,21 @@ static void gtk_combo_box_buildable_init (GtkBuildableIface static void gtk_combo_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); static gboolean gtk_combo_box_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); static GObject *gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); @@ -515,9 +515,9 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) * Here's an example signal handler which fetches data from the model and * displays it in the entry. * |[<!-- language="C" --> - * static gchar* + * static char * * format_entry_text_callback (GtkComboBox *combo, - * const gchar *path, + * const char *path, * gpointer user_data) * { * GtkTreeIter iter; @@ -1691,7 +1691,7 @@ gtk_combo_box_scroll_controller_scroll (GtkEventControllerScroll *scroll, /* callbacks */ static void gtk_combo_box_menu_activate (GtkWidget *menu, - const gchar *path, + const char *path, GtkComboBox *combo_box) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); @@ -2315,8 +2315,8 @@ gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, if (entry) { GtkTreePath *path; - gchar *path_str; - gchar *text = NULL; + char *path_str; + char *text = NULL; model = gtk_combo_box_get_model (combo_box); path = gtk_tree_model_get_path (model, &iter); @@ -2343,14 +2343,14 @@ gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, } } -static gchar * +static char * gtk_combo_box_format_entry_text (GtkComboBox *combo_box, - const gchar *path) + const char *path) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); GtkTreeModel *model; GtkTreeIter iter; - gchar *text = NULL; + char *text = NULL; if (priv->text_column >= 0) { @@ -2735,7 +2735,7 @@ static void gtk_combo_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_CELL_RENDERER (child)) _gtk_cell_layout_buildable_add_child (buildable, builder, child, type); @@ -2749,7 +2749,7 @@ static gboolean gtk_combo_box_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -2765,7 +2765,7 @@ static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data)) @@ -2775,7 +2775,7 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable, static GObject * gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname) + const char *childname) { GtkComboBox *combo_box = GTK_COMBO_BOX (buildable); GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); @@ -2852,7 +2852,7 @@ gtk_combo_box_get_id_column (GtkComboBox *combo_box) * * Returns: (nullable): the ID of the active row, or %NULL **/ -const gchar * +const char * gtk_combo_box_get_active_id (GtkComboBox *combo_box) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); @@ -2873,8 +2873,8 @@ gtk_combo_box_get_active_id (GtkComboBox *combo_box) if (gtk_combo_box_get_active_iter (combo_box, &iter)) { - const gchar *interned; - gchar *id; + const char *interned; + char *id; gtk_tree_model_get (model, &iter, column, &id, -1); interned = g_intern_string (id); @@ -2904,7 +2904,7 @@ gtk_combo_box_get_active_id (GtkComboBox *combo_box) **/ gboolean gtk_combo_box_set_active_id (GtkComboBox *combo_box, - const gchar *active_id) + const char *active_id) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); GtkTreeModel *model; @@ -2931,7 +2931,7 @@ gtk_combo_box_set_active_id (GtkComboBox *combo_box, if (gtk_tree_model_get_iter_first (model, &iter)) do { - gchar *id; + char *id; gtk_tree_model_get (model, &iter, column, &id, -1); if (id != NULL) diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h index 7247672b4b..c47a53ca2b 100644 --- a/gtk/gtkcombobox.h +++ b/gtk/gtkcombobox.h @@ -58,8 +58,8 @@ struct _GtkComboBoxClass /* signals */ void (* changed) (GtkComboBox *combo_box); - gchar *(* format_entry_text) (GtkComboBox *combo_box, - const gchar *path); + char *(* format_entry_text) (GtkComboBox *combo_box, + const char *path); /*< private >*/ @@ -144,10 +144,10 @@ GDK_AVAILABLE_IN_ALL void gtk_combo_box_set_id_column (GtkComboBox *combo_box, int id_column); GDK_AVAILABLE_IN_ALL -const gchar * gtk_combo_box_get_active_id (GtkComboBox *combo_box); +const char * gtk_combo_box_get_active_id (GtkComboBox *combo_box); GDK_AVAILABLE_IN_ALL gboolean gtk_combo_box_set_active_id (GtkComboBox *combo_box, - const gchar *active_id); + const char *active_id); GDK_AVAILABLE_IN_ALL void gtk_combo_box_set_child (GtkComboBox *combo_box, diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c index 0578f8336d..0da6fe3210 100644 --- a/gtk/gtkcomboboxtext.c +++ b/gtk/gtkcomboboxtext.c @@ -104,14 +104,14 @@ static void gtk_combo_box_text_buildable_interface_init (GtkBuildableIface static gboolean gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_combo_box_text_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); @@ -174,12 +174,12 @@ gtk_combo_box_text_buildable_interface_init (GtkBuildableIface *iface) typedef struct { GtkBuilder *builder; GObject *object; - const gchar *domain; - gchar *id; + const char *domain; + char *id; GString *string; - gchar *context; + char *context; guint translatable : 1; guint is_text : 1; @@ -187,9 +187,9 @@ typedef struct { static void item_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -207,9 +207,9 @@ item_start_element (GtkBuildableParseContext *context, } else if (strcmp (element_name, "item") == 0) { - const gchar *id = NULL; + const char *id = NULL; gboolean translatable = FALSE; - const gchar *msg_context = NULL; + const char *msg_context = NULL; if (!_gtk_builder_check_parent (data->builder, context, "items", error)) return; @@ -240,7 +240,7 @@ item_start_element (GtkBuildableParseContext *context, static void item_text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -253,7 +253,7 @@ item_text (GtkBuildableParseContext *context, static void item_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -264,7 +264,7 @@ item_end_element (GtkBuildableParseContext *context, { if (data->translatable) { - const gchar *translated; + const char *translated; translated = _gtk_builder_parser_translate (data->domain, data->context, @@ -293,7 +293,7 @@ static gboolean gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -324,7 +324,7 @@ static void gtk_combo_box_text_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { ItemParserData *data; @@ -386,7 +386,7 @@ gtk_combo_box_text_new_with_entry (void) */ void gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, - const gchar *text) + const char *text) { gtk_combo_box_text_insert (combo_box, -1, NULL, text); } @@ -403,7 +403,7 @@ gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, */ void gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, - const gchar *text) + const char *text) { gtk_combo_box_text_insert (combo_box, 0, NULL, text); } @@ -424,7 +424,7 @@ gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, void gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, int position, - const gchar *text) + const char *text) { gtk_combo_box_text_insert (combo_box, position, NULL, text); } @@ -443,8 +443,8 @@ gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, */ void gtk_combo_box_text_append (GtkComboBoxText *combo_box, - const gchar *id, - const gchar *text) + const char *id, + const char *text) { gtk_combo_box_text_insert (combo_box, -1, id, text); } @@ -463,8 +463,8 @@ gtk_combo_box_text_append (GtkComboBoxText *combo_box, */ void gtk_combo_box_text_prepend (GtkComboBoxText *combo_box, - const gchar *id, - const gchar *text) + const char *id, + const char *text) { gtk_combo_box_text_insert (combo_box, 0, id, text); } @@ -486,8 +486,8 @@ gtk_combo_box_text_prepend (GtkComboBoxText *combo_box, void gtk_combo_box_text_insert (GtkComboBoxText *combo_box, int position, - const gchar *id, - const gchar *text) + const char *id, + const char *text) { GtkListStore *store; GtkTreeIter iter; @@ -582,11 +582,11 @@ gtk_combo_box_text_remove_all (GtkComboBoxText *combo_box) * Returns: (nullable) (transfer full): a newly allocated string containing the * currently active text. Must be freed with g_free(). */ -gchar * +char * gtk_combo_box_text_get_active_text (GtkComboBoxText *combo_box) { GtkTreeIter iter; - gchar *text = NULL; + char *text = NULL; g_return_val_if_fail (GTK_IS_COMBO_BOX_TEXT (combo_box), NULL); diff --git a/gtk/gtkcomboboxtext.h b/gtk/gtkcomboboxtext.h index e25478404a..33c4b18cc3 100644 --- a/gtk/gtkcomboboxtext.h +++ b/gtk/gtkcomboboxtext.h @@ -41,35 +41,35 @@ GDK_AVAILABLE_IN_ALL GtkWidget* gtk_combo_box_text_new_with_entry (void); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, int position, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_remove (GtkComboBoxText *combo_box, int position); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_remove_all (GtkComboBoxText *combo_box); GDK_AVAILABLE_IN_ALL -gchar *gtk_combo_box_text_get_active_text (GtkComboBoxText *combo_box); +char *gtk_combo_box_text_get_active_text (GtkComboBoxText *combo_box); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_insert (GtkComboBoxText *combo_box, int position, - const gchar *id, - const gchar *text); + const char *id, + const char *text); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_append (GtkComboBoxText *combo_box, - const gchar *id, - const gchar *text); + const char *id, + const char *text); GDK_AVAILABLE_IN_ALL void gtk_combo_box_text_prepend (GtkComboBoxText *combo_box, - const gchar *id, - const gchar *text); + const char *id, + const char *text); G_END_DECLS diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c index 4ae96c2350..250b3a7790 100644 --- a/gtk/gtkcomposetable.c +++ b/gtk/gtkcomposetable.c @@ -35,7 +35,7 @@ typedef struct { gunichar *sequence; gunichar value[2]; - gchar *comment; + char *comment; } GtkComposeData; @@ -54,7 +54,7 @@ gtk_compose_list_element_free (GtkComposeData *compose_data, gpointer data) } static gboolean -is_codepoint (const gchar *str) +is_codepoint (const char *str) { int i; @@ -73,10 +73,10 @@ is_codepoint (const gchar *str) static gboolean parse_compose_value (GtkComposeData *compose_data, - const gchar *val, - const gchar *line) + const char *val, + const char *line) { - gchar **words = g_strsplit (val, "\"", 3); + char **words = g_strsplit (val, "\"", 3); gunichar uch; if (g_strv_length (words) < 3) @@ -133,10 +133,10 @@ fail: static gboolean parse_compose_sequence (GtkComposeData *compose_data, - const gchar *seq, - const gchar *line) + const char *seq, + const char *line) { - gchar **words = g_strsplit (seq, "<", -1); + char **words = g_strsplit (seq, "<", -1); int i; int n = 0; @@ -148,9 +148,9 @@ parse_compose_sequence (GtkComposeData *compose_data, for (i = 1; words[i] != NULL; i++) { - gchar *start = words[i]; - gchar *end = strchr (words[i], '>'); - gchar *match; + char *start = words[i]; + char *end = strchr (words[i], '>'); + char *match; gunichar codepoint; if (words[i][0] == '\0') @@ -205,9 +205,9 @@ fail: static void parse_compose_line (GList **compose_list, - const gchar *line) + const char *line) { - gchar **components = NULL; + char **components = NULL; GtkComposeData *compose_data = NULL; if (line[0] == '\0' || line[0] == '#') @@ -245,10 +245,10 @@ fail: } static GList * -gtk_compose_list_parse_file (const gchar *compose_file) +gtk_compose_list_parse_file (const char *compose_file) { - gchar *contents = NULL; - gchar **lines = NULL; + char *contents = NULL; + char **lines = NULL; gsize length = 0; GError *error = NULL; GList *compose_list = NULL; @@ -447,8 +447,8 @@ gtk_compose_list_print (GList *compose_list, int total_size = 0; gunichar upper; gunichar lower; - const gchar *comment; - const gchar *keyval; + const char *comment; + const char *keyval; for (list = compose_list; list != NULL; list = list->next) { @@ -510,12 +510,12 @@ gtk_compose_table_data_hash (gconstpointer v, int length) return h; } -static gchar * +static char * gtk_compose_hash_get_cache_path (guint32 hash) { - gchar *basename = NULL; - gchar *dir = NULL; - gchar *path = NULL; + char *basename = NULL; + char *dir = NULL; + char *path = NULL; basename = g_strdup_printf ("%08x.cache", hash); @@ -534,14 +534,14 @@ gtk_compose_hash_get_cache_path (guint32 hash) return path; } -static gchar * +static char * gtk_compose_table_serialize (GtkComposeTable *compose_table, gsize *count) { - gchar *p, *contents; + char *p, *contents; gsize length, total_length; guint16 bytes; - const gchar *header = GTK_COMPOSE_TABLE_MAGIC; + const char *header = GTK_COMPOSE_TABLE_MAGIC; const guint16 version = GTK_COMPOSE_TABLE_VERSION; guint16 max_seq_len = compose_table->max_seq_len; guint16 index_stride = max_seq_len + 2; @@ -605,12 +605,12 @@ gtk_compose_table_find (gconstpointer data1, } static GtkComposeTable * -gtk_compose_table_load_cache (const gchar *compose_file) +gtk_compose_table_load_cache (const char *compose_file) { guint32 hash; - gchar *path = NULL; - gchar *contents = NULL; - gchar *p; + char *path = NULL; + char *contents = NULL; + char *p; GStatBuf original_buf; GStatBuf cache_buf; gsize total_length; @@ -717,8 +717,8 @@ out_load_cache: static void gtk_compose_table_save_cache (GtkComposeTable *compose_table) { - gchar *path = NULL; - gchar *contents = NULL; + char *path = NULL; + char *contents = NULL; GError *error = NULL; gsize length = 0; @@ -790,7 +790,7 @@ gtk_compose_table_new_with_list (GList *compose_list, } GtkComposeTable * -gtk_compose_table_new_with_file (const gchar *compose_file) +gtk_compose_table_new_with_file (const char *compose_file) { GList *compose_list = NULL; GtkComposeTable *compose_table; @@ -870,7 +870,7 @@ gtk_compose_table_list_add_array (GSList *compose_tables, GSList * gtk_compose_table_list_add_file (GSList *compose_tables, - const gchar *compose_file) + const char *compose_file) { guint32 hash; GtkComposeTable *compose_table; diff --git a/gtk/gtkcomposetable.h b/gtk/gtkcomposetable.h index b29a22718a..885ec6306d 100644 --- a/gtk/gtkcomposetable.h +++ b/gtk/gtkcomposetable.h @@ -42,13 +42,13 @@ struct _GtkComposeTableCompact int n_index_stride; }; -GtkComposeTable * gtk_compose_table_new_with_file (const gchar *compose_file); +GtkComposeTable * gtk_compose_table_new_with_file (const char *compose_file); GSList *gtk_compose_table_list_add_array (GSList *compose_tables, const guint16 *data, int max_seq_len, int n_seqs); GSList *gtk_compose_table_list_add_file (GSList *compose_tables, - const gchar *compose_file); + const char *compose_file); G_END_DECLS diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index cd80e2db2f..cf38ca11fd 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -43,7 +43,7 @@ struct _GtkCssValue union { - gchar *name; + char *name; GdkRGBA rgba; struct @@ -522,7 +522,7 @@ _gtk_css_color_value_new_literal (const GdkRGBA *color) } GtkCssValue * -_gtk_css_color_value_new_name (const gchar *name) +_gtk_css_color_value_new_name (const char *name) { GtkCssValue *value; diff --git a/gtk/gtkcsscolorvalueprivate.h b/gtk/gtkcsscolorvalueprivate.h index 15c6a0055e..793b3d8978 100644 --- a/gtk/gtkcsscolorvalueprivate.h +++ b/gtk/gtkcsscolorvalueprivate.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS GtkCssValue * gtk_css_color_value_new_transparent (void) G_GNUC_PURE; GtkCssValue * gtk_css_color_value_new_white (void) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_literal (const GdkRGBA *color) G_GNUC_PURE; -GtkCssValue * _gtk_css_color_value_new_name (const gchar *name) G_GNUC_PURE; +GtkCssValue * _gtk_css_color_value_new_name (const char *name) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_shade (GtkCssValue *color, gdouble factor) G_GNUC_PURE; GtkCssValue * _gtk_css_color_value_new_alpha (GtkCssValue *color, diff --git a/gtk/gtkcssimageradial.c b/gtk/gtkcssimageradial.c index 46e6da1584..3e263bf902 100644 --- a/gtk/gtkcssimageradial.c +++ b/gtk/gtkcssimageradial.c @@ -448,7 +448,7 @@ gtk_css_image_radial_print (GtkCssImage *image, { GtkCssImageRadial *radial = GTK_CSS_IMAGE_RADIAL (image); guint i; - const gchar *names[] = { + const char *names[] = { NULL, "closest-side", "farthest-side", diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 54e899bb89..8b4e710b93 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -122,7 +122,7 @@ struct _GtkCssProviderPrivate GArray *rulesets; GtkCssSelectorTree *tree; GResource *resource; - gchar *path; + char *path; }; enum { @@ -1090,7 +1090,7 @@ gtk_css_provider_load_internal (GtkCssProvider *self, **/ void gtk_css_provider_load_from_data (GtkCssProvider *css_provider, - const gchar *data, + const char *data, gssize length) { GBytes *bytes; @@ -1144,7 +1144,7 @@ gtk_css_provider_load_from_file (GtkCssProvider *css_provider, **/ void gtk_css_provider_load_from_path (GtkCssProvider *css_provider, - const gchar *path) + const char *path) { GFile *file; @@ -1171,10 +1171,10 @@ gtk_css_provider_load_from_path (GtkCssProvider *css_provider, */ void gtk_css_provider_load_from_resource (GtkCssProvider *css_provider, - const gchar *resource_path) + const char *resource_path) { GFile *file; - gchar *uri, *escaped; + char *uri, *escaped; g_return_if_fail (GTK_IS_CSS_PROVIDER (css_provider)); g_return_if_fail (resource_path != NULL); @@ -1192,10 +1192,10 @@ gtk_css_provider_load_from_resource (GtkCssProvider *css_provider, g_object_unref (file); } -gchar * +char * _gtk_get_theme_dir (void) { - const gchar *var; + const char *var; var = g_getenv ("GTK_DATA_PREFIX"); if (var == NULL) @@ -1206,7 +1206,7 @@ _gtk_get_theme_dir (void) /* Return the path that this providers gtk.css was loaded from, * if it is part of a theme, otherwise NULL. */ -const gchar * +const char * _gtk_css_provider_get_theme_dir (GtkCssProvider *provider) { GtkCssProviderPrivate *priv = gtk_css_provider_get_instance_private (provider); @@ -1228,17 +1228,17 @@ _gtk_css_provider_get_theme_dir (GtkCssProvider *provider) * $dir/$subdir/gtk-4.0/gtk-$variant.css * and return the first found file. */ -static gchar * -_gtk_css_find_theme_dir (const gchar *dir, - const gchar *subdir, - const gchar *name, - const gchar *variant) +static char * +_gtk_css_find_theme_dir (const char *dir, + const char *subdir, + const char *name, + const char *variant) { - gchar *file; - gchar *base; - gchar *subsubdir; + char *file; + char *base; + char *subsubdir; int i; - gchar *path; + char *path; if (variant) file = g_strconcat ("gtk-", variant, ".css", NULL); @@ -1271,11 +1271,11 @@ _gtk_css_find_theme_dir (const gchar *dir, #undef MINOR -static gchar * -_gtk_css_find_theme (const gchar *name, - const gchar *variant) +static char * +_gtk_css_find_theme (const char *name, + const char *variant) { - gchar *path; + char *path; const char *const *dirs; int i; char *dir; @@ -1321,11 +1321,11 @@ _gtk_css_find_theme (const gchar *name, **/ void gtk_css_provider_load_named (GtkCssProvider *provider, - const gchar *name, - const gchar *variant) + const char *name, + const char *variant) { - gchar *path; - gchar *resource_path; + char *path; + char *resource_path; g_return_if_fail (GTK_IS_CSS_PROVIDER (provider)); g_return_if_fail (name != NULL); diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h index 01d26bf326..921185bbb6 100644 --- a/gtk/gtkcssprovider.h +++ b/gtk/gtkcssprovider.h @@ -48,18 +48,18 @@ char * gtk_css_provider_to_string (GtkCssProvider *provider); GDK_AVAILABLE_IN_ALL void gtk_css_provider_load_from_data (GtkCssProvider *css_provider, - const gchar *data, + const char *data, gssize length); GDK_AVAILABLE_IN_ALL void gtk_css_provider_load_from_file (GtkCssProvider *css_provider, GFile *file); GDK_AVAILABLE_IN_ALL void gtk_css_provider_load_from_path (GtkCssProvider *css_provider, - const gchar *path); + const char *path); GDK_AVAILABLE_IN_ALL void gtk_css_provider_load_from_resource (GtkCssProvider *css_provider, - const gchar *resource_path); + const char *resource_path); GDK_AVAILABLE_IN_ALL void gtk_css_provider_load_named (GtkCssProvider *provider, diff --git a/gtk/gtkcssproviderprivate.h b/gtk/gtkcssproviderprivate.h index e345d00120..ac71cf0566 100644 --- a/gtk/gtkcssproviderprivate.h +++ b/gtk/gtkcssproviderprivate.h @@ -22,9 +22,9 @@ G_BEGIN_DECLS -gchar *_gtk_get_theme_dir (void); +char *_gtk_get_theme_dir (void); -const gchar *_gtk_css_provider_get_theme_dir (GtkCssProvider *provider); +const char *_gtk_css_provider_get_theme_dir (GtkCssProvider *provider); void gtk_css_provider_set_keep_css_sections (void); diff --git a/gtk/gtkcsstypes.c b/gtk/gtkcsstypes.c index ea83226317..dd85bd58b1 100644 --- a/gtk/gtkcsstypes.c +++ b/gtk/gtkcsstypes.c @@ -215,7 +215,7 @@ gtk_css_change_to_string (GtkCssChange change) return g_string_free (string, FALSE); } -const gchar * +const char * gtk_css_pseudoclass_name (GtkStateFlags state) { static const char * state_names[] = { diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index 988cdac8cb..4bd995546f 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -109,10 +109,10 @@ _gtk_print_get_default_user_units (void) * Do *not* translate it to "predefinito:mm", if it * it isn't default:mm or default:inch it will not work */ - gchar *e = _("default:mm"); + char *e = _("default:mm"); #ifdef HAVE__NL_MEASUREMENT_MEASUREMENT - gchar *imperial = NULL; + char *imperial = NULL; imperial = nl_langinfo (_NL_MEASUREMENT_MEASUREMENT); if (imperial && imperial[0] == 2 ) @@ -243,7 +243,7 @@ static void gtk_print_save_custom_papers (GListStore *store) { GKeyFile *keyfile; - gchar *filename, *data, *parentdir; + char *filename, *data, *parentdir; gsize len; int i = 0; @@ -252,7 +252,7 @@ gtk_print_save_custom_papers (GListStore *store) for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (store)); i++) { GtkPageSetup *page_setup; - gchar group[32]; + char group[32]; page_setup = g_list_model_get_item (G_LIST_MODEL (store), i); g_snprintf (group, sizeof (group), "Paper%u", i); @@ -397,7 +397,7 @@ gtk_custom_paper_unix_dialog_finalize (GObject *object) */ GtkWidget * _gtk_custom_paper_unix_dialog_new (GtkWindow *parent, - const gchar *title) + const char *title) { GtkWidget *result; @@ -591,7 +591,7 @@ unit_widget_changed (GtkCustomPaperUnixDialog *dialog) static gboolean custom_paper_name_used (GtkCustomPaperUnixDialog *dialog, - const gchar *name) + const char *name) { GtkPageSetup *page_setup; GtkPaperSize *paper_size; @@ -617,7 +617,7 @@ add_custom_paper (GtkCustomPaperUnixDialog *dialog) { GtkPageSetup *page_setup; GtkPaperSize *paper_size; - gchar *name; + char *name; int i; i = 1; @@ -740,11 +740,11 @@ margins_from_printer_changed (GtkCustomPaperUnixDialog *dialog) } static GtkWidget * -wrap_in_frame (const gchar *label, +wrap_in_frame (const char *label, GtkWidget *child) { GtkWidget *frame, *label_widget; - gchar *bold_text; + char *bold_text; label_widget = gtk_label_new (NULL); gtk_widget_set_halign (label_widget, GTK_ALIGN_START); diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h index 6a8250c129..8f96bf91d2 100644 --- a/gtk/gtkcustompaperunixdialog.h +++ b/gtk/gtkcustompaperunixdialog.h @@ -31,7 +31,7 @@ typedef struct _GtkCustomPaperUnixDialog GtkCustomPaperUnixDialog; GDK_AVAILABLE_IN_ALL GType gtk_custom_paper_unix_dialog_get_type (void) G_GNUC_CONST; GtkWidget * _gtk_custom_paper_unix_dialog_new (GtkWindow *parent, - const gchar *title); + const char *title); GtkUnit _gtk_print_get_default_user_units (void); void _gtk_print_load_custom_papers (GtkListStore *store); void gtk_print_load_custom_papers (GListStore *store); diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index 44d7c2dfe1..d06ff6d918 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -92,7 +92,7 @@ * |[<!-- language="C" --> * // Function to open a dialog box with a message * void - * quick_message (GtkWindow *parent, gchar *message) + * quick_message (GtkWindow *parent, char *message) * { * GtkWidget *dialog, *label, *content_area; * GtkDialogFlags flags; @@ -183,7 +183,7 @@ struct _ResponseData }; static void gtk_dialog_add_buttons_valist (GtkDialog *dialog, - const gchar *first_button_text, + const char *first_button_text, va_list args); static gboolean gtk_dialog_close_request (GtkWindow *window); @@ -199,18 +199,18 @@ static void gtk_dialog_buildable_interface_init (GtkBuildableIface *iface static gboolean gtk_dialog_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_dialog_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); static void gtk_dialog_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); enum { @@ -673,7 +673,7 @@ gtk_dialog_new (void) } static GtkWidget* -gtk_dialog_new_empty (const gchar *title, +gtk_dialog_new_empty (const char *title, GtkWindow *parent, GtkDialogFlags flags) { @@ -742,10 +742,10 @@ gtk_dialog_new_empty (const gchar *title, * Returns: a new #GtkDialog */ GtkWidget* -gtk_dialog_new_with_buttons (const gchar *title, +gtk_dialog_new_with_buttons (const char *title, GtkWindow *parent, GtkDialogFlags flags, - const gchar *first_button_text, + const char *first_button_text, ...) { GtkDialog *dialog; @@ -871,7 +871,7 @@ gtk_dialog_add_action_widget (GtkDialog *dialog, **/ GtkWidget* gtk_dialog_add_button (GtkDialog *dialog, - const gchar *button_text, + const char *button_text, int response_id) { GtkWidget *button; @@ -889,10 +889,10 @@ gtk_dialog_add_button (GtkDialog *dialog, static void gtk_dialog_add_buttons_valist (GtkDialog *dialog, - const gchar *first_button_text, + const char *first_button_text, va_list args) { - const gchar* text; + const char * text; int response_id; g_return_if_fail (GTK_IS_DIALOG (dialog)); @@ -907,7 +907,7 @@ gtk_dialog_add_buttons_valist (GtkDialog *dialog, { gtk_dialog_add_button (dialog, text, response_id); - text = va_arg (args, gchar*); + text = va_arg (args, char *); if (text == NULL) break; response_id = va_arg (args, int); @@ -927,7 +927,7 @@ gtk_dialog_add_buttons_valist (GtkDialog *dialog, */ void gtk_dialog_add_buttons (GtkDialog *dialog, - const gchar *first_button_text, + const char *first_button_text, ...) { va_list args; @@ -1071,7 +1071,7 @@ gtk_dialog_get_response_for_widget (GtkDialog *dialog, } typedef struct { - gchar *widget_name; + char *widget_name; int response_id; gboolean is_default; int line; @@ -1102,9 +1102,9 @@ free_action_widget_info (gpointer data) static void parser_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -1112,7 +1112,7 @@ parser_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "action-widget") == 0) { - const gchar *response; + const char *response; gboolean is_default = FALSE; GValue gvalue = G_VALUE_INIT; @@ -1162,7 +1162,7 @@ parser_start_element (GtkBuildableParseContext *context, static void parser_text_element (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -1175,7 +1175,7 @@ parser_text_element (GtkBuildableParseContext *context, static void parser_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -1209,7 +1209,7 @@ static gboolean gtk_dialog_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -1240,7 +1240,7 @@ static void gtk_dialog_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { GtkDialog *dialog = GTK_DIALOG (buildable); @@ -1326,7 +1326,7 @@ static void gtk_dialog_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { GtkDialog *dialog = GTK_DIALOG (buildable); GtkDialogPrivate *priv = gtk_dialog_get_instance_private (dialog); diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h index e5ffc1a90e..00f8d535ee 100644 --- a/gtk/gtkdialog.h +++ b/gtk/gtkdialog.h @@ -138,10 +138,10 @@ GDK_AVAILABLE_IN_ALL GtkWidget* gtk_dialog_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_dialog_new_with_buttons (const gchar *title, +GtkWidget* gtk_dialog_new_with_buttons (const char *title, GtkWindow *parent, GtkDialogFlags flags, - const gchar *first_button_text, + const char *first_button_text, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL @@ -150,11 +150,11 @@ void gtk_dialog_add_action_widget (GtkDialog *dialog, int response_id); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_dialog_add_button (GtkDialog *dialog, - const gchar *button_text, + const char *button_text, int response_id); GDK_AVAILABLE_IN_ALL void gtk_dialog_add_buttons (GtkDialog *dialog, - const gchar *first_button_text, + const char *first_button_text, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h index c5539fe84e..2e3f886f56 100644 --- a/gtk/gtkeditable.h +++ b/gtk/gtkeditable.h @@ -49,7 +49,7 @@ struct _GtkEditableInterface /* signals */ void (* insert_text) (GtkEditable *editable, - const gchar *text, + const char *text, int length, int *position); void (* delete_text) (GtkEditable *editable, diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index dbf69b834a..2fdb9483e1 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -188,7 +188,7 @@ struct _GtkEntryPrivate struct _EntryIconInfo { GtkWidget *widget; - gchar *tooltip; + char *tooltip; guint nonactivatable : 1; guint in_drag : 1; @@ -338,7 +338,7 @@ static gboolean gtk_entry_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -364,7 +364,7 @@ static void gtk_entry_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { GtkPangoAttributeParserData *data = user_data; @@ -1434,7 +1434,7 @@ update_icon_style (GtkWidget *widget, GtkEntry *entry = GTK_ENTRY (widget); GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); EntryIconInfo *icon_info = priv->icons[icon_pos]; - const gchar *sides[2] = { GTK_STYLE_CLASS_LEFT, GTK_STYLE_CLASS_RIGHT }; + const char *sides[2] = { GTK_STYLE_CLASS_LEFT, GTK_STYLE_CLASS_RIGHT }; if (icon_info == NULL) return; @@ -2440,7 +2440,7 @@ gtk_entry_set_icon_from_paintable (GtkEntry *entry, void gtk_entry_set_icon_from_icon_name (GtkEntry *entry, GtkEntryIconPosition icon_pos, - const gchar *icon_name) + const char *icon_name) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); EntryIconInfo *icon_info; @@ -2662,7 +2662,7 @@ gtk_entry_get_icon_gicon (GtkEntry *entry, * Returns: (nullable): An icon name, or %NULL if no icon is set or if the icon * wasn’t set from an icon name */ -const gchar * +const char * gtk_entry_get_icon_name (GtkEntry *entry, GtkEntryIconPosition icon_pos) { @@ -2970,13 +2970,13 @@ ensure_has_tooltip (GtkEntry *entry) * Returns: (nullable): the tooltip text, or %NULL. Free the returned * string with g_free() when done. */ -gchar * +char * gtk_entry_get_icon_tooltip_text (GtkEntry *entry, GtkEntryIconPosition icon_pos) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); EntryIconInfo *icon_info; - gchar *text = NULL; + char *text = NULL; g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), NULL); @@ -3016,7 +3016,7 @@ gtk_entry_get_icon_tooltip_text (GtkEntry *entry, void gtk_entry_set_icon_tooltip_text (GtkEntry *entry, GtkEntryIconPosition icon_pos, - const gchar *tooltip) + const char *tooltip) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); EntryIconInfo *icon_info; @@ -3056,7 +3056,7 @@ gtk_entry_set_icon_tooltip_text (GtkEntry *entry, * Returns: (nullable): the tooltip text, or %NULL. Free the returned * string with g_free() when done. */ -gchar * +char * gtk_entry_get_icon_tooltip_markup (GtkEntry *entry, GtkEntryIconPosition icon_pos) { @@ -3092,7 +3092,7 @@ gtk_entry_get_icon_tooltip_markup (GtkEntry *entry, void gtk_entry_set_icon_tooltip_markup (GtkEntry *entry, GtkEntryIconPosition icon_pos, - const gchar *tooltip) + const char *tooltip) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); EntryIconInfo *icon_info; @@ -3376,7 +3376,7 @@ gtk_entry_progress_pulse (GtkEntry *entry) **/ void gtk_entry_set_placeholder_text (GtkEntry *entry, - const gchar *text) + const char *text) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); @@ -3396,7 +3396,7 @@ gtk_entry_set_placeholder_text (GtkEntry *entry, * not be freed, modified or stored. If no placeholder text has been set, * %NULL will be returned. **/ -const gchar * +const char * gtk_entry_get_placeholder_text (GtkEntry *entry) { GtkEntryPrivate *priv = gtk_entry_get_instance_private (entry); diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 4f5b529a18..dfcbce68f7 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -180,10 +180,10 @@ gdouble gtk_entry_get_progress_pulse_step (GtkEntry *entry); GDK_AVAILABLE_IN_ALL void gtk_entry_progress_pulse (GtkEntry *entry); GDK_AVAILABLE_IN_ALL -const gchar* gtk_entry_get_placeholder_text (GtkEntry *entry); +const char * gtk_entry_get_placeholder_text (GtkEntry *entry); GDK_AVAILABLE_IN_ALL void gtk_entry_set_placeholder_text (GtkEntry *entry, - const gchar *text); + const char *text); /* Setting and managing icons */ GDK_AVAILABLE_IN_ALL @@ -193,7 +193,7 @@ void gtk_entry_set_icon_from_paintable (GtkEntry * GDK_AVAILABLE_IN_ALL void gtk_entry_set_icon_from_icon_name (GtkEntry *entry, GtkEntryIconPosition icon_pos, - const gchar *icon_name); + const char *icon_name); GDK_AVAILABLE_IN_ALL void gtk_entry_set_icon_from_gicon (GtkEntry *entry, GtkEntryIconPosition icon_pos, @@ -205,7 +205,7 @@ GDK_AVAILABLE_IN_ALL GdkPaintable * gtk_entry_get_icon_paintable (GtkEntry *entry, GtkEntryIconPosition icon_pos); GDK_AVAILABLE_IN_ALL -const gchar* gtk_entry_get_icon_name (GtkEntry *entry, +const char * gtk_entry_get_icon_name (GtkEntry *entry, GtkEntryIconPosition icon_pos); GDK_AVAILABLE_IN_ALL GIcon* gtk_entry_get_icon_gicon (GtkEntry *entry, @@ -231,16 +231,16 @@ int gtk_entry_get_icon_at_pos (GtkEntry * GDK_AVAILABLE_IN_ALL void gtk_entry_set_icon_tooltip_text (GtkEntry *entry, GtkEntryIconPosition icon_pos, - const gchar *tooltip); + const char *tooltip); GDK_AVAILABLE_IN_ALL -gchar * gtk_entry_get_icon_tooltip_text (GtkEntry *entry, +char * gtk_entry_get_icon_tooltip_text (GtkEntry *entry, GtkEntryIconPosition icon_pos); GDK_AVAILABLE_IN_ALL void gtk_entry_set_icon_tooltip_markup (GtkEntry *entry, GtkEntryIconPosition icon_pos, - const gchar *tooltip); + const char *tooltip); GDK_AVAILABLE_IN_ALL -gchar * gtk_entry_get_icon_tooltip_markup (GtkEntry *entry, +char * gtk_entry_get_icon_tooltip_markup (GtkEntry *entry, GtkEntryIconPosition icon_pos); GDK_AVAILABLE_IN_ALL void gtk_entry_set_icon_drag_source (GtkEntry *entry, diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c index 00158e3a0c..f90afe72dd 100644 --- a/gtk/gtkentrybuffer.c +++ b/gtk/gtkentrybuffer.c @@ -70,7 +70,7 @@ typedef struct _GtkEntryBufferPrivate GtkEntryBufferPrivate; struct _GtkEntryBufferPrivate { /* Only valid if this class is not derived */ - gchar *normal_text; + char *normal_text; gsize normal_text_size; gsize normal_text_bytes; guint normal_text_chars; @@ -90,15 +90,15 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkEntryBuffer, gtk_entry_buffer, G_TYPE_OBJECT) /* Overwrite a memory that might contain sensitive information. */ static void -trash_area (gchar *area, +trash_area (char *area, gsize len) { - volatile gchar *varea = (volatile gchar *)area; + volatile char *varea = (volatile char *)area; while (len-- > 0) *varea++ = 0; } -static const gchar* +static const char * gtk_entry_buffer_normal_get_text (GtkEntryBuffer *buffer, gsize *n_bytes) { @@ -124,7 +124,7 @@ gtk_entry_buffer_normal_get_length (GtkEntryBuffer *buffer) static guint gtk_entry_buffer_normal_insert_text (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, guint n_chars) { GtkEntryBufferPrivate *pv = gtk_entry_buffer_get_instance_private (buffer); @@ -137,7 +137,7 @@ gtk_entry_buffer_normal_insert_text (GtkEntryBuffer *buffer, /* Need more memory */ if (n_bytes + pv->normal_text_bytes + 1 > pv->normal_text_size) { - gchar *et_new; + char *et_new; prev_size = pv->normal_text_size; @@ -211,7 +211,7 @@ gtk_entry_buffer_normal_delete_text (GtkEntryBuffer *buffer, static void gtk_entry_buffer_real_inserted_text (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, guint n_chars) { g_object_notify_by_pspec (G_OBJECT (buffer), entry_buffer_props[PROP_TEXT]); @@ -436,7 +436,7 @@ gtk_entry_buffer_class_init (GtkEntryBufferClass *klass) * Returns: A new GtkEntryBuffer object. **/ GtkEntryBuffer* -gtk_entry_buffer_new (const gchar *initial_chars, +gtk_entry_buffer_new (const char *initial_chars, int n_initial_chars) { GtkEntryBuffer *buffer = g_object_new (GTK_TYPE_ENTRY_BUFFER, NULL); @@ -504,7 +504,7 @@ gtk_entry_buffer_get_bytes (GtkEntryBuffer *buffer) * storage in the buffer and must not be freed, modified or * stored. **/ -const gchar* +const char * gtk_entry_buffer_get_text (GtkEntryBuffer *buffer) { GtkEntryBufferClass *klass; @@ -532,7 +532,7 @@ gtk_entry_buffer_get_text (GtkEntryBuffer *buffer) **/ void gtk_entry_buffer_set_text (GtkEntryBuffer *buffer, - const gchar *chars, + const char *chars, int n_chars) { g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer)); @@ -617,7 +617,7 @@ gtk_entry_buffer_get_max_length (GtkEntryBuffer *buffer) guint gtk_entry_buffer_insert_text (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, int n_chars) { GtkEntryBufferPrivate *pv = gtk_entry_buffer_get_instance_private (buffer); @@ -706,7 +706,7 @@ gtk_entry_buffer_delete_text (GtkEntryBuffer *buffer, void gtk_entry_buffer_emit_inserted_text (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, guint n_chars) { g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer)); diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h index 8c7a91b984..b44bd63a05 100644 --- a/gtk/gtkentrybuffer.h +++ b/gtk/gtkentrybuffer.h @@ -53,7 +53,7 @@ struct _GtkEntryBufferClass void (*inserted_text) (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, guint n_chars); void (*deleted_text) (GtkEntryBuffer *buffer, @@ -62,14 +62,14 @@ struct _GtkEntryBufferClass /* Virtual Methods */ - const gchar* (*get_text) (GtkEntryBuffer *buffer, + const char * (*get_text) (GtkEntryBuffer *buffer, gsize *n_bytes); guint (*get_length) (GtkEntryBuffer *buffer); guint (*insert_text) (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, guint n_chars); guint (*delete_text) (GtkEntryBuffer *buffer, @@ -91,7 +91,7 @@ GDK_AVAILABLE_IN_ALL GType gtk_entry_buffer_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkEntryBuffer* gtk_entry_buffer_new (const gchar *initial_chars, +GtkEntryBuffer* gtk_entry_buffer_new (const char *initial_chars, int n_initial_chars); GDK_AVAILABLE_IN_ALL @@ -101,11 +101,11 @@ GDK_AVAILABLE_IN_ALL guint gtk_entry_buffer_get_length (GtkEntryBuffer *buffer); GDK_AVAILABLE_IN_ALL -const gchar* gtk_entry_buffer_get_text (GtkEntryBuffer *buffer); +const char * gtk_entry_buffer_get_text (GtkEntryBuffer *buffer); GDK_AVAILABLE_IN_ALL void gtk_entry_buffer_set_text (GtkEntryBuffer *buffer, - const gchar *chars, + const char *chars, int n_chars); GDK_AVAILABLE_IN_ALL @@ -118,7 +118,7 @@ int gtk_entry_buffer_get_max_length (GtkEntryBuffe GDK_AVAILABLE_IN_ALL guint gtk_entry_buffer_insert_text (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, int n_chars); GDK_AVAILABLE_IN_ALL @@ -129,7 +129,7 @@ guint gtk_entry_buffer_delete_text (GtkEntryBuffe GDK_AVAILABLE_IN_ALL void gtk_entry_buffer_emit_inserted_text (GtkEntryBuffer *buffer, guint position, - const gchar *chars, + const char *chars, guint n_chars); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 81d492c510..fb8782f639 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -148,7 +148,7 @@ static gboolean gtk_entry_completion_match_selected (GtkEntryCompletion *co GtkTreeModel *model, GtkTreeIter *iter); static gboolean gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, - const gchar *prefix); + const char *prefix); static gboolean gtk_entry_completion_cursor_on_match (GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter); @@ -156,7 +156,7 @@ static gboolean gtk_entry_completion_insert_completion (GtkEntryCompletion *co GtkTreeModel *model, GtkTreeIter *iter); static void gtk_entry_completion_insert_completion_text (GtkEntryCompletion *completion, - const gchar *text); + const char *text); static void connect_completion_signals (GtkEntryCompletion *completion); static void disconnect_completion_signals (GtkEntryCompletion *completion); @@ -411,7 +411,7 @@ static void gtk_entry_completion_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { /* Just ignore the boolean return from here */ @@ -707,13 +707,13 @@ gtk_entry_completion_get_area (GtkCellLayout *cell_layout) /* all those callbacks */ static gboolean gtk_entry_completion_default_completion_func (GtkEntryCompletion *completion, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer user_data) { - gchar *item = NULL; - gchar *normalized_string; - gchar *case_normalized_string; + char *item = NULL; + char *normalized_string; + char *case_normalized_string; gboolean ret = FALSE; @@ -1014,7 +1014,7 @@ gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion *completion) void gtk_entry_completion_complete (GtkEntryCompletion *completion) { - gchar *tmp; + char *tmp; GtkTreeIter iter; g_return_if_fail (GTK_IS_ENTRY_COMPLETION (completion)); @@ -1197,7 +1197,7 @@ gtk_entry_completion_match_selected (GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter) { - gchar *str = NULL; + char *str = NULL; gtk_tree_model_get (model, iter, completion->text_column, &str, -1); gtk_editable_set_text (GTK_EDITABLE (completion->entry), str ? str : ""); @@ -1233,12 +1233,12 @@ gtk_entry_completion_cursor_on_match (GtkEntryCompletion *completion, * Returns: (nullable) (transfer full): The common prefix all rows starting with * @key or %NULL if no row matches @key. **/ -gchar * +char * gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion, const char *key) { GtkTreeIter iter; - gchar *prefix = NULL; + char *prefix = NULL; gboolean valid; if (completion->text_column < 0) @@ -1249,7 +1249,7 @@ gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion, while (valid) { - gchar *text; + char *text; gtk_tree_model_get (GTK_TREE_MODEL (completion->filter_model), &iter, completion->text_column, &text, @@ -1261,8 +1261,8 @@ gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion, prefix = g_strdup (text); else { - gchar *p = prefix; - gchar *q = text; + char *p = prefix; + char *q = text; while (*p && *p == *q) { @@ -1299,13 +1299,13 @@ gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion, static gboolean gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, - const gchar *prefix) + const char *prefix) { if (prefix) { int key_len; int prefix_len; - const gchar *key; + const char *key; prefix_len = g_utf8_strlen (prefix, -1); @@ -1337,7 +1337,7 @@ gtk_entry_completion_real_insert_prefix (GtkEntryCompletion *completion, * * Returns: the prefix for the current completion */ -const gchar* +const char * gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion) { g_return_val_if_fail (GTK_IS_ENTRY_COMPLETION (completion), NULL); @@ -1347,7 +1347,7 @@ gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion) static void gtk_entry_completion_insert_completion_text (GtkEntryCompletion *completion, - const gchar *new_text) + const char *new_text) { int len; GtkText *text = gtk_entry_get_text_widget (GTK_ENTRY (completion->entry)); @@ -1376,7 +1376,7 @@ gtk_entry_completion_insert_completion (GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter) { - gchar *str = NULL; + char *str = NULL; if (completion->text_column < 0) return FALSE; @@ -1402,7 +1402,7 @@ void gtk_entry_completion_insert_prefix (GtkEntryCompletion *completion) { gboolean done; - gchar *prefix; + char *prefix; GtkText *text = gtk_entry_get_text_widget (GTK_ENTRY (completion->entry)); GtkEntryBuffer *buffer = gtk_text_get_buffer (text); @@ -1906,7 +1906,7 @@ keypress_completion_out: if (!entry_set) { - gchar *str = NULL; + char *str = NULL; gtk_tree_model_get (model, &iter, completion->text_column, &str, diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h index 4d98c8347e..476aa9834d 100644 --- a/gtk/gtkentrycompletion.h +++ b/gtk/gtkentrycompletion.h @@ -55,7 +55,7 @@ typedef struct _GtkEntryCompletion GtkEntryCompletion; * for @key */ typedef gboolean (* GtkEntryCompletionMatchFunc) (GtkEntryCompletion *completion, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer user_data); @@ -87,7 +87,7 @@ void gtk_entry_completion_set_minimum_key_length (GtkEntryComplet GDK_AVAILABLE_IN_ALL int gtk_entry_completion_get_minimum_key_length (GtkEntryCompletion *completion); GDK_AVAILABLE_IN_ALL -gchar * gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion, +char * gtk_entry_completion_compute_prefix (GtkEntryCompletion *completion, const char *key); GDK_AVAILABLE_IN_ALL void gtk_entry_completion_complete (GtkEntryCompletion *completion); @@ -121,7 +121,7 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_entry_completion_get_popup_single_match (GtkEntryCompletion *completion); GDK_AVAILABLE_IN_ALL -const gchar *gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion); +const char *gtk_entry_completion_get_completion_prefix (GtkEntryCompletion *completion); /* convenience */ GDK_AVAILABLE_IN_ALL void gtk_entry_completion_set_text_column (GtkEntryCompletion *completion, diff --git a/gtk/gtkentryprivate.h b/gtk/gtkentryprivate.h index eaafce354e..eb98ac938d 100644 --- a/gtk/gtkentryprivate.h +++ b/gtk/gtkentryprivate.h @@ -50,7 +50,7 @@ struct _GtkEntryCompletion int minimum_key_length; int text_column; - gchar *case_normalized_key; + char *case_normalized_key; GtkEventController *entry_key_controller; GtkEventController *entry_focus_controller; @@ -74,7 +74,7 @@ struct _GtkEntryCompletion guint inline_selection : 1; guint has_grab : 1; - gchar *completion_prefix; + char *completion_prefix; GSource *check_completion_idle; }; @@ -89,7 +89,7 @@ struct _GtkEntryCompletionClass void (* action_activated) (GtkEntryCompletion *completion, int index_); gboolean (* insert_prefix) (GtkEntryCompletion *completion, - const gchar *prefix); + const char *prefix); gboolean (* cursor_on_match) (GtkEntryCompletion *completion, GtkTreeModel *model, GtkTreeIter *iter); diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index b20ea03ce8..b50f0a477d 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -197,7 +197,7 @@ static void gtk_expander_buildable_init (GtkBuildableIface *iface); static void gtk_expander_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); /* GtkWidget */ @@ -431,7 +431,7 @@ static void gtk_expander_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (g_strcmp0 (type, "label") == 0) gtk_expander_set_label_widget (GTK_EXPANDER (buildable), GTK_WIDGET (child)); @@ -806,7 +806,7 @@ gtk_expander_measure (GtkWidget *widget, * Returns: a new #GtkExpander widget. */ GtkWidget * -gtk_expander_new (const gchar *label) +gtk_expander_new (const char *label) { return g_object_new (GTK_TYPE_EXPANDER, "label", label, NULL); } @@ -826,7 +826,7 @@ gtk_expander_new (const gchar *label) * Returns: a new #GtkExpander widget. */ GtkWidget * -gtk_expander_new_with_mnemonic (const gchar *label) +gtk_expander_new_with_mnemonic (const char *label) { return g_object_new (GTK_TYPE_EXPANDER, "label", label, @@ -921,7 +921,7 @@ gtk_expander_get_expanded (GtkExpander *expander) */ void gtk_expander_set_label (GtkExpander *expander, - const gchar *label) + const char *label) { g_return_if_fail (GTK_IS_EXPANDER (expander)); @@ -970,7 +970,7 @@ gtk_expander_set_label (GtkExpander *expander, * Returns: (nullable): The text of the label widget. This string is owned * by the widget and must not be modified or freed. */ -const gchar * +const char * gtk_expander_get_label (GtkExpander *expander) { g_return_val_if_fail (GTK_IS_EXPANDER (expander), NULL); diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h index 1737816058..8ddf416e54 100644 --- a/gtk/gtkexpander.h +++ b/gtk/gtkexpander.h @@ -40,9 +40,9 @@ GDK_AVAILABLE_IN_ALL GType gtk_expander_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_expander_new (const gchar *label); +GtkWidget *gtk_expander_new (const char *label); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_expander_new_with_mnemonic (const gchar *label); +GtkWidget *gtk_expander_new_with_mnemonic (const char *label); GDK_AVAILABLE_IN_ALL void gtk_expander_set_expanded (GtkExpander *expander, @@ -52,9 +52,9 @@ gboolean gtk_expander_get_expanded (GtkExpander *expander); GDK_AVAILABLE_IN_ALL void gtk_expander_set_label (GtkExpander *expander, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL -const gchar * gtk_expander_get_label (GtkExpander *expander); +const char * gtk_expander_get_label (GtkExpander *expander); GDK_AVAILABLE_IN_ALL void gtk_expander_set_use_underline (GtkExpander *expander, diff --git a/gtk/gtkexpression.c b/gtk/gtkexpression.c index 58f8fd590f..fada1d1d03 100644 --- a/gtk/gtkexpression.c +++ b/gtk/gtkexpression.c @@ -319,7 +319,7 @@ value_expression_collect_value (GValue *value, return NULL; } -static gchar * +static char * value_expression_lcopy_value (const GValue *value, guint n_collect_values, GTypeCValue *collect_values, diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c index 259e55687d..f05b053f01 100644 --- a/gtk/gtkfilechooser.c +++ b/gtk/gtkfilechooser.c @@ -297,7 +297,7 @@ gtk_file_chooser_get_create_folders (GtkFileChooser *chooser) **/ void gtk_file_chooser_set_current_name (GtkFileChooser *chooser, - const gchar *name) + const char *name) { g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser)); g_return_if_fail (name != NULL); @@ -320,7 +320,7 @@ gtk_file_chooser_set_current_name (GtkFileChooser *chooser, * whatever the contents of the entry are. Note also that this string is in * UTF-8 encoding, which is not necessarily the system’s encoding for filenames. **/ -gchar * +char * gtk_file_chooser_get_current_name (GtkFileChooser *chooser) { g_return_val_if_fail (GTK_IS_FILE_CHOOSER (chooser), NULL); diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 4078a2d720..a530cb5909 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -347,7 +347,7 @@ struct DndSelectFolderData GtkFileChooserAction action; GCancellable *cancellable; GFile *file; - gchar **uris; + char **uris; guint i; gboolean selected; }; @@ -833,7 +833,7 @@ gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser, GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (chooser); GtkTreeIter iter; int pos; - gchar type; + char type; pos = model_get_type_position (button, ROW_TYPE_SHORTCUT); gtk_tree_model_iter_nth_child (button->model, &iter, NULL, pos); @@ -1288,7 +1288,7 @@ change_icon_theme (GtkFileChooserButton *button) do { GIcon *icon = NULL; - gchar type; + char type; gpointer data; type = ROW_TYPE_INVALID; @@ -1549,7 +1549,7 @@ static void model_free_row_data (GtkFileChooserButton *button, GtkTreeIter *iter) { - gchar type; + char type; gpointer data; GCancellable *cancellable; @@ -1589,7 +1589,7 @@ model_add_special_get_info_cb (GObject *source, GCancellable *model_cancellable = NULL; GtkFileChooserButton *button = data->button; GFileInfo *info = NULL; - gchar *name; + char *name; if (!button->model) /* button got destroyed */ @@ -1644,8 +1644,8 @@ out: static void model_add_special (GtkFileChooserButton *button) { - const gchar *homedir; - const gchar *desktopdir; + const char *homedir; + const char *desktopdir; GtkListStore *store; GtkTreeIter iter; GFile *file; @@ -1757,7 +1757,7 @@ model_add_volumes (GtkFileChooserButton *button, gpointer *volume; GtkTreeIter iter; GIcon *icon; - gchar *display_name; + char *display_name; volume = l->data; if (G_IS_DRIVE (volume)) @@ -1833,7 +1833,7 @@ model_add_bookmarks (GtkFileChooserButton *button, } else { - gchar *label; + char *label; GIcon *icon; /* Don't call get_info for remote paths to avoid latency and @@ -1934,7 +1934,7 @@ model_update_current_folder (GtkFileChooserButton *button, } else { - gchar *label; + char *label; GIcon *icon; /* Don't call get_info for remote paths to avoid latency and @@ -2045,7 +2045,7 @@ filter_model_visible_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { - gchar type; + char type; gpointer data; gboolean retval, is_folder; @@ -2087,7 +2087,7 @@ name_cell_data_func (GtkCellLayout *layout, GtkTreeIter *iter, gpointer user_data) { - gchar type; + char type; type = 0; gtk_tree_model_get (model, iter, @@ -2107,7 +2107,7 @@ combo_box_row_separator_func (GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data) { - gchar type = ROW_TYPE_INVALID; + char type = ROW_TYPE_INVALID; gtk_tree_model_get (model, iter, TYPE_COLUMN, &type, -1); @@ -2145,7 +2145,7 @@ update_combo_box (GtkFileChooserButton *button) do { - gchar type; + char type; gpointer data; type = ROW_TYPE_INVALID; @@ -2247,7 +2247,7 @@ out: static void update_label_and_image (GtkFileChooserButton *button) { - gchar *label_text; + char *label_text; GFile *file; gboolean done_changing_selection; @@ -2661,7 +2661,7 @@ combo_box_changed_cb (GtkComboBox *combo_box, if (gtk_combo_box_get_active_iter (combo_box, &iter)) { - gchar type; + char type; gpointer data; type = ROW_TYPE_INVALID; @@ -2785,7 +2785,7 @@ native_response_cb (GtkFileChooserNative *native, * Returns: a new button widget. */ GtkWidget * -gtk_file_chooser_button_new (const gchar *title, +gtk_file_chooser_button_new (const char *title, GtkFileChooserAction action) { g_return_val_if_fail (action == GTK_FILE_CHOOSER_ACTION_OPEN || @@ -2833,7 +2833,7 @@ gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog) */ void gtk_file_chooser_button_set_title (GtkFileChooserButton *button, - const gchar *title) + const char *title) { g_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button)); @@ -2853,7 +2853,7 @@ gtk_file_chooser_button_set_title (GtkFileChooserButton *button, * * Returns: a pointer to the browse dialog’s title. */ -const gchar * +const char * gtk_file_chooser_button_get_title (GtkFileChooserButton *button) { g_return_val_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button), NULL); diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h index ecd3bbd5be..af3cd78938 100644 --- a/gtk/gtkfilechooserbutton.h +++ b/gtk/gtkfilechooserbutton.h @@ -37,15 +37,15 @@ typedef struct _GtkFileChooserButton GtkFileChooserButton; GDK_AVAILABLE_IN_ALL GType gtk_file_chooser_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_file_chooser_button_new (const gchar *title, +GtkWidget * gtk_file_chooser_button_new (const char *title, GtkFileChooserAction action); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog); GDK_AVAILABLE_IN_ALL -const gchar * gtk_file_chooser_button_get_title (GtkFileChooserButton *button); +const char * gtk_file_chooser_button_get_title (GtkFileChooserButton *button); GDK_AVAILABLE_IN_ALL void gtk_file_chooser_button_set_title (GtkFileChooserButton *button, - const gchar *title); + const char *title); GDK_AVAILABLE_IN_ALL int gtk_file_chooser_button_get_width_chars (GtkFileChooserButton *button); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index e77d8a6b0d..54cb4cc015 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -682,10 +682,10 @@ response_cb (GtkDialog *dialog, } static GtkWidget * -gtk_file_chooser_dialog_new_valist (const gchar *title, +gtk_file_chooser_dialog_new_valist (const char *title, GtkWindow *parent, GtkFileChooserAction action, - const gchar *first_button_text, + const char *first_button_text, va_list varargs) { GtkWidget *result; @@ -704,7 +704,7 @@ gtk_file_chooser_dialog_new_valist (const gchar *title, { response_id = va_arg (varargs, int); gtk_dialog_add_button (GTK_DIALOG (result), button_text, response_id); - button_text = va_arg (varargs, const gchar *); + button_text = va_arg (varargs, const char *); } return result; @@ -724,10 +724,10 @@ gtk_file_chooser_dialog_new_valist (const gchar *title, * Returns: a new #GtkFileChooserDialog **/ GtkWidget * -gtk_file_chooser_dialog_new (const gchar *title, +gtk_file_chooser_dialog_new (const char *title, GtkWindow *parent, GtkFileChooserAction action, - const gchar *first_button_text, + const char *first_button_text, ...) { GtkWidget *result; diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h index 4c42ff35b7..2f47143374 100644 --- a/gtk/gtkfilechooserdialog.h +++ b/gtk/gtkfilechooserdialog.h @@ -37,10 +37,10 @@ typedef struct _GtkFileChooserDialog GtkFileChooserDialog; GDK_AVAILABLE_IN_ALL GType gtk_file_chooser_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_file_chooser_dialog_new (const gchar *title, +GtkWidget *gtk_file_chooser_dialog_new (const char *title, GtkWindow *parent, GtkFileChooserAction action, - const gchar *first_button_text, + const char *first_button_text, ...) G_GNUC_NULL_TERMINATED; G_END_DECLS diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index b399b96888..a9d721ba7b 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -55,8 +55,8 @@ struct _GtkFileChooserEntry GFile *base_folder; GFile *current_folder_file; - gchar *dir_part; - gchar *file_part; + char *dir_part; + char *file_part; GtkTreeModel *completion_store; GtkFileFilter *current_filter; @@ -93,7 +93,7 @@ static gboolean gtk_file_chooser_entry_tab_handler (GtkEventControllerKey *ke #ifdef G_OS_WIN32 static int insert_text_callback (GtkFileChooserEntry *widget, - const gchar *new_text, + const char *new_text, int new_text_length, int *position, gpointer user_data); @@ -184,7 +184,7 @@ _gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class) static gboolean match_func (GtkEntryCompletion *compl, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer user_data) { @@ -375,7 +375,7 @@ has_uri_scheme (const char *str) static GFile * gtk_file_chooser_get_file_for_text (GtkFileChooserEntry *chooser_entry, - const gchar *str) + const char *str) { GFile *file; @@ -732,12 +732,12 @@ refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry) #ifdef G_OS_WIN32 static int insert_text_callback (GtkFileChooserEntry *chooser_entry, - const gchar *new_text, + const char *new_text, int new_text_length, int *position, gpointer user_data) { - const gchar *colon = memchr (new_text, ':', new_text_length); + const char *colon = memchr (new_text, ':', new_text_length); int i; /* Disallow these characters altogether */ @@ -884,7 +884,7 @@ _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry) * Returns: the entered filename - this value is owned by the * chooser entry and must not be modified or freed. **/ -const gchar * +const char * _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry) { const char *last_slash, *text; @@ -994,7 +994,7 @@ _gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry, void _gtk_file_chooser_entry_select_filename (GtkFileChooserEntry *chooser_entry) { - const gchar *str, *ext; + const char *str, *ext; glong len = -1; if (chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SAVE) diff --git a/gtk/gtkfilechooserentry.h b/gtk/gtkfilechooserentry.h index e1ed9f7304..6ee277f8f7 100644 --- a/gtk/gtkfilechooserentry.h +++ b/gtk/gtkfilechooserentry.h @@ -38,7 +38,7 @@ GtkFileChooserAction _gtk_file_chooser_entry_get_action (GtkFileChooserEnt void _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry, GFile *folder); GFile * _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry); -const gchar * _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry); +const char * _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry); gboolean _gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry, GFile *file); void _gtk_file_chooser_entry_select_filename (GtkFileChooserEntry *chooser_entry); diff --git a/gtk/gtkfilechoosernative.c b/gtk/gtkfilechoosernative.c index 8f9e98b9a7..7e050da9d7 100644 --- a/gtk/gtkfilechoosernative.c +++ b/gtk/gtkfilechoosernative.c @@ -527,11 +527,11 @@ gtk_file_chooser_native_init (GtkFileChooserNative *self) * Returns: a new #GtkFileChooserNative **/ GtkFileChooserNative * -gtk_file_chooser_native_new (const gchar *title, +gtk_file_chooser_native_new (const char *title, GtkWindow *parent, GtkFileChooserAction action, - const gchar *accept_label, - const gchar *cancel_label) + const char *accept_label, + const char *cancel_label) { GtkFileChooserNative *result; @@ -651,7 +651,7 @@ gtk_file_chooser_native_select_file (GtkFileChooser *chooser, static void gtk_file_chooser_native_set_current_name (GtkFileChooser *chooser, - const gchar *name) + const char *name) { GtkFileChooserNative *self = GTK_FILE_CHOOSER_NATIVE (chooser); diff --git a/gtk/gtkfilechoosernative.h b/gtk/gtkfilechoosernative.h index b85fbbc936..7a779cb946 100644 --- a/gtk/gtkfilechoosernative.h +++ b/gtk/gtkfilechoosernative.h @@ -34,11 +34,11 @@ GDK_AVAILABLE_IN_ALL G_DECLARE_FINAL_TYPE (GtkFileChooserNative, gtk_file_chooser_native, GTK, FILE_CHOOSER_NATIVE, GtkNativeDialog) GDK_AVAILABLE_IN_ALL -GtkFileChooserNative *gtk_file_chooser_native_new (const gchar *title, +GtkFileChooserNative *gtk_file_chooser_native_new (const char *title, GtkWindow *parent, GtkFileChooserAction action, - const gchar *accept_label, - const gchar *cancel_label); + const char *accept_label, + const char *cancel_label); GDK_AVAILABLE_IN_ALL const char *gtk_file_chooser_native_get_accept_label (GtkFileChooserNative *self); diff --git a/gtk/gtkfilechoosernativeportal.c b/gtk/gtkfilechoosernativeportal.c index e06d8678fb..858186428a 100644 --- a/gtk/gtkfilechoosernativeportal.c +++ b/gtk/gtkfilechoosernativeportal.c @@ -87,10 +87,10 @@ filechooser_portal_data_free (FilechooserPortalData *data) static void response_cb (GDBusConnection *connection, - const gchar *sender_name, - const gchar *object_path, - const gchar *interface_name, - const gchar *signal_name, + const char *sender_name, + const char *object_path, + const char *interface_name, + const char *signal_name, GVariant *parameters, gpointer user_data) { @@ -382,7 +382,7 @@ show_portal_file_chooser (GtkFileChooserNative *self, g_variant_new_string (GTK_FILE_CHOOSER_NATIVE (self)->current_name)); if (self->current_folder) { - gchar *path; + char *path; path = g_file_get_path (GTK_FILE_CHOOSER_NATIVE (self)->current_folder); g_variant_builder_add (&opt_builder, "{sv}", "current_folder", @@ -391,7 +391,7 @@ show_portal_file_chooser (GtkFileChooserNative *self, } if (self->current_file) { - gchar *path; + char *path; path = g_file_get_path (GTK_FILE_CHOOSER_NATIVE (self)->current_file); g_variant_builder_add (&opt_builder, "{sv}", "current_file", diff --git a/gtk/gtkfilechoosernativequartz.c b/gtk/gtkfilechoosernativequartz.c index fe24b2dcac..21360e5486 100644 --- a/gtk/gtkfilechoosernativequartz.c +++ b/gtk/gtkfilechoosernativequartz.c @@ -159,7 +159,7 @@ chooser_set_current_folder (FileChooserQuartzData *data, if (folder != NULL) { - gchar *uri; + char *uri; uri = g_file_get_uri (folder); [data->panel setDirectoryURL:[NSURL URLWithString:[NSString stringWithUTF8String:uri]]]; @@ -169,7 +169,7 @@ chooser_set_current_folder (FileChooserQuartzData *data, static void chooser_set_current_name (FileChooserQuartzData *data, - const gchar *name) + const char *name) { if (name != NULL) @@ -274,7 +274,7 @@ filechooser_quartz_launch (FileChooserQuartzData *data) if (data->current_file) { GFile *folder; - gchar *name; + char *name; folder = g_file_get_parent (data->current_file); name = g_file_get_basename (data->current_file); @@ -392,11 +392,11 @@ filechooser_quartz_launch (FileChooserQuartzData *data) return TRUE; } -static gchar * -strip_mnemonic (const gchar *s) +static char * +strip_mnemonic (const char *s) { - gchar *escaped; - gchar *ret = NULL; + char *escaped; + char *ret = NULL; if (s == NULL) return NULL; diff --git a/gtk/gtkfilechoosernativewin32.c b/gtk/gtkfilechoosernativewin32.c index bd1ebb6c5b..d4f6c10ef1 100644 --- a/gtk/gtkfilechoosernativewin32.c +++ b/gtk/gtkfilechoosernativewin32.c @@ -644,7 +644,7 @@ filechooser_win32_thread (gpointer _data) { gunichar2 *label = g_utf8_to_utf16 (choice->label, -1, NULL, NULL, NULL); DWORD sub_id = 0; - gchar **option; + char **option; IFileDialogCustomize_StartVisualGroup (pfdc, dialog_auxiliary_id++, label); hr = IFileDialogCustomize_AddComboBox (pfdc, dialog_control_id); diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index 2e96ff66e9..3042fb029b 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -62,8 +62,8 @@ struct _GtkFileChooserIface GError **error); GFile * (*get_current_folder) (GtkFileChooser *chooser); void (*set_current_name) (GtkFileChooser *chooser, - const gchar *name); - gchar * (*get_current_name) (GtkFileChooser *chooser); + const char *name); + char * (*get_current_name) (GtkFileChooser *chooser); gboolean (*select_file) (GtkFileChooser *chooser, GFile *file, GError **error); diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c index d51e6f4051..de3ffa15d5 100644 --- a/gtk/gtkfilechooserutils.c +++ b/gtk/gtkfilechooserutils.c @@ -29,8 +29,8 @@ static gboolean delegate_set_current_folder (GtkFileChooser *choose GError **error); static GFile * delegate_get_current_folder (GtkFileChooser *chooser); static void delegate_set_current_name (GtkFileChooser *chooser, - const gchar *name); -static gchar * delegate_get_current_name (GtkFileChooser *chooser); + const char *name); +static char * delegate_get_current_name (GtkFileChooser *chooser); static gboolean delegate_select_file (GtkFileChooser *chooser, GFile *file, GError **error); @@ -270,12 +270,12 @@ delegate_get_current_folder (GtkFileChooser *chooser) static void delegate_set_current_name (GtkFileChooser *chooser, - const gchar *name) + const char *name) { gtk_file_chooser_set_current_name (get_delegate (chooser), name); } -static gchar * +static char * delegate_get_current_name (GtkFileChooser *chooser) { return gtk_file_chooser_get_current_name (get_delegate (chooser)); @@ -321,11 +321,11 @@ _gtk_file_chooser_get_settings_for_widget (GtkWidget *widget) return settings; } -gchar * +char * _gtk_file_chooser_label_for_file (GFile *file) { - const gchar *path, *start, *end, *p; - gchar *uri, *host, *label; + const char *path, *start, *end, *p; + char *uri, *host, *label; uri = g_file_get_uri (file); @@ -453,7 +453,7 @@ _gtk_file_info_get_icon (GFileInfo *info, { GIcon *icon; GdkPixbuf *pixbuf; - const gchar *thumbnail_path; + const char *thumbnail_path; thumbnail_path = g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH); diff --git a/gtk/gtkfilechooserutils.h b/gtk/gtkfilechooserutils.h index 43041e2885..46625b6c86 100644 --- a/gtk/gtkfilechooserutils.h +++ b/gtk/gtkfilechooserutils.h @@ -47,7 +47,7 @@ GQuark _gtk_file_chooser_delegate_get_quark (void) G_GNUC_CONST; GSettings *_gtk_file_chooser_get_settings_for_widget (GtkWidget *widget); -gchar * _gtk_file_chooser_label_for_file (GFile *file); +char * _gtk_file_chooser_label_for_file (GFile *file); gboolean _gtk_file_info_consider_as_directory (GFileInfo *info); gboolean _gtk_file_has_native_path (GFile *file); diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index a70938cf47..e0c817f820 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -416,8 +416,8 @@ static gboolean gtk_file_chooser_widget_update_current_folder (GtkF GError **error); static GFile * gtk_file_chooser_widget_get_current_folder (GtkFileChooser *chooser); static void gtk_file_chooser_widget_set_current_name (GtkFileChooser *chooser, - const gchar *name); -static gchar * gtk_file_chooser_widget_get_current_name (GtkFileChooser *chooser); + const char *name); +static char * gtk_file_chooser_widget_get_current_name (GtkFileChooser *chooser); static gboolean gtk_file_chooser_widget_select_file (GtkFileChooser *chooser, GFile *file, GError **error); @@ -456,7 +456,7 @@ static const char *gtk_file_chooser_widget_get_choice (GtkFileChooser *choos static void add_selection_to_recent_list (GtkFileChooserWidget *impl); static void location_popup_handler (GtkFileChooserWidget *impl, - const gchar *path); + const char *path); static void location_popup_on_paste_handler (GtkFileChooserWidget *impl); static void location_toggle_popup_handler (GtkFileChooserWidget *impl); static void up_folder_handler (GtkFileChooserWidget *impl); @@ -883,7 +883,7 @@ name_exists_get_info_cb (GObject *source, static void check_valid_child_name (GtkFileChooserWidget *impl, GFile *parent, - const gchar *name, + const char *name, gboolean is_folder, GFile *original, GtkWidget *error_stack, @@ -974,7 +974,7 @@ new_folder_create_clicked (GtkButton *button, { GError *error = NULL; GFile *file; - const gchar *name; + const char *name; name = gtk_editable_get_text (GTK_EDITABLE (impl->new_folder_name_entry)); file = g_file_get_child_for_display_name (impl->current_folder, name, &error); @@ -1314,7 +1314,7 @@ rename_file_rename_clicked (GtkButton *button, GtkFileChooserWidget *impl) { GFile *dest; - const gchar* new_name; + const char * new_name; gtk_popover_popdown (GTK_POPOVER (impl->rename_file_popover)); @@ -1356,7 +1356,7 @@ rename_selected_cb (GtkTreeModel *model, { GtkFileChooserWidget *impl = data; GdkRectangle rect; - gchar *filename; + char *filename; double x, y; gtk_tree_model_get (model, iter, @@ -1459,7 +1459,7 @@ open_folder_cb (GSimpleAction *action, if (files && GTK_IS_WINDOW (toplevel)) { GFile *file = files->data; - gchar *uri; + char *uri; uri = g_file_get_uri (file); gtk_show_uri (GTK_WINDOW (toplevel), uri, GDK_CURRENT_TIME); @@ -2104,7 +2104,7 @@ file_list_query_tooltip_cb (GtkWidget *widget, GtkTreePath *path; GtkTreeIter iter; GFile *file; - gchar *filename; + char *filename; if (impl->operation_mode == OPERATION_MODE_BROWSE) return FALSE; @@ -2562,7 +2562,7 @@ set_extra_widget (GtkFileChooserWidget *impl, static void switch_to_home_dir (GtkFileChooserWidget *impl) { - const gchar *home = g_get_home_dir (); + const char *home = g_get_home_dir (); GFile *home_file; if (home == NULL) @@ -2865,14 +2865,14 @@ update_appearance (GtkFileChooserWidget *impl) gtk_widget_queue_draw (impl->browse_files_tree_view); } -static gchar * +static char * gtk_file_chooser_widget_get_subtitle (GtkFileChooserWidget *impl) { - gchar *subtitle = NULL; + char *subtitle = NULL; if (impl->operation_mode == OPERATION_MODE_SEARCH) { - gchar *location; + char *location; location = gtk_places_sidebar_get_location_title (GTK_PLACES_SIDEBAR (impl->places_sidebar)); if (location) @@ -3758,7 +3758,7 @@ set_busy_cursor (GtkFileChooserWidget *impl, static void update_columns (GtkFileChooserWidget *impl, gboolean location_visible, - const gchar *time_title) + const char *time_title) { gboolean need_resize = FALSE; @@ -4138,13 +4138,13 @@ stop_loading_and_clear_list_model (GtkFileChooserWidget *impl, } /* Replace 'target' with 'replacement' in the input string. */ -static gchar * -string_replace (const gchar *input, - const gchar *target, - const gchar *replacement) +static char * +string_replace (const char *input, + const char *target, + const char *replacement) { - gchar **pieces; - gchar *output; + char **pieces; + char *output; pieces = g_strsplit (input, target, -1); output = g_strjoinv (replacement, pieces); @@ -4154,11 +4154,11 @@ string_replace (const gchar *input, } static void -replace_ratio (gchar **str) +replace_ratio (char **str) { if (g_get_charset (NULL)) { - gchar *ret; + char *ret; ret = string_replace (*str, ":", "\xE2\x80\x8E∶"); g_free (*str); *str = ret; @@ -4171,8 +4171,8 @@ my_g_format_date_for_display (GtkFileChooserWidget *impl, { GDateTime *now, *time; GDateTime *now_date, *date; - const gchar *format; - gchar *date_str; + const char *format; + char *date_str; int days_ago; time = g_date_time_new_from_unix_local (secs); @@ -4231,8 +4231,8 @@ my_g_format_time_for_display (GtkFileChooserWidget *impl, glong secs) { GDateTime *time; - const gchar *format; - gchar *date_str; + const char *format; + char *date_str; time = g_date_time_new_from_unix_local (secs); @@ -4252,7 +4252,7 @@ my_g_format_time_for_display (GtkFileChooserWidget *impl, static void copy_attribute (GFileInfo *to, GFileInfo *from, - const gchar *attribute) + const char *attribute) { GFileAttributeType type; gpointer value; @@ -4547,7 +4547,7 @@ file_system_model_set (GtkFileSystemModel *model, { GFile *home_location; GFile *dir_location; - gchar *location; + char *location; home_location = g_file_new_for_path (g_get_home_dir ()); if (file) @@ -4575,7 +4575,7 @@ file_system_model_set (GtkFileSystemModel *model, location = g_strdup (_("Home")); else if (g_file_has_prefix (dir_location, home_location)) { - gchar *relative_path; + char *relative_path; relative_path = g_file_get_relative_path (home_location, dir_location); location = g_filename_display_name (relative_path); @@ -4653,10 +4653,10 @@ struct update_chooser_entry_selected_foreach_closure { }; static int -compare_utf8_filenames (const gchar *a, - const gchar *b) +compare_utf8_filenames (const char *a, + const char *b) { - gchar *a_folded, *b_folded; + char *a_folded, *b_folded; int retval; a_folded = g_utf8_strdown (a, -1); @@ -4802,7 +4802,7 @@ update_chooser_entry (GtkFileChooserWidget *impl) */ if (entry_text[len - 1] == G_DIR_SEPARATOR) { - gchar *tmp; + char *tmp; tmp = g_strndup (entry_text, len - 1); clear_entry = (compare_utf8_filenames (impl->browse_files_last_selected_name, tmp) == 0); @@ -5085,7 +5085,7 @@ gtk_file_chooser_widget_get_current_folder (GtkFileChooser *chooser) static void gtk_file_chooser_widget_set_current_name (GtkFileChooser *chooser, - const gchar *name) + const char *name) { GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (chooser); @@ -5095,7 +5095,7 @@ gtk_file_chooser_widget_set_current_name (GtkFileChooser *chooser, gtk_editable_set_text (GTK_EDITABLE (impl->location_entry), name); } -static gchar * +static char * gtk_file_chooser_widget_get_current_name (GtkFileChooser *chooser) { GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (chooser); @@ -5669,7 +5669,7 @@ get_selected_file_info_from_file_list (GtkFileChooserWidget *impl, /* Gets the display name of the selected file in the file list; assumes single * selection mode and that something is selected. */ -static const gchar * +static const char * get_display_name_from_file_list (GtkFileChooserWidget *impl) { GFileInfo *info; @@ -5684,7 +5684,7 @@ get_display_name_from_file_list (GtkFileChooserWidget *impl) static void add_custom_button_to_dialog (GtkDialog *dialog, - const gchar *mnemonic_label, + const char *mnemonic_label, int response_id) { GtkWidget *button; @@ -5726,8 +5726,8 @@ on_confirm_overwrite_response (GtkWidget *dialog, /* Presents an overwrite confirmation dialog */ static void confirm_dialog_should_accept_filename (GtkFileChooserWidget *impl, - const gchar *file_part, - const gchar *folder_display_name) + const char *file_part, + const char *folder_display_name) { GtkWindow *toplevel; GtkWidget *dialog; @@ -5762,7 +5762,7 @@ confirm_dialog_should_accept_filename (GtkFileChooserWidget *impl, struct GetDisplayNameData { GtkFileChooserWidget *impl; - gchar *file_part; + char *file_part; }; static void @@ -5798,7 +5798,7 @@ out: */ static gboolean should_respond_after_confirm_overwrite (GtkFileChooserWidget *impl, - const gchar *file_part, + const char *file_part, GFile *parent_file) { struct GetDisplayNameData *data; @@ -6503,7 +6503,7 @@ search_engine_finished_cb (GtkSearchEngine *engine, static void search_engine_error_cb (GtkSearchEngine *engine, - const gchar *message, + const char *message, gpointer data) { GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (data); @@ -6598,7 +6598,7 @@ show_spinner (gpointer data) /* Creates a new query with the specified text and launches it */ static void search_start_query (GtkFileChooserWidget *impl, - const gchar *query_text) + const char *query_text) { GFile *file; @@ -6696,7 +6696,7 @@ search_setup_widgets (GtkFileChooserWidget *impl) /* if there already is a query, restart it */ if (impl->search_query) { - const gchar *query; + const char *query; query = gtk_query_get_text (impl->search_query); if (query) @@ -7056,7 +7056,7 @@ update_cell_renderer_attributes (GtkFileChooserWidget *impl) static void location_set_user_text (GtkFileChooserWidget *impl, - const gchar *path) + const char *path) { gtk_editable_set_text (GTK_EDITABLE (impl->location_entry), path); gtk_editable_set_position (GTK_EDITABLE (impl->location_entry), -1); @@ -7064,7 +7064,7 @@ location_set_user_text (GtkFileChooserWidget *impl, static void location_popup_handler (GtkFileChooserWidget *impl, - const gchar *path) + const char *path) { if (impl->operation_mode != OPERATION_MODE_BROWSE) { @@ -7189,7 +7189,7 @@ static void add_normal_and_shifted_binding (GtkWidgetClass *widget_class, guint keyval, GdkModifierType modifiers, - const gchar *signal_name) + const char *signal_name) { gtk_widget_class_add_binding_signal (widget_class, keyval, modifiers, diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index cf6121eaca..9cd3bde6ad 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -666,7 +666,7 @@ NSArray * _gtk_file_filter_get_as_pattern_nsstrings (GtkFileFilter *filter) { pattern = g_string_erase (pattern, 0, 1); } - gchar *pattern_c = g_string_free (pattern, FALSE); + char *pattern_c = g_string_free (pattern, FALSE); NSString *pattern_nsstring = [NSString stringWithUTF8String:pattern_c]; g_free (pattern_c); [pattern_nsstring retain]; @@ -682,7 +682,7 @@ NSArray * _gtk_file_filter_get_as_pattern_nsstrings (GtkFileFilter *filter) for (l = formats; l; l = l->next) { int i; - gchar **extensions; + char **extensions; extensions = gdk_pixbuf_format_get_extensions (l->data); diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index 51121fcba3..51799ceac4 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -238,7 +238,7 @@ static void remove_file (GtkFileSystemModel *model, #define get_node(_model, _index) ((FileModelNode *) ((_model)->files->data + (_index) * (_model)->node_size)) /* Get an index within the model->files array of nodes, given a FileModelNode* */ -#define node_index(_model, _node) (((gchar *) (_node) - (_model)->files->data) / (_model)->node_size) +#define node_index(_model, _node) (((char *) (_node) - (_model)->files->data) / (_model)->node_size) /* @up_to_index: smallest model->files array index that will be valid after this call * @up_to_row: smallest node->row that will be valid after this call @@ -1301,7 +1301,7 @@ gtk_file_system_model_set_n_columns (GtkFileSystemModel *model, static void gtk_file_system_model_set_directory (GtkFileSystemModel *model, GFile * dir, - const gchar * attributes) + const char * attributes) { g_assert (G_IS_FILE (dir)); @@ -1387,7 +1387,7 @@ _gtk_file_system_model_new (GtkFileSystemModelGetValue get_func, **/ GtkFileSystemModel * _gtk_file_system_model_new_for_directory (GFile * dir, - const gchar * attributes, + const char * attributes, GtkFileSystemModelGetValue get_func, gpointer get_data, guint n_columns, diff --git a/gtk/gtkfilesystemmodel.h b/gtk/gtkfilesystemmodel.h index 4a8bff468e..d33d30035d 100644 --- a/gtk/gtkfilesystemmodel.h +++ b/gtk/gtkfilesystemmodel.h @@ -45,7 +45,7 @@ GtkFileSystemModel *_gtk_file_system_model_new (GtkFileSystemModelG guint n_columns, ...); GtkFileSystemModel *_gtk_file_system_model_new_for_directory(GFile * dir, - const gchar * attributes, + const char * attributes, GtkFileSystemModelGetValue get_func, gpointer get_data, guint n_columns, diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c index 68973717e8..120a4a357e 100644 --- a/gtk/gtkfixed.c +++ b/gtk/gtkfixed.c @@ -174,7 +174,7 @@ static void gtk_fixed_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_fixed_put (GTK_FIXED (buildable), GTK_WIDGET (child), 0, 0); diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c index 9a2315372a..75df8e2a0f 100644 --- a/gtk/gtkflowbox.c +++ b/gtk/gtkflowbox.c @@ -308,7 +308,7 @@ static void gtk_flow_box_child_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_flow_box_child_set_child (GTK_FLOW_BOX_CHILD (buildable), GTK_WIDGET (child)); @@ -3991,7 +3991,7 @@ static void gtk_flow_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_flow_box_insert (GTK_FLOW_BOX (buildable), GTK_WIDGET (child), -1); diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index 11ee713591..f7002bef7c 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -68,8 +68,8 @@ struct _GtkFontButton { GtkWidget parent_instance; - gchar *title; - gchar *fontname; + char *title; + char *fontname; guint use_font : 1; guint use_size : 1; @@ -89,7 +89,7 @@ struct _GtkFontButton int font_size; char *font_features; PangoLanguage *language; - gchar *preview_text; + char *preview_text; GtkFontFilterFunc font_filter; gpointer font_filter_data; GDestroyNotify font_filter_data_destroy; @@ -219,7 +219,7 @@ gtk_font_button_update_font_data (GtkFontButton *font_button) PangoFontFamily **families; PangoFontFace **faces; int n_families, n_faces, i; - const gchar *family; + const char *family; g_assert (font_button->font_desc != NULL); @@ -237,7 +237,7 @@ gtk_font_button_update_font_data (GtkFontButton *font_button) faces = NULL; for (i = 0; i < n_families; i++) { - const gchar *name = pango_font_family_get_name (families[i]); + const char *name = pango_font_family_get_name (families[i]); if (!g_ascii_strcasecmp (name, family)) { @@ -267,7 +267,7 @@ gtk_font_button_update_font_data (GtkFontButton *font_button) g_free (faces); } -static gchar * +static char * gtk_font_button_get_preview_text (GtkFontButton *font_button) { if (font_button->font_dialog) @@ -278,7 +278,7 @@ gtk_font_button_get_preview_text (GtkFontButton *font_button) static void gtk_font_button_set_preview_text (GtkFontButton *font_button, - const gchar *preview_text) + const char *preview_text) { if (font_button->font_dialog) { @@ -721,7 +721,7 @@ gtk_font_button_new (void) * Returns: a new font picker widget. */ GtkWidget * -gtk_font_button_new_with_font (const gchar *fontname) +gtk_font_button_new_with_font (const char *fontname) { return g_object_new (GTK_TYPE_FONT_BUTTON, "font", fontname, NULL); } @@ -735,9 +735,9 @@ gtk_font_button_new_with_font (const gchar *fontname) */ void gtk_font_button_set_title (GtkFontButton *font_button, - const gchar *title) + const char *title) { - gchar *old_title; + char *old_title; g_return_if_fail (GTK_IS_FONT_BUTTON (font_button)); old_title = font_button->title; @@ -758,7 +758,7 @@ gtk_font_button_set_title (GtkFontButton *font_button, * * Returns: an internal copy of the title string which must not be freed. */ -const gchar* +const char * gtk_font_button_get_title (GtkFontButton *font_button) { g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL); @@ -888,7 +888,7 @@ gtk_font_button_set_use_size (GtkFontButton *font_button, } } -static const gchar * +static const char * gtk_font_button_get_font_name (GtkFontButton *font_button) { g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL); @@ -898,7 +898,7 @@ gtk_font_button_get_font_name (GtkFontButton *font_button) static void gtk_font_button_set_font_name (GtkFontButton *font_button, - const gchar *fontname) + const char *fontname) { PangoFontDescription *font_desc; @@ -1095,7 +1095,7 @@ skip: } } -static gchar * +static char * pango_font_description_to_css (PangoFontDescription *desc, const char *features, const char *language) @@ -1257,7 +1257,7 @@ gtk_font_button_label_use_font (GtkFontButton *font_button) else { PangoFontDescription *desc; - gchar *data; + char *data; if (!font_button->provider) { @@ -1285,9 +1285,9 @@ gtk_font_button_label_use_font (GtkFontButton *font_button) static void gtk_font_button_update_font_info (GtkFontButton *font_button) { - const gchar *fam_name; - const gchar *face_name; - gchar *family_style; + const char *fam_name; + const char *face_name; + char *family_style; if (font_button->font_family) fam_name = pango_font_family_get_name (font_button->font_family); @@ -1309,7 +1309,7 @@ gtk_font_button_update_font_info (GtkFontButton *font_button) if ((font_button->level & GTK_FONT_CHOOSER_LEVEL_SIZE) != 0) { /* mirror Pango, which doesn't translate this either */ - gchar *size = g_strdup_printf ("%2.4g%s", + char *size = g_strdup_printf ("%2.4g%s", pango_font_description_get_size (font_button->font_desc) / (double)PANGO_SCALE, pango_font_description_get_size_is_absolute (font_button->font_desc) ? "px" : ""); diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h index 8cb7bf008d..3079981dee 100644 --- a/gtk/gtkfontbutton.h +++ b/gtk/gtkfontbutton.h @@ -46,13 +46,13 @@ GType gtk_font_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GtkWidget *gtk_font_button_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_font_button_new_with_font (const gchar *fontname); +GtkWidget *gtk_font_button_new_with_font (const char *fontname); GDK_AVAILABLE_IN_ALL -const gchar * gtk_font_button_get_title (GtkFontButton *font_button); +const char * gtk_font_button_get_title (GtkFontButton *font_button); GDK_AVAILABLE_IN_ALL void gtk_font_button_set_title (GtkFontButton *font_button, - const gchar *title); + const char *title); GDK_AVAILABLE_IN_ALL gboolean gtk_font_button_get_modal (GtkFontButton *font_button); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c index 7fdf041395..4cf14236d8 100644 --- a/gtk/gtkfontchooser.c +++ b/gtk/gtkfontchooser.c @@ -249,10 +249,10 @@ gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser) * of the current font, or %NULL if no font is selected. You must * free this string with g_free(). */ -gchar * +char * gtk_font_chooser_get_font (GtkFontChooser *fontchooser) { - gchar *fontname; + char *fontname; g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL); @@ -271,7 +271,7 @@ gtk_font_chooser_get_font (GtkFontChooser *fontchooser) */ void gtk_font_chooser_set_font (GtkFontChooser *fontchooser, - const gchar *fontname) + const char *fontname) { g_return_if_fail (GTK_IS_FONT_CHOOSER (fontchooser)); g_return_if_fail (fontname != NULL); @@ -335,7 +335,7 @@ gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser, * Returns: (transfer full): the text displayed in the * preview area */ -gchar * +char * gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser) { char *text; @@ -357,7 +357,7 @@ gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser) */ void gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser, - const gchar *text) + const char *text) { g_return_if_fail (GTK_IS_FONT_CHOOSER (fontchooser)); g_return_if_fail (text != NULL); @@ -429,7 +429,7 @@ gtk_font_chooser_set_filter_func (GtkFontChooser *fontchooser, void _gtk_font_chooser_font_activated (GtkFontChooser *chooser, - const gchar *fontname) + const char *fontname) { g_return_if_fail (GTK_IS_FONT_CHOOSER (chooser)); diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h index 96c9825927..323c3e9f96 100644 --- a/gtk/gtkfontchooser.h +++ b/gtk/gtkfontchooser.h @@ -90,7 +90,7 @@ struct _GtkFontChooserIface /* Signals */ void (* font_activated) (GtkFontChooser *chooser, - const gchar *fontname); + const char *fontname); /* More methods */ void (* set_font_map) (GtkFontChooser *fontchooser, @@ -119,16 +119,16 @@ void gtk_font_chooser_set_font_desc (GtkFontChooser const PangoFontDescription *font_desc); GDK_AVAILABLE_IN_ALL -gchar* gtk_font_chooser_get_font (GtkFontChooser *fontchooser); +char * gtk_font_chooser_get_font (GtkFontChooser *fontchooser); GDK_AVAILABLE_IN_ALL void gtk_font_chooser_set_font (GtkFontChooser *fontchooser, - const gchar *fontname); + const char *fontname); GDK_AVAILABLE_IN_ALL -gchar* gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser); +char * gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser); GDK_AVAILABLE_IN_ALL void gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL gboolean gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c index 9083806f89..b31fd4059e 100644 --- a/gtk/gtkfontchooserdialog.c +++ b/gtk/gtkfontchooserdialog.c @@ -77,7 +77,7 @@ struct _GtkFontChooserDialogClass static void gtk_font_chooser_dialog_buildable_interface_init (GtkBuildableIface *iface); static GObject *gtk_font_chooser_dialog_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); G_DEFINE_TYPE_WITH_CODE (GtkFontChooserDialog, gtk_font_chooser_dialog, GTK_TYPE_DIALOG, G_IMPLEMENT_INTERFACE (GTK_TYPE_FONT_CHOOSER, @@ -121,7 +121,7 @@ gtk_font_chooser_dialog_get_property (GObject *object, static void font_activated_cb (GtkFontChooser *fontchooser, - const gchar *fontname, + const char *fontname, gpointer user_data) { GtkDialog *dialog = user_data; @@ -287,7 +287,7 @@ gtk_font_chooser_dialog_init (GtkFontChooserDialog *dialog) * Returns: a new #GtkFontChooserDialog */ GtkWidget* -gtk_font_chooser_dialog_new (const gchar *title, +gtk_font_chooser_dialog_new (const char *title, GtkWindow *parent) { GtkFontChooserDialog *dialog; @@ -310,7 +310,7 @@ gtk_font_chooser_dialog_buildable_interface_init (GtkBuildableIface *iface) static GObject * gtk_font_chooser_dialog_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname) + const char *childname) { GtkFontChooserDialog *dialog = GTK_FONT_CHOOSER_DIALOG (buildable); diff --git a/gtk/gtkfontchooserdialog.h b/gtk/gtkfontchooserdialog.h index 4452dbd068..e63a3135a3 100644 --- a/gtk/gtkfontchooserdialog.h +++ b/gtk/gtkfontchooserdialog.h @@ -35,7 +35,7 @@ typedef struct _GtkFontChooserDialog GtkFontChooserDialog; GDK_AVAILABLE_IN_ALL GType gtk_font_chooser_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_font_chooser_dialog_new (const gchar *title, +GtkWidget* gtk_font_chooser_dialog_new (const char *title, GtkWindow *parent); G_END_DECLS diff --git a/gtk/gtkfontchooserprivate.h b/gtk/gtkfontchooserprivate.h index 82a1f7e67e..480351ead2 100644 --- a/gtk/gtkfontchooserprivate.h +++ b/gtk/gtkfontchooserprivate.h @@ -28,7 +28,7 @@ G_BEGIN_DECLS void _gtk_font_chooser_font_activated (GtkFontChooser *chooser, - const gchar *fontname); + const char *fontname); G_END_DECLS diff --git a/gtk/gtkfontchooserutils.c b/gtk/gtkfontchooserutils.c index 84079d276d..2d484a2b06 100644 --- a/gtk/gtkfontchooserutils.c +++ b/gtk/gtkfontchooserutils.c @@ -91,7 +91,7 @@ delegate_notify (GObject *object, static void delegate_font_activated (GtkFontChooser *receiver, - const gchar *fontname, + const char *fontname, GtkFontChooser *delegate) { _gtk_font_chooser_font_activated (delegate, fontname); diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index 69f0771660..f255849f77 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -107,7 +107,7 @@ struct _GtkFontChooserWidget GtkWidget *preview; GtkWidget *preview2; GtkWidget *font_name_label; - gchar *preview_text; + char *preview_text; gboolean show_preview_entry; GtkWidget *size_label; @@ -160,9 +160,9 @@ static void gtk_font_chooser_widget_get_property (GObject *objec GParamSpec *pspec); static void gtk_font_chooser_widget_finalize (GObject *object); -static gchar *gtk_font_chooser_widget_get_font (GtkFontChooserWidget *fontchooser); +static char *gtk_font_chooser_widget_get_font (GtkFontChooserWidget *fontchooser); static void gtk_font_chooser_widget_set_font (GtkFontChooserWidget *fontchooser, - const gchar *fontname); + const char *fontname); static PangoFontDescription *gtk_font_chooser_widget_get_font_desc (GtkFontChooserWidget *fontchooser); static void gtk_font_chooser_widget_merge_font_desc(GtkFontChooserWidget *fontchooser, @@ -171,9 +171,9 @@ static void gtk_font_chooser_widget_take_font_desc (GtkFontChoo PangoFontDescription *font_desc); -static const gchar *gtk_font_chooser_widget_get_preview_text (GtkFontChooserWidget *fontchooser); +static const char *gtk_font_chooser_widget_get_preview_text (GtkFontChooserWidget *fontchooser); static void gtk_font_chooser_widget_set_preview_text (GtkFontChooserWidget *fontchooser, - const gchar *text); + const char *text); static gboolean gtk_font_chooser_widget_get_show_preview_entry (GtkFontChooserWidget *fontchooser); static void gtk_font_chooser_widget_set_show_preview_entry (GtkFontChooserWidget *fontchooser, @@ -309,7 +309,7 @@ output_cb (GtkSpinButton *spin, gpointer data) { GtkAdjustment *adjustment; - gchar *text; + char *text; gdouble value; adjustment = gtk_spin_button_get_adjustment (spin); @@ -412,7 +412,7 @@ row_activated_cb (GtkWidget *view, gpointer user_data) { GtkFontChooserWidget *fontchooser = user_data; - gchar *fontname; + char *fontname; fontname = gtk_font_chooser_widget_get_font (fontchooser); _gtk_font_chooser_font_activated (GTK_FONT_CHOOSER (fontchooser), fontname); @@ -967,7 +967,7 @@ gtk_font_chooser_widget_get_size (GtkFontChooser *chooser) return -1; } -static gchar * +static char * gtk_font_chooser_widget_get_font (GtkFontChooserWidget *fontchooser) { PangoFontDescription *desc = gtk_font_chooser_widget_get_font_desc (fontchooser); @@ -989,7 +989,7 @@ gtk_font_chooser_widget_get_font_desc (GtkFontChooserWidget *self) static void gtk_font_chooser_widget_set_font (GtkFontChooserWidget *fontchooser, - const gchar *fontname) + const char *fontname) { PangoFontDescription *font_desc; @@ -1871,7 +1871,7 @@ gtk_font_chooser_widget_take_font_desc (GtkFontChooserWidget *fontchooser, pango_font_description_free (font_desc); } -static const gchar* +static const char * gtk_font_chooser_widget_get_preview_text (GtkFontChooserWidget *fontchooser) { @@ -1880,7 +1880,7 @@ gtk_font_chooser_widget_get_preview_text (GtkFontChooserWidget *fontchooser) static void gtk_font_chooser_widget_set_preview_text (GtkFontChooserWidget *fontchooser, - const gchar *text) + const char *text) { g_free (fontchooser->preview_text); fontchooser->preview_text = g_strdup (text); diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index 89ee7d55c6..5b5246b522 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -125,7 +125,7 @@ static void gtk_frame_buildable_init (GtkBuildableIface *iface); static void gtk_frame_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); static void gtk_frame_measure (GtkWidget *widget, GtkOrientation orientation, int for_size, @@ -212,7 +212,7 @@ static void gtk_frame_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (type && strcmp (type, "label") == 0) gtk_frame_set_label_widget (GTK_FRAME (buildable), GTK_WIDGET (child)); @@ -313,7 +313,7 @@ gtk_frame_get_property (GObject *object, * Returns: a new #GtkFrame widget **/ GtkWidget* -gtk_frame_new (const gchar *label) +gtk_frame_new (const char *label) { return g_object_new (GTK_TYPE_FRAME, "label", label, NULL); } @@ -328,7 +328,7 @@ gtk_frame_new (const gchar *label) **/ void gtk_frame_set_label (GtkFrame *frame, - const gchar *label) + const char *label) { g_return_if_fail (GTK_IS_FRAME (frame)); @@ -352,7 +352,7 @@ gtk_frame_set_label (GtkFrame *frame, * a #GtkLabel. This string is owned by GTK+ and * must not be modified or freed. **/ -const gchar * +const char * gtk_frame_get_label (GtkFrame *frame) { GtkFramePrivate *priv = gtk_frame_get_instance_private (frame); diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h index a6a2f91ec4..08523a2d33 100644 --- a/gtk/gtkframe.h +++ b/gtk/gtkframe.h @@ -74,13 +74,13 @@ struct _GtkFrameClass GDK_AVAILABLE_IN_ALL GType gtk_frame_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_frame_new (const gchar *label); +GtkWidget* gtk_frame_new (const char *label); GDK_AVAILABLE_IN_ALL void gtk_frame_set_label (GtkFrame *frame, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL -const gchar * gtk_frame_get_label (GtkFrame *frame); +const char * gtk_frame_get_label (GtkFrame *frame); GDK_AVAILABLE_IN_ALL void gtk_frame_set_label_widget (GtkFrame *frame, diff --git a/gtk/gtkgladecatalog.c b/gtk/gtkgladecatalog.c index c104562b33..a44a120767 100644 --- a/gtk/gtkgladecatalog.c +++ b/gtk/gtkgladecatalog.c @@ -34,14 +34,14 @@ #endif _GDK_EXTERN -void gtk_glade_catalog_init (const gchar *catalog_name); +void gtk_glade_catalog_init (const char *catalog_name); /* This function is referred to in gtk/glade/gtk-private-widgets.xml * and is used to ensure the private types for use in Glade while * editing UI files that define GTK’s various composite widget classes. */ void -gtk_glade_catalog_init (const gchar *catalog_name) +gtk_glade_catalog_init (const char *catalog_name) { g_type_ensure (GTK_TYPE_PATH_BAR); g_type_ensure (GTK_TYPE_PLACES_VIEW); diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index a9cda6bfb5..d1a951ab15 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -405,7 +405,7 @@ static void gtk_grid_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) { diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c index fa00f9a00b..6ea8031658 100644 --- a/gtk/gtkheaderbar.c +++ b/gtk/gtkheaderbar.c @@ -132,7 +132,7 @@ struct _GtkHeaderBarPrivate GtkWidget *title_widget; gboolean show_title_buttons; - gchar *decoration_layout; + char *decoration_layout; gboolean track_default_decoration; GtkWidget *start_window_controls; @@ -245,7 +245,7 @@ update_title (GtkHeaderBar *bar) { GtkHeaderBarPrivate *priv = gtk_header_bar_get_instance_private (bar); GtkRoot *root; - const gchar *title = NULL; + const char *title = NULL; if (!priv->title_label) return; @@ -656,7 +656,7 @@ static void gtk_header_bar_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (g_strcmp0 (type, "title") == 0) gtk_header_bar_set_title_widget (GTK_HEADER_BAR (buildable), GTK_WIDGET (child)); @@ -803,7 +803,7 @@ gtk_header_bar_set_show_title_buttons (GtkHeaderBar *bar, */ void gtk_header_bar_set_decoration_layout (GtkHeaderBar *bar, - const gchar *layout) + const char *layout) { GtkHeaderBarPrivate *priv; @@ -826,7 +826,7 @@ gtk_header_bar_set_decoration_layout (GtkHeaderBar *bar, * * Returns: the decoration layout */ -const gchar * +const char * gtk_header_bar_get_decoration_layout (GtkHeaderBar *bar) { GtkHeaderBarPrivate *priv; diff --git a/gtk/gtkheaderbar.h b/gtk/gtkheaderbar.h index d993b6304c..a5c85dc48d 100644 --- a/gtk/gtkheaderbar.h +++ b/gtk/gtkheaderbar.h @@ -63,9 +63,9 @@ void gtk_header_bar_set_show_title_buttons (GtkHeaderBar *bar, GDK_AVAILABLE_IN_ALL void gtk_header_bar_set_decoration_layout (GtkHeaderBar *bar, - const gchar *layout); + const char *layout); GDK_AVAILABLE_IN_ALL -const gchar *gtk_header_bar_get_decoration_layout (GtkHeaderBar *bar); +const char *gtk_header_bar_get_decoration_layout (GtkHeaderBar *bar); G_END_DECLS diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 60bd57b9bc..61c1b7bb0f 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -47,7 +47,7 @@ struct _GtkIconCache { int ref_count; GMappedFile *map; - gchar *buffer; + char *buffer; guint32 last_chain_offset; }; @@ -75,12 +75,12 @@ gtk_icon_cache_unref (GtkIconCache *cache) } GtkIconCache * -gtk_icon_cache_new_for_path (const gchar *path) +gtk_icon_cache_new_for_path (const char *path) { GtkIconCache *cache = NULL; GMappedFile *map; - gchar *cache_filename; + char *cache_filename; GStatBuf st; GStatBuf path_st; @@ -141,21 +141,21 @@ gtk_icon_cache_new_for_path (const gchar *path) } GtkIconCache * -gtk_icon_cache_new (const gchar *data) +gtk_icon_cache_new (const char *data) { GtkIconCache *cache; cache = g_new0 (GtkIconCache, 1); cache->ref_count = 1; cache->map = NULL; - cache->buffer = (gchar *)data; + cache->buffer = (char *)data; return cache; } static int get_directory_index (GtkIconCache *cache, - const gchar *directory) + const char *directory) { guint32 dir_list_offset; int n_dirs; @@ -168,7 +168,7 @@ get_directory_index (GtkIconCache *cache, for (i = 0; i < n_dirs; i++) { guint32 name_offset = GET_UINT32 (cache->buffer, dir_list_offset + 4 + 4 * i); - gchar *name = cache->buffer + name_offset; + char *name = cache->buffer + name_offset; if (strcmp (name, directory) == 0) return i; } @@ -178,7 +178,7 @@ get_directory_index (GtkIconCache *cache, GHashTable * gtk_icon_cache_list_icons_in_directory (GtkIconCache *cache, - const gchar *directory, + const char *directory, GtkStringSet *set) { int directory_index; diff --git a/gtk/gtkiconcacheprivate.h b/gtk/gtkiconcacheprivate.h index dcb03e9b0d..d27d94f04c 100644 --- a/gtk/gtkiconcacheprivate.h +++ b/gtk/gtkiconcacheprivate.h @@ -38,10 +38,10 @@ typedef enum typedef struct _GtkIconCache GtkIconCache; -GtkIconCache *gtk_icon_cache_new (const gchar *data); -GtkIconCache *gtk_icon_cache_new_for_path (const gchar *path); +GtkIconCache *gtk_icon_cache_new (const char *data); +GtkIconCache *gtk_icon_cache_new_for_path (const char *path); GHashTable *gtk_icon_cache_list_icons_in_directory (GtkIconCache *cache, - const gchar *directory, + const char *directory, GtkStringSet *set); GtkIconCache *gtk_icon_cache_ref (GtkIconCache *cache); void gtk_icon_cache_unref (GtkIconCache *cache); diff --git a/gtk/gtkiconcachevalidatorprivate.h b/gtk/gtkiconcachevalidatorprivate.h index c074b11391..a255426bd3 100644 --- a/gtk/gtkiconcachevalidatorprivate.h +++ b/gtk/gtkiconcachevalidatorprivate.h @@ -28,7 +28,7 @@ enum { }; typedef struct { - const gchar *cache; + const char *cache; gsize cache_size; guint32 n_directories; int flags; diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index 597a1f0a25..e66b1a8f96 100644 --- a/gtk/gtkiconhelper.c +++ b/gtk/gtkiconhelper.c @@ -478,7 +478,7 @@ _gtk_icon_helper_set_gicon (GtkIconHelper *self, void _gtk_icon_helper_set_icon_name (GtkIconHelper *self, - const gchar *icon_name) + const char *icon_name) { gtk_icon_helper_take_definition (self, gtk_image_definition_new_icon_name (icon_name)); } @@ -552,7 +552,7 @@ _gtk_icon_helper_peek_paintable (GtkIconHelper *self) return gtk_image_definition_get_paintable (self->def); } -const gchar * +const char * _gtk_icon_helper_get_icon_name (GtkIconHelper *self) { return gtk_image_definition_get_icon_name (self->def); diff --git a/gtk/gtkiconhelperprivate.h b/gtk/gtkiconhelperprivate.h index eea4351337..80b2e4acce 100644 --- a/gtk/gtkiconhelperprivate.h +++ b/gtk/gtkiconhelperprivate.h @@ -45,7 +45,7 @@ void _gtk_icon_helper_set_gicon (GtkIconHelper *self, GIcon *gicon); void _gtk_icon_helper_set_icon_name (GtkIconHelper *self, - const gchar *icon_name); + const char *icon_name); void _gtk_icon_helper_set_paintable (GtkIconHelper *self, GdkPaintable *paintable); @@ -62,7 +62,7 @@ GIcon *_gtk_icon_helper_peek_gicon (GtkIconHelper *self); GdkPaintable *_gtk_icon_helper_peek_paintable (GtkIconHelper *self); GtkImageDefinition *gtk_icon_helper_get_definition (GtkIconHelper *self); -const gchar *_gtk_icon_helper_get_icon_name (GtkIconHelper *self); +const char *_gtk_icon_helper_get_icon_name (GtkIconHelper *self); int gtk_icon_helper_get_size (GtkIconHelper *self); diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 39d193785f..2ce6dbe76f 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -348,7 +348,7 @@ struct _GtkIconThemeClass }; typedef struct { - gchar **icon_names; + char **icon_names; int size; int scale; GtkIconLookupFlags flags; @@ -378,8 +378,8 @@ struct _GtkIconPaintable IconKey key; GtkIconTheme *in_cache; /* Protected by icon_cache lock */ - gchar *icon_name; - gchar *filename; + char *icon_name; + char *filename; GLoadableIcon *loadable; #ifdef G_OS_WIN32 @@ -408,9 +408,9 @@ struct _GtkIconPaintable typedef struct { - gchar *name; - gchar *display_name; - gchar *comment; + char *name; + char *display_name; + char *comment; GArray *dir_sizes; /* IconThemeDirSize */ GArray *dirs; /* IconThemeDir */ @@ -445,14 +445,14 @@ typedef struct typedef struct { - gchar *svg_filename; - gchar *no_svg_filename; + char *svg_filename; + char *no_svg_filename; gboolean is_resource; } UnthemedIcon; typedef struct { - gchar *dir; + char *dir; time_t mtime; GtkIconCache *cache; gboolean exists; @@ -466,23 +466,23 @@ static void theme_dir_size_destroy (IconThemeDirSize *dir static void theme_dir_destroy (IconThemeDir *dir); static void theme_destroy (IconTheme *theme); static GtkIconPaintable *theme_lookup_icon (IconTheme *theme, - const gchar *icon_name, + const char *icon_name, int size, int scale, gboolean allow_svg); static gboolean theme_has_icon (IconTheme *theme, - const gchar *icon_name); + const char *icon_name); static void theme_subdir_load (GtkIconTheme *self, IconTheme *theme, GKeyFile *theme_file, - gchar *subdir); + char *subdir); static void do_theme_change (GtkIconTheme *self); static void blow_themes (GtkIconTheme *self); static gboolean rescan_themes (GtkIconTheme *self); static GtkIconPaintable *icon_paintable_new (const char *icon_name, int desired_size, int desired_scale); -static IconCacheFlag suffix_from_name (const gchar *name); +static IconCacheFlag suffix_from_name (const char *name); static void icon_ensure_texture__locked (GtkIconPaintable *icon, gboolean in_thread); static void gtk_icon_theme_unset_display (GtkIconTheme *self); @@ -1105,7 +1105,7 @@ update_current_theme__mainthread (GtkIconTheme *self) if (!self->custom_theme) { - gchar *theme = NULL; + char *theme = NULL; gboolean changed = FALSE; if (self->display) @@ -1225,8 +1225,8 @@ pixbuf_supports_svg (void) found_svg = FALSE; for (tmp_list = formats; tmp_list && !found_svg; tmp_list = tmp_list->next) { - gchar **mime_types = gdk_pixbuf_format_get_mime_types (tmp_list->data); - gchar **mime_type; + char **mime_types = gdk_pixbuf_format_get_mime_types (tmp_list->data); + char **mime_type; for (mime_type = mime_types; *mime_type && !found_svg; mime_type++) { @@ -1254,7 +1254,7 @@ free_dir_mtime (IconThemeDirMtime *dir_mtime) static void gtk_icon_theme_init (GtkIconTheme *self) { - const gchar * const *xdg_data_dirs; + const char * const *xdg_data_dirs; int i, j; int len; @@ -1708,7 +1708,7 @@ gtk_icon_theme_get_theme_name (GtkIconTheme *self) return theme_name; } -static const gchar builtin_hicolor_index[] = +static const char builtin_hicolor_index[] = "[Icon Theme]\n" "Name=Hicolor\n" "Hidden=True\n" @@ -1743,15 +1743,15 @@ static const gchar builtin_hicolor_index[] = static void insert_theme (GtkIconTheme *self, - const gchar *theme_name) + const char *theme_name) { int i; GList *l; - gchar **dirs; - gchar **scaled_dirs; - gchar **themes; + char **dirs; + char **scaled_dirs; + char **themes; IconTheme *theme = NULL; - gchar *path; + char *path; GKeyFile *theme_file; GError *error = NULL; GStatBuf stat_buf; @@ -1867,7 +1867,7 @@ free_unthemed_icon (UnthemedIcon *unthemed_icon) static void strip_suffix_inline (char *filename) { - gchar *dot; + char *dot; if (g_str_has_suffix (filename, ".symbolic.png")) filename[strlen(filename)-13] = 0; @@ -1878,10 +1878,10 @@ strip_suffix_inline (char *filename) *dot = 0; } -static gchar * -strip_suffix (const gchar *filename) +static char * +strip_suffix (const char *filename) { - const gchar *dot; + const char *dot; if (g_str_has_suffix (filename, ".symbolic.png")) return g_strndup (filename, strlen(filename)-13); @@ -1896,13 +1896,13 @@ strip_suffix (const gchar *filename) static void add_unthemed_icon (GtkIconTheme *self, - const gchar *dir, - const gchar *file, + const char *dir, + const char *file, gboolean is_resource) { IconCacheFlag new_suffix, old_suffix; - gchar *abs_file; - gchar *base_name; + char *abs_file; + char *base_name; UnthemedIcon *unthemed_icon; new_suffix = suffix_from_name (file); @@ -1964,8 +1964,8 @@ load_themes (GtkIconTheme *self) { GDir *gdir; int base; - gchar *dir; - const gchar *file; + char *dir; + const char *file; GTimeVal tv; GStatBuf stat_buf; int j; @@ -2013,7 +2013,7 @@ load_themes (GtkIconTheme *self) for (j = 0; self->resource_path[j]; j++) { - gchar **children; + char **children; int i; dir = self->resource_path[j]; @@ -2092,7 +2092,7 @@ ensure_valid_themes (GtkIconTheme *self, } static inline gboolean -icon_name_is_symbolic (const gchar *icon_name, +icon_name_is_symbolic (const char *icon_name, int icon_name_len) { @@ -2116,7 +2116,7 @@ icon_name_is_symbolic (const gchar *icon_name, } static inline gboolean -icon_uri_is_symbolic (const gchar *icon_name, +icon_uri_is_symbolic (const char *icon_name, int icon_name_len) { if (icon_name_len < 0) @@ -2141,7 +2141,7 @@ icon_uri_is_symbolic (const gchar *icon_name, static GtkIconPaintable * real_choose_icon (GtkIconTheme *self, - const gchar *icon_names[], + const char *icon_names[], int size, int scale, GtkIconLookupFlags flags, @@ -2150,7 +2150,7 @@ real_choose_icon (GtkIconTheme *self, GList *l; GtkIconPaintable *icon = NULL; UnthemedIcon *unthemed_icon = NULL; - const gchar *icon_name = NULL; + const char *icon_name = NULL; IconTheme *theme = NULL; int i; IconKey key; @@ -2158,7 +2158,7 @@ real_choose_icon (GtkIconTheme *self, if (!ensure_valid_themes (self, non_blocking)) return NULL; - key.icon_names = (gchar **)icon_names; + key.icon_names = (char **)icon_names; key.size = size; key.scale = scale; key.flags = flags; @@ -2239,7 +2239,7 @@ real_choose_icon (GtkIconTheme *self, #ifdef G_OS_WIN32 /* Still not found an icon, check if reference to a Win32 resource */ { - gchar **resources; + char **resources; HICON hIcon = NULL; resources = g_strsplit (icon_names[0], ",", 0); @@ -2285,8 +2285,8 @@ real_choose_icon (GtkIconTheme *self, static void icon_name_list_add_icon (GtkStrvBuilder *icons, - const gchar *dir_suffix, - gchar *icon_name) + const char *dir_suffix, + char *icon_name) { if (dir_suffix) gtk_strv_builder_append (icons, g_strconcat (icon_name, dir_suffix, NULL)); @@ -2295,7 +2295,7 @@ icon_name_list_add_icon (GtkStrvBuilder *icons, static GtkIconPaintable * choose_icon (GtkIconTheme *self, - const gchar *icon_names[], + const char *icon_names[], int size, int scale, GtkTextDirection direction, @@ -2305,7 +2305,7 @@ choose_icon (GtkIconTheme *self, gboolean has_regular = FALSE, has_symbolic = FALSE; GtkIconPaintable *icon; GtkStrvBuilder new_names; - const gchar *dir_suffix; + const char *dir_suffix; guint i; switch (direction) @@ -2490,7 +2490,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme *self, } else { - const gchar *names[2]; + const char *names[2]; names[0] = icon_name; names[1] = NULL; @@ -2577,7 +2577,7 @@ gtk_icon_theme_lookup_symbolic_colors (GtkCssStyle *style, */ gboolean gtk_icon_theme_has_icon (GtkIconTheme *self, - const gchar *icon_name) + const char *icon_name) { GList *l; gboolean res = FALSE; @@ -2633,7 +2633,7 @@ add_size (gpointer key, */ int * gtk_icon_theme_get_icon_sizes (GtkIconTheme *self, - const gchar *icon_name) + const char *icon_name) { GList *l; int i; @@ -2877,7 +2877,7 @@ theme_dir_size_difference (IconThemeDirSize *dir_size, } } -static const gchar * +static const char * string_from_suffix (IconCacheFlag suffix) { switch (suffix) @@ -2899,7 +2899,7 @@ string_from_suffix (IconCacheFlag suffix) } static inline IconCacheFlag -suffix_from_name (const gchar *name) +suffix_from_name (const char *name) { const gsize name_len = strlen (name); @@ -3007,7 +3007,7 @@ compare_dir_size_matches (IconThemeDirSize *dir_a, int difference_a, static GtkIconPaintable * theme_lookup_icon (IconTheme *theme, - const gchar *icon_name, /* interned */ + const char *icon_name, /* interned */ int size, int scale, gboolean allow_svg) @@ -3067,7 +3067,7 @@ theme_lookup_icon (IconTheme *theme, { GtkIconPaintable *icon; IconThemeDir *dir = &g_array_index (theme->dirs, IconThemeDir, min_file->dir_index); - gchar *filename; + char *filename; icon = icon_paintable_new (icon_name, size, scale); @@ -3086,7 +3086,7 @@ theme_lookup_icon (IconTheme *theme, static gboolean theme_has_icon (IconTheme *theme, - const gchar *icon_name) + const char *icon_name) { return gtk_string_set_lookup (&theme->icons, icon_name) != NULL; } @@ -3097,7 +3097,7 @@ scan_directory (GtkIconTheme *self, GtkStringSet *set) { GDir *gdir; - const gchar *name; + const char *name; GHashTable *icons = NULL; GTK_DISPLAY_NOTE (self->display, ICONTHEME, @@ -3293,9 +3293,9 @@ static void theme_subdir_load (GtkIconTheme *self, IconTheme *theme, GKeyFile *theme_file, - gchar *subdir) + char *subdir) { - gchar *type_string; + char *type_string; IconThemeDirType type; int size; int min_size; @@ -3356,7 +3356,7 @@ theme_subdir_load (GtkIconTheme *self, for (i = 0; i < self->dir_mtimes->len; i++) { IconThemeDirMtime *dir_mtime = &g_array_index (self->dir_mtimes, IconThemeDirMtime, i); - gchar *full_dir; + char *full_dir; if (!dir_mtime->exists) continue; /* directory doesn't exist */ @@ -3399,7 +3399,7 @@ theme_subdir_load (GtkIconTheme *self, for (r = 0; self->resource_path[r]; r++) { GHashTable *icons; - gchar *full_dir; + char *full_dir; /* Force a trailing / here, to avoid extra copies in GResource */ full_dir = g_build_filename (self->resource_path[r], subdir, " ", NULL); @@ -3656,7 +3656,7 @@ gtk_icon_paintable_get_file (GtkIconPaintable *icon) * Returns: (nullable) (type filename): the themed icon-name for the icon, or %NULL * if its not a themed icon. */ -const gchar * +const char * gtk_icon_paintable_get_icon_name (GtkIconPaintable *icon) { g_return_val_if_fail (icon != NULL, NULL); @@ -4029,7 +4029,7 @@ gtk_icon_paintable_new_for_file (GFile *file, if (icon->is_resource) { - gchar *uri; + char *uri; uri = g_file_get_uri (file); icon->filename = g_strdup (uri + 11); /* resource:// */ @@ -4121,9 +4121,9 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme *self, } else if (G_IS_THEMED_ICON (gicon)) { - const gchar **names; + const char **names; - names = (const gchar **) g_themed_icon_get_names (G_THEMED_ICON (gicon)); + names = (const char **) g_themed_icon_get_names (G_THEMED_ICON (gicon)); icon = gtk_icon_theme_lookup_icon (self, names[0], &names[1], size, scale, direction, flags); } else diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h index 3150230e00..a423e03571 100644 --- a/gtk/gtkicontheme.h +++ b/gtk/gtkicontheme.h @@ -112,10 +112,10 @@ char * gtk_icon_theme_get_theme_name (GtkIconTheme GDK_AVAILABLE_IN_ALL gboolean gtk_icon_theme_has_icon (GtkIconTheme *self, - const gchar *icon_name); + const char *icon_name); GDK_AVAILABLE_IN_ALL int *gtk_icon_theme_get_icon_sizes (GtkIconTheme *self, - const gchar *icon_name); + const char *icon_name); GDK_AVAILABLE_IN_ALL GtkIconPaintable *gtk_icon_theme_lookup_icon (GtkIconTheme *self, const char *icon_name, @@ -144,7 +144,7 @@ GType gtk_icon_paintable_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GFile * gtk_icon_paintable_get_file (GtkIconPaintable *self); GDK_AVAILABLE_IN_ALL -const gchar * gtk_icon_paintable_get_icon_name (GtkIconPaintable *self); +const char * gtk_icon_paintable_get_icon_name (GtkIconPaintable *self); GDK_AVAILABLE_IN_ALL gboolean gtk_icon_paintable_is_symbolic (GtkIconPaintable *self); diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 12c789719f..279629a8d7 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -263,7 +263,7 @@ static void gtk_icon_view_add_editable (GtkCel GtkCellRenderer *renderer, GtkCellEditable *editable, GdkRectangle *cell_area, - const gchar *path, + const char *path, GtkIconView *icon_view); static void gtk_icon_view_remove_editable (GtkCellArea *area, GtkCellRenderer *renderer, @@ -308,13 +308,13 @@ static void gtk_icon_view_buildable_init (GtkBuildableIface *if static gboolean gtk_icon_view_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); @@ -893,7 +893,7 @@ static void gtk_icon_view_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_CELL_RENDERER (child)) _gtk_cell_layout_buildable_add_child (buildable, builder, child, type); @@ -1941,7 +1941,7 @@ gtk_icon_view_add_editable (GtkCellArea *area, GtkCellRenderer *renderer, GtkCellEditable *editable, GdkRectangle *cell_area, - const gchar *path, + const char *path, GtkIconView *icon_view) { GtkIconViewChild *child; @@ -4385,7 +4385,7 @@ gtk_icon_view_set_tooltip_query_cb (GtkWidget *widget, GtkTooltip *tooltip, gpointer data) { - gchar *str; + char *str; GtkTreeIter iter; GtkTreePath *path; GtkTreeModel *model; @@ -5721,7 +5721,7 @@ get_dest_row (GdkDrop *drop) static gboolean check_model_dnd (GtkTreeModel *model, GType required_iface, - const gchar *signal) + const char *signal) { if (model == NULL || !G_TYPE_CHECK_INSTANCE_TYPE ((model), required_iface)) { @@ -6746,7 +6746,7 @@ static gboolean gtk_icon_view_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -6762,7 +6762,7 @@ static void gtk_icon_view_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index f4866cf3ba..2534bb933d 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -398,7 +398,7 @@ gtk_image_get_property (GObject *object, * Returns: a new #GtkImage **/ GtkWidget* -gtk_image_new_from_file (const gchar *filename) +gtk_image_new_from_file (const char *filename) { GtkImage *image; @@ -429,7 +429,7 @@ gtk_image_new_from_file (const gchar *filename) * Returns: a new #GtkImage **/ GtkWidget* -gtk_image_new_from_resource (const gchar *resource_path) +gtk_image_new_from_resource (const char *resource_path) { GtkImage *image; @@ -512,7 +512,7 @@ gtk_image_new_from_paintable (GdkPaintable *paintable) * Returns: a new #GtkImage displaying the themed icon **/ GtkWidget* -gtk_image_new_from_icon_name (const gchar *icon_name) +gtk_image_new_from_icon_name (const char *icon_name) { GtkImage *image; @@ -580,8 +580,8 @@ on_loader_size_prepared (GdkPixbufLoader *loader, static GdkPixbufAnimation * load_scalable_with_loader (GtkImage *image, - const gchar *file_path, - const gchar *resource_path, + const char *file_path, + const char *resource_path, int *scale_factor_out) { GdkPixbufLoader *loader; @@ -649,7 +649,7 @@ load_scalable_with_loader (GtkImage *image, **/ void gtk_image_set_from_file (GtkImage *image, - const gchar *filename) + const char *filename) { GdkPixbufAnimation *anim; int scale_factor; @@ -697,7 +697,7 @@ gtk_image_set_from_file (GtkImage *image, #endif static gboolean -resource_is_pixdata (const gchar *resource_path) +resource_is_pixdata (const char *resource_path) { const guint8 *stream; guint32 magic; @@ -731,7 +731,7 @@ out: **/ void gtk_image_set_from_resource (GtkImage *image, - const gchar *resource_path) + const char *resource_path) { GdkPixbufAnimation *animation; int scale_factor = 1; @@ -828,7 +828,7 @@ gtk_image_set_from_pixbuf (GtkImage *image, **/ void gtk_image_set_from_icon_name (GtkImage *image, - const gchar *icon_name) + const char *icon_name) { g_return_if_fail (GTK_IS_IMAGE (image)); @@ -994,7 +994,7 @@ gtk_image_get_paintable (GtkImage *image) * * Returns: (transfer none) (allow-none): the icon name, or %NULL **/ -const gchar * +const char * gtk_image_get_icon_name (GtkImage *image) { g_return_val_if_fail (GTK_IS_IMAGE (image), NULL); diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 4f4e38aa31..8fc26a5e47 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -74,15 +74,15 @@ GType gtk_image_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GtkWidget* gtk_image_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_file (const gchar *filename); +GtkWidget* gtk_image_new_from_file (const char *filename); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_resource (const gchar *resource_path); +GtkWidget* gtk_image_new_from_resource (const char *resource_path); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_image_new_from_paintable (GdkPaintable *paintable); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_image_new_from_icon_name (const gchar *icon_name); +GtkWidget* gtk_image_new_from_icon_name (const char *icon_name); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_image_new_from_gicon (GIcon *icon); @@ -90,10 +90,10 @@ GDK_AVAILABLE_IN_ALL void gtk_image_clear (GtkImage *image); GDK_AVAILABLE_IN_ALL void gtk_image_set_from_file (GtkImage *image, - const gchar *filename); + const char *filename); GDK_AVAILABLE_IN_ALL void gtk_image_set_from_resource (GtkImage *image, - const gchar *resource_path); + const char *resource_path); GDK_AVAILABLE_IN_ALL void gtk_image_set_from_pixbuf (GtkImage *image, GdkPixbuf *pixbuf); @@ -102,7 +102,7 @@ void gtk_image_set_from_paintable (GtkImage *image, GdkPaintable *paintable); GDK_AVAILABLE_IN_ALL void gtk_image_set_from_icon_name (GtkImage *image, - const gchar *icon_name); + const char *icon_name); GDK_AVAILABLE_IN_ALL void gtk_image_set_from_gicon (GtkImage *image, GIcon *icon); diff --git a/gtk/gtkimagedefinition.c b/gtk/gtkimagedefinition.c index 80f9c68f2f..1b7c9e51d9 100644 --- a/gtk/gtkimagedefinition.c +++ b/gtk/gtkimagedefinition.c @@ -186,7 +186,7 @@ gtk_image_definition_get_scale (const GtkImageDefinition *def) } } -const gchar * +const char * gtk_image_definition_get_icon_name (const GtkImageDefinition *def) { if (def->type != GTK_IMAGE_ICON_NAME) diff --git a/gtk/gtkimagedefinitionprivate.h b/gtk/gtkimagedefinitionprivate.h index 6471901f1a..b66d6c0cd4 100644 --- a/gtk/gtkimagedefinitionprivate.h +++ b/gtk/gtkimagedefinitionprivate.h @@ -35,7 +35,7 @@ void gtk_image_definition_unref (GtkImageDefinit GtkImageType gtk_image_definition_get_storage_type (const GtkImageDefinition *def); int gtk_image_definition_get_scale (const GtkImageDefinition *def); -const gchar * gtk_image_definition_get_icon_name (const GtkImageDefinition *def); +const char * gtk_image_definition_get_icon_name (const GtkImageDefinition *def); GIcon * gtk_image_definition_get_gicon (const GtkImageDefinition *def); GdkPaintable * gtk_image_definition_get_paintable (const GtkImageDefinition *def); diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c index a7b419435b..00ff8f33df 100644 --- a/gtk/gtkimcontext.c +++ b/gtk/gtkimcontext.c @@ -85,7 +85,7 @@ * provided input method. * * |[<!-- language="C" --> - * GtkIMContext * im_module_create(const gchar *context_id); + * GtkIMContext * im_module_create(const char *context_id); * ]| * This function should return a pointer to a newly created instance of the * #GtkIMContext subclass identified by @context_id. The context ID is the same @@ -123,13 +123,13 @@ struct _GtkIMContextPrivate { }; static void gtk_im_context_real_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos); static gboolean gtk_im_context_real_filter_keypress (GtkIMContext *context, GdkEvent *event); static gboolean gtk_im_context_real_get_surrounding (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index); static void gtk_im_context_real_set_surrounding (GtkIMContext *context, const char *text, @@ -358,7 +358,7 @@ gtk_im_context_init (GtkIMContext *im_context) static void gtk_im_context_real_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos) { @@ -379,13 +379,13 @@ gtk_im_context_real_filter_keypress (GtkIMContext *context, typedef struct { - gchar *text; + char *text; int cursor_index; } SurroundingInfo; static void gtk_im_context_real_set_surrounding (GtkIMContext *context, - const gchar *text, + const char *text, int len, int cursor_index) { @@ -402,7 +402,7 @@ gtk_im_context_real_set_surrounding (GtkIMContext *context, static gboolean gtk_im_context_real_get_surrounding (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index) { gboolean result; @@ -484,7 +484,7 @@ gtk_im_context_set_client_widget (GtkIMContext *context, **/ void gtk_im_context_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos) { @@ -742,7 +742,7 @@ gtk_im_context_set_use_preedit (GtkIMContext *context, **/ void gtk_im_context_set_surrounding (GtkIMContext *context, - const gchar *text, + const char *text, int len, int cursor_index) { @@ -791,11 +791,11 @@ gtk_im_context_set_surrounding (GtkIMContext *context, **/ gboolean gtk_im_context_get_surrounding (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index) { GtkIMContextClass *klass; - gchar *local_text = NULL; + char *local_text = NULL; int local_index; gboolean result = FALSE; diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h index 23c00f9809..17419eb180 100644 --- a/gtk/gtkimcontext.h +++ b/gtk/gtkimcontext.h @@ -54,7 +54,7 @@ struct _GtkIMContextClass void (*preedit_start) (GtkIMContext *context); void (*preedit_end) (GtkIMContext *context); void (*preedit_changed) (GtkIMContext *context); - void (*commit) (GtkIMContext *context, const gchar *str); + void (*commit) (GtkIMContext *context, const char *str); gboolean (*retrieve_surrounding) (GtkIMContext *context); gboolean (*delete_surrounding) (GtkIMContext *context, int offset, @@ -64,7 +64,7 @@ struct _GtkIMContextClass void (*set_client_widget) (GtkIMContext *context, GtkWidget *widget); void (*get_preedit_string) (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos); gboolean (*filter_keypress) (GtkIMContext *context, @@ -77,11 +77,11 @@ struct _GtkIMContextClass void (*set_use_preedit) (GtkIMContext *context, gboolean use_preedit); void (*set_surrounding) (GtkIMContext *context, - const gchar *text, + const char *text, int len, int cursor_index); gboolean (*get_surrounding) (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index); /*< private >*/ /* Padding for future expansion */ @@ -101,7 +101,7 @@ void gtk_im_context_set_client_widget (GtkIMContext *context, GtkWidget *widget); GDK_AVAILABLE_IN_ALL void gtk_im_context_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos); GDK_AVAILABLE_IN_ALL @@ -132,12 +132,12 @@ void gtk_im_context_set_use_preedit (GtkIMContext *context, gboolean use_preedit); GDK_AVAILABLE_IN_ALL void gtk_im_context_set_surrounding (GtkIMContext *context, - const gchar *text, + const char *text, int len, int cursor_index); GDK_AVAILABLE_IN_ALL gboolean gtk_im_context_get_surrounding (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index); GDK_AVAILABLE_IN_ALL gboolean gtk_im_context_delete_surrounding (GtkIMContext *context, diff --git a/gtk/gtkimcontextime.c b/gtk/gtkimcontextime.c index b337e52325..c7de8d66f6 100644 --- a/gtk/gtkimcontextime.c +++ b/gtk/gtkimcontextime.c @@ -101,7 +101,7 @@ static gboolean gtk_im_context_ime_filter_keypress (GtkIMContext *context, GdkEvent *event); static void gtk_im_context_ime_reset (GtkIMContext *context); static void gtk_im_context_ime_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos); static void gtk_im_context_ime_focus_in (GtkIMContext *context); @@ -323,7 +323,7 @@ static void _gtk_im_context_ime_commit_unichar (GtkIMContextIME *context_ime, gunichar c) { - gchar utf8[10]; + char utf8[10]; int len; if (context_ime->priv->dead_key_keyval != 0) @@ -440,10 +440,10 @@ gtk_im_context_ime_reset (GtkIMContext *context) } -static gchar * +static char * get_utf8_preedit_string (GtkIMContextIME *context_ime, int *pos_ret) { - gchar *utf8str = NULL; + char *utf8str = NULL; HWND hwnd; HIMC himc; int pos = 0; @@ -494,7 +494,7 @@ get_utf8_preedit_string (GtkIMContextIME *context_ime, int *pos_ret) { if (utf8str) { - gchar *utf8str_new = g_strdup (utf8str); + char *utf8str_new = g_strdup (utf8str); /* Note: We *don't* want to update context_ime->commit_string here! * Otherwise it will be updated repeatedly, not what we want! @@ -529,7 +529,7 @@ get_utf8_preedit_string (GtkIMContextIME *context_ime, int *pos_ret) static PangoAttrList * -get_pango_attr_list (GtkIMContextIME *context_ime, const gchar *utf8str) +get_pango_attr_list (GtkIMContextIME *context_ime, const char *utf8str) { PangoAttrList *attrs = pango_attr_list_new (); HWND hwnd; @@ -544,7 +544,7 @@ get_pango_attr_list (GtkIMContextIME *context_ime, const gchar *utf8str) if (context_ime->preediting) { - const gchar *schr = utf8str, *echr; + const char *schr = utf8str, *echr; guint8 *buf; guint16 f_red, f_green, f_blue, b_red, b_green, b_blue; glong len, spos = 0, epos, sidx = 0, eidx; @@ -630,11 +630,11 @@ get_pango_attr_list (GtkIMContextIME *context_ime, const gchar *utf8str) static void gtk_im_context_ime_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos) { - gchar *utf8str = NULL; + char *utf8str = NULL; int pos = 0; GtkIMContextIME *context_ime; @@ -864,7 +864,7 @@ gtk_im_context_ime_set_preedit_font (GtkIMContext *context) HWND hwnd; HIMC himc; HKL ime = GetKeyboardLayout (0); - const gchar *lang; + const char *lang; gunichar wc; PangoContext *pango_context; PangoFont *font; diff --git a/gtk/gtkimcontextime.h b/gtk/gtkimcontextime.h index 6091c499b6..8621bc6dfe 100644 --- a/gtk/gtkimcontextime.h +++ b/gtk/gtkimcontextime.h @@ -42,7 +42,7 @@ struct _GtkIMContextIME guint opened : 1; guint focus : 1; GdkRectangle cursor_location; - gchar *commit_string; + char *commit_string; GtkIMContextIMEPrivate *priv; }; diff --git a/gtk/gtkimcontextquartz.c b/gtk/gtkimcontextquartz.c index 4717c1df9d..6f0555582a 100644 --- a/gtk/gtkimcontextquartz.c +++ b/gtk/gtkimcontextquartz.c @@ -38,7 +38,7 @@ typedef struct _GtkIMContextQuartz GtkIMContext parent; GtkIMContext *helper; GdkSurface *client_surface; - gchar *preedit_str; + char *preedit_str; unsigned int cursor_index; unsigned int selected_len; GdkRectangle *cursor_rect; @@ -59,7 +59,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkIMContextQuartz, gtk_im_context_quartz, GTK_TYPE_IM_ static void quartz_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos) { @@ -74,14 +74,14 @@ quartz_get_preedit_string (GtkIMContext *context, { *attrs = pango_attr_list_new (); int len = g_utf8_strlen (*str, -1); - gchar *ch = *str; + char *ch = *str; if (len > 0) { PangoAttribute *attr; int i = 0; for (;;) { - gchar *s = ch; + char *s = ch; ch = g_utf8_next_char (ch); if (i >= qc->cursor_index && @@ -114,7 +114,7 @@ output_result (GtkIMContext *context, { GtkIMContextQuartz *qc = GTK_IM_CONTEXT_QUARTZ (context); gboolean retval = FALSE; - gchar *fixed_str, *marked_str; + char *fixed_str, *marked_str; fixed_str = g_strdup (g_object_get_data (G_OBJECT (surface), TIC_INSERT_TEXT)); marked_str = g_strdup (g_object_get_data (G_OBJECT (surface), TIC_MARKED_TEXT)); @@ -325,7 +325,7 @@ quartz_set_use_preedit (GtkIMContext *context, gboolean use_preedit) } static void -commit_cb (GtkIMContext *context, const gchar *str, GtkIMContextQuartz *qc) +commit_cb (GtkIMContext *context, const char *str, GtkIMContextQuartz *qc) { g_signal_emit_by_name (qc, "commit", str); } diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index c3681715ee..cf5669addd 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -108,7 +108,7 @@ static gboolean gtk_im_context_simple_filter_keypress (GtkIMContext GdkEvent *key); static void gtk_im_context_simple_reset (GtkIMContext *context); static void gtk_im_context_simple_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos); @@ -138,10 +138,10 @@ gtk_im_context_simple_class_init (GtkIMContextSimpleClass *class) init_compose_table_async (NULL, NULL, NULL); } -static gchar* +static char * get_x11_compose_file_dir (void) { - gchar* compose_file_dir; + char * compose_file_dir; #if defined (X11_DATA_PREFIX) compose_file_dir = g_strdup (X11_DATA_PREFIX "/share/X11/locale"); @@ -155,14 +155,14 @@ get_x11_compose_file_dir (void) static void gtk_im_context_simple_init_compose_table (void) { - gchar *path = NULL; - const gchar *home; - const gchar *locale; - gchar **langs = NULL; - gchar **lang = NULL; + char *path = NULL; + const char *home; + const char *locale; + char **langs = NULL; + char **lang = NULL; const char * const sys_langs[] = { "el_gr", "fi_fi", "pt_br", NULL }; const char * const *sys_lang = NULL; - gchar *x11_compose_file_dir = get_x11_compose_file_dir (); + char *x11_compose_file_dir = get_x11_compose_file_dir (); path = g_build_filename (g_get_user_config_dir (), "gtk-4.0", "Compose", NULL); if (g_file_test (path, G_FILE_TEST_EXISTS)) @@ -300,7 +300,7 @@ gtk_im_context_simple_commit_char (GtkIMContext *context, { GtkIMContextSimple *context_simple = GTK_IM_CONTEXT_SIMPLE (context); GtkIMContextSimplePrivate *priv = context_simple->priv; - gchar buf[10]; + char buf[10]; int len; g_return_if_fail (g_unichar_validate (ch)); @@ -540,8 +540,8 @@ static gboolean check_normalize_nfc (gunichar* combination_buffer, int n_compose) { gunichar combination_buffer_temp[GTK_MAX_COMPOSE_LEN]; - gchar *combination_utf8_temp = NULL; - gchar *nfc_temp = NULL; + char *combination_utf8_temp = NULL; + char *nfc_temp = NULL; int n_combinations; gunichar temp_swap; int i; @@ -604,7 +604,7 @@ gtk_check_algorithmically (const guint16 *compose_buffer, { int i; gunichar combination_buffer[GTK_MAX_COMPOSE_LEN]; - gchar *combination_utf8, *nfc; + char *combination_utf8, *nfc; if (output_char) *output_char = 0; @@ -712,8 +712,8 @@ check_hex (GtkIMContextSimple *context_simple, int i; GString *str; gulong n; - gchar *nptr = NULL; - gchar buf[7]; + char *nptr = NULL; + char buf[7]; priv->tentative_match = 0; priv->tentative_match_len = 0; @@ -1214,7 +1214,7 @@ gtk_im_context_simple_reset (GtkIMContext *context) static void gtk_im_context_simple_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos) { @@ -1307,7 +1307,7 @@ gtk_im_context_simple_add_table (GtkIMContextSimple *context_simple, */ void gtk_im_context_simple_add_compose_file (GtkIMContextSimple *context_simple, - const gchar *compose_file) + const char *compose_file) { g_return_if_fail (GTK_IS_IM_CONTEXT_SIMPLE (context_simple)); diff --git a/gtk/gtkimcontextsimple.h b/gtk/gtkimcontextsimple.h index f03e7e56b2..e25cd4d216 100644 --- a/gtk/gtkimcontextsimple.h +++ b/gtk/gtkimcontextsimple.h @@ -71,7 +71,7 @@ void gtk_im_context_simple_add_table (GtkIMContextSimple *context_simpl int n_seqs); GDK_AVAILABLE_IN_ALL void gtk_im_context_simple_add_compose_file (GtkIMContextSimple *context_simple, - const gchar *compose_file); + const char *compose_file); G_END_DECLS diff --git a/gtk/gtkimcontextwayland.c b/gtk/gtkimcontextwayland.c index d9144e30fd..9b0b48898c 100644 --- a/gtk/gtkimcontextwayland.c +++ b/gtk/gtkimcontextwayland.c @@ -55,7 +55,7 @@ struct _GtkIMContextWaylandClass }; struct preedit { - gchar *text; + char *text; int cursor_begin; int cursor_end; }; @@ -75,7 +75,7 @@ struct _GtkIMContextWayland gdouble press_y; struct { - gchar *text; + char *text; int cursor_idx; int anchor_idx; } surrounding; @@ -87,7 +87,7 @@ struct _GtkIMContextWayland struct preedit current_preedit; struct preedit pending_preedit; - gchar *pending_commit; + char *pending_commit; cairo_rectangle_int_t cursor_rect; guint use_preedit : 1; @@ -278,7 +278,7 @@ notify_surrounding_text (GtkIMContextWayland *context) { #define MAX_LEN 4000 GtkIMContextWaylandGlobal *global; - const gchar *start, *end; + const char *start, *end; int len, cursor, anchor; char *str = NULL; @@ -570,7 +570,7 @@ gtk_im_context_wayland_set_client_widget (GtkIMContext *context, static void gtk_im_context_wayland_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos) { @@ -858,7 +858,7 @@ gtk_im_context_wayland_set_use_preedit (GtkIMContext *context, static void gtk_im_context_wayland_set_surrounding (GtkIMContext *context, - const gchar *text, + const char *text, int len, int cursor_index) { @@ -882,7 +882,7 @@ gtk_im_context_wayland_set_surrounding (GtkIMContext *context, static gboolean gtk_im_context_wayland_get_surrounding (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index) { GtkIMContextWayland *context_wayland; diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 3181ee26b7..d3bd886acb 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -81,7 +81,7 @@ * if that could not be created, a newly created GtkIMContextSimple. */ GtkIMContext * -_gtk_im_module_create (const gchar *context_id) +_gtk_im_module_create (const char *context_id) { GIOExtensionPoint *ep; GIOExtension *ext; @@ -141,9 +141,9 @@ match_backend (GdkDisplay *display, return TRUE; } -static const gchar * +static const char * lookup_immodule (GdkDisplay *display, - gchar **immodules_list) + char **immodules_list) { guint i; @@ -180,11 +180,11 @@ lookup_immodule (GdkDisplay *display, * * Returns: the context ID (will never be %NULL) */ -const gchar * +const char * _gtk_im_module_get_default_context_id (GdkDisplay *display) { - const gchar *context_id = NULL; - const gchar *envvar; + const char *context_id = NULL; + const char *envvar; GtkSettings *settings; GIOExtensionPoint *ep; GList *l; diff --git a/gtk/gtkimmoduleprivate.h b/gtk/gtkimmoduleprivate.h index 032a4782db..3619ebaacf 100644 --- a/gtk/gtkimmoduleprivate.h +++ b/gtk/gtkimmoduleprivate.h @@ -26,7 +26,7 @@ G_BEGIN_DECLS void gtk_im_module_ensure_extension_point (void); GtkIMContext * _gtk_im_module_create (const char *context_id); -const gchar * _gtk_im_module_get_default_context_id (GdkDisplay *display); +const char * _gtk_im_module_get_default_context_id (GdkDisplay *display); G_END_DECLS diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index 413737b6d3..75a70c3f0d 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -43,8 +43,8 @@ struct _GtkIMMulticontextPrivate GtkWidget *client_widget; GdkRectangle cursor_location; - gchar *context_id; - gchar *context_id_aux; + char *context_id; + char *context_id_aux; guint use_preedit : 1; guint have_cursor_location : 1; @@ -62,7 +62,7 @@ static void gtk_im_multicontext_set_delegate (GtkIMMulticontext static void gtk_im_multicontext_set_client_widget (GtkIMContext *context, GtkWidget *widget); static void gtk_im_multicontext_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos); static gboolean gtk_im_multicontext_filter_keypress (GtkIMContext *context, @@ -75,7 +75,7 @@ static void gtk_im_multicontext_set_cursor_location (GtkIMContext static void gtk_im_multicontext_set_use_preedit (GtkIMContext *context, gboolean use_preedit); static gboolean gtk_im_multicontext_get_surrounding (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index); static void gtk_im_multicontext_set_surrounding (GtkIMContext *context, const char *text, @@ -89,7 +89,7 @@ static void gtk_im_multicontext_preedit_end_cb (GtkIMContext * static void gtk_im_multicontext_preedit_changed_cb (GtkIMContext *delegate, GtkIMMulticontext *multicontext); static void gtk_im_multicontext_commit_cb (GtkIMContext *delegate, - const gchar *str, + const char *str, GtkIMMulticontext *multicontext); static gboolean gtk_im_multicontext_retrieve_surrounding_cb (GtkIMContext *delegate, GtkIMMulticontext *multicontext); @@ -244,7 +244,7 @@ gtk_im_multicontext_set_delegate (GtkIMMulticontext *multicontext, g_signal_emit_by_name (multicontext, "preedit-changed"); } -static const gchar * +static const char * get_effective_context_id (GtkIMMulticontext *multicontext) { GtkIMMulticontextPrivate *priv = multicontext->priv; @@ -329,7 +329,7 @@ gtk_im_multicontext_set_client_widget (GtkIMContext *context, static void gtk_im_multicontext_get_preedit_string (GtkIMContext *context, - gchar **str, + char **str, PangoAttrList **attrs, int *cursor_pos) { @@ -377,7 +377,7 @@ gtk_im_multicontext_filter_keypress (GtkIMContext *context, if (ch != 0 && !g_unichar_iscntrl (ch)) { int len; - gchar buf[10]; + char buf[10]; len = g_unichar_to_utf8 (ch, buf); buf[len] = '\0'; @@ -461,7 +461,7 @@ gtk_im_multicontext_set_use_preedit (GtkIMContext *context, static gboolean gtk_im_multicontext_get_surrounding (GtkIMContext *context, - gchar **text, + char **text, int *cursor_index) { GtkIMMulticontext *multicontext = GTK_IM_MULTICONTEXT (context); @@ -516,7 +516,7 @@ gtk_im_multicontext_preedit_changed_cb (GtkIMContext *delegate, static void gtk_im_multicontext_commit_cb (GtkIMContext *delegate, - const gchar *str, + const char *str, GtkIMMulticontext *multicontext) { g_signal_emit_by_name (multicontext, "commit", str); diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 2ddaa3e839..db65bd0926 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -191,13 +191,13 @@ static void gtk_info_bar_buildable_interface_init (GtkBuildableIface *ifa static gboolean gtk_info_bar_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_info_bar_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); static void gtk_info_bar_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, @@ -609,7 +609,7 @@ gtk_info_bar_remove_action_widget (GtkInfoBar *info_bar, */ GtkWidget* gtk_info_bar_add_button (GtkInfoBar *info_bar, - const gchar *button_text, + const char *button_text, int response_id) { GtkWidget *button; @@ -629,10 +629,10 @@ gtk_info_bar_add_button (GtkInfoBar *info_bar, static void add_buttons_valist (GtkInfoBar *info_bar, - const gchar *first_button_text, + const char *first_button_text, va_list args) { - const gchar* text; + const char * text; int response_id; g_return_if_fail (GTK_IS_INFO_BAR (info_bar)); @@ -647,7 +647,7 @@ add_buttons_valist (GtkInfoBar *info_bar, { gtk_info_bar_add_button (info_bar, text, response_id); - text = va_arg (args, gchar*); + text = va_arg (args, char *); if (text == NULL) break; @@ -669,7 +669,7 @@ add_buttons_valist (GtkInfoBar *info_bar, */ void gtk_info_bar_add_buttons (GtkInfoBar *info_bar, - const gchar *first_button_text, + const char *first_button_text, ...) { va_list args; @@ -708,7 +708,7 @@ gtk_info_bar_new (void) * Returns: a new #GtkInfoBar */ GtkWidget* -gtk_info_bar_new_with_buttons (const gchar *first_button_text, +gtk_info_bar_new_with_buttons (const char *first_button_text, ...) { GtkInfoBar *info_bar; @@ -829,7 +829,7 @@ gtk_info_bar_response (GtkInfoBar *info_bar, typedef struct { - gchar *name; + char *name; int response_id; int line; int col; @@ -858,9 +858,9 @@ action_widget_info_free (gpointer data) static void parser_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -868,7 +868,7 @@ parser_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "action-widget") == 0) { - const gchar *response; + const char *response; GValue gvalue = G_VALUE_INIT; if (!_gtk_builder_check_parent (data->builder, context, "action-widgets", error)) @@ -913,7 +913,7 @@ parser_start_element (GtkBuildableParseContext *context, static void parser_text_element (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -926,7 +926,7 @@ parser_text_element (GtkBuildableParseContext *context, static void parser_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -958,7 +958,7 @@ gboolean gtk_info_bar_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -988,7 +988,7 @@ static void gtk_info_bar_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { GtkInfoBar *info_bar = GTK_INFO_BAR (buildable); diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h index 528a1250de..999625227c 100644 --- a/gtk/gtkinfobar.h +++ b/gtk/gtkinfobar.h @@ -50,7 +50,7 @@ GDK_AVAILABLE_IN_ALL GtkWidget *gtk_info_bar_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_info_bar_new_with_buttons (const gchar *first_button_text, +GtkWidget *gtk_info_bar_new_with_buttons (const char *first_button_text, ...); GDK_AVAILABLE_IN_ALL @@ -62,11 +62,11 @@ void gtk_info_bar_remove_action_widget (GtkInfoBar *info_bar, GtkWidget *widget); GDK_AVAILABLE_IN_ALL GtkWidget *gtk_info_bar_add_button (GtkInfoBar *info_bar, - const gchar *button_text, + const char *button_text, int response_id); GDK_AVAILABLE_IN_ALL void gtk_info_bar_add_buttons (GtkInfoBar *info_bar, - const gchar *first_button_text, + const char *first_button_text, ...); GDK_AVAILABLE_IN_ALL void gtk_info_bar_add_child (GtkInfoBar *info_bar, diff --git a/gtk/gtkistringprivate.h b/gtk/gtkistringprivate.h index 0af8cb1593..9dfe8712f4 100644 --- a/gtk/gtkistringprivate.h +++ b/gtk/gtkistringprivate.h @@ -128,7 +128,7 @@ istring_prepend (IString *str, } else { - gchar *old = NULL; + char *old = NULL; if (!istring_is_inline (str)) old = str->u.str; @@ -145,7 +145,7 @@ static inline void istring_append (IString *str, IString *other) { - const gchar *text = istring_str (other); + const char *text = istring_str (other); guint n_bytes = other->n_bytes; guint n_chars = other->n_chars; diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 5003ba51ae..b07134b1a2 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -234,7 +234,7 @@ * An example looks like this: * * |[<!-- language="C" --> - * const gchar *text = + * const char *text = * "Go to the" * "<a href=\"http://www.gtk.org title=\"<i>Our</i> website\">" * "GTK+ website</a> for more..."; @@ -264,8 +264,8 @@ struct _GtkLabel GtkWidget *popup_menu; GMenuModel *extra_menu; - gchar *label; - gchar *text; + char *label; + char *text; gfloat xalign; gfloat yalign; @@ -299,7 +299,7 @@ struct _GtkLabelClass void (* copy_clipboard) (GtkLabel *self); gboolean (*activate_link) (GtkLabel *self, - const gchar *uri); + const char *uri); }; /* Notes about the handling of links: @@ -330,8 +330,8 @@ struct _GtkLabelClass */ typedef struct { - gchar *uri; - gchar *title; /* the title attribute, used as tooltip */ + char *uri; + char *title; /* the title attribute, used as tooltip */ GtkCssNode *cssnode; @@ -445,15 +445,15 @@ static gboolean gtk_label_query_tooltip (GtkWidget *widget, GtkTooltip *tooltip); static void gtk_label_set_text_internal (GtkLabel *self, - gchar *str); + char *str); static void gtk_label_set_label_internal (GtkLabel *self, - gchar *str); + char *str); static gboolean gtk_label_set_use_markup_internal (GtkLabel *self, gboolean val); static gboolean gtk_label_set_use_underline_internal (GtkLabel *self, gboolean val); static void gtk_label_set_markup_internal (GtkLabel *self, - const gchar *str, + const char *str, gboolean with_uline); static void gtk_label_recalculate (GtkLabel *self); static void gtk_label_root (GtkWidget *widget); @@ -486,14 +486,14 @@ static void gtk_label_buildable_interface_init (GtkBuildableIface *iface) static gboolean gtk_label_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_label_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); /* For selectable labels: */ @@ -511,7 +511,7 @@ static int gtk_label_move_backward_word (GtkLabel *self, /* For links: */ static void gtk_label_clear_links (GtkLabel *self); static gboolean gtk_label_activate_link (GtkLabel *self, - const gchar *uri); + const char *uri); static void gtk_label_activate_current_link (GtkLabel *self); static void emit_activate_link (GtkLabel *self, GtkLabelLink *link); @@ -1323,7 +1323,7 @@ static gboolean gtk_label_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -1349,7 +1349,7 @@ static void gtk_label_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { GtkPangoAttributeParserData *data = user_data; @@ -1382,7 +1382,7 @@ gtk_label_buildable_custom_finished (GtkBuildable *buildable, * Returns: the new #GtkLabel **/ GtkWidget* -gtk_label_new (const gchar *str) +gtk_label_new (const char *str) { GtkLabel *self; @@ -1417,7 +1417,7 @@ gtk_label_new (const gchar *str) * Returns: the new #GtkLabel **/ GtkWidget* -gtk_label_new_with_mnemonic (const gchar *str) +gtk_label_new_with_mnemonic (const char *str) { GtkLabel *self; @@ -1682,7 +1682,7 @@ gtk_label_get_mnemonic_keyval (GtkLabel *self) static void gtk_label_set_text_internal (GtkLabel *self, - gchar *str) + char *str) { if (g_strcmp0 (self->text, str) == 0) { @@ -1701,7 +1701,7 @@ gtk_label_set_text_internal (GtkLabel *self, static void gtk_label_set_label_internal (GtkLabel *self, - gchar *str) + char *str) { g_free (self->label); @@ -1793,7 +1793,7 @@ gtk_label_recalculate (GtkLabel *self) **/ void gtk_label_set_text (GtkLabel *self, - const gchar *str) + const char *str) { g_return_if_fail (GTK_IS_LABEL (self)); @@ -1879,7 +1879,7 @@ gtk_label_get_attributes (GtkLabel *self) **/ void gtk_label_set_label (GtkLabel *self, - const gchar *str) + const char *str) { g_return_if_fail (GTK_IS_LABEL (self)); @@ -1902,7 +1902,7 @@ gtk_label_set_label (GtkLabel *self, * Returns: the text of the label widget. This string is * owned by the widget and must not be modified or freed. **/ -const gchar * +const char * gtk_label_get_label (GtkLabel *self) { g_return_val_if_fail (GTK_IS_LABEL (self), NULL); @@ -1920,9 +1920,9 @@ typedef struct static void start_element_handler (GMarkupParseContext *context, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, + const char *element_name, + const char **attribute_names, + const char **attribute_values, gpointer user_data, GError **error) { @@ -1932,9 +1932,9 @@ start_element_handler (GMarkupParseContext *context, if (strcmp (element_name, "a") == 0) { GtkLabelLink link; - const gchar *uri = NULL; - const gchar *title = NULL; - const gchar *class = NULL; + const char *uri = NULL; + const char *title = NULL; + const char *class = NULL; gboolean visited = FALSE; int line_number; int char_number; @@ -1946,7 +1946,7 @@ start_element_handler (GMarkupParseContext *context, for (i = 0; attribute_names[i] != NULL; i++) { - const gchar *attr = attribute_names[i]; + const char *attr = attribute_names[i]; if (strcmp (attr, "href") == 0) uri = attribute_values[i]; @@ -2026,9 +2026,9 @@ start_element_handler (GMarkupParseContext *context, for (i = 0; attribute_names[i] != NULL; i++) { - const gchar *attr = attribute_names[i]; - const gchar *value = attribute_values[i]; - gchar *newvalue; + const char *attr = attribute_names[i]; + const char *value = attribute_values[i]; + char *newvalue; newvalue = g_markup_escape_text (value, -1); @@ -2046,7 +2046,7 @@ start_element_handler (GMarkupParseContext *context, static void end_element_handler (GMarkupParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -2067,13 +2067,13 @@ end_element_handler (GMarkupParseContext *context, static void text_handler (GMarkupParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) { UriParserData *pdata = user_data; - gchar *newtext; + char *newtext; newtext = g_markup_escape_text (text, text_len); g_string_append (pdata->new_str, newtext); @@ -2091,7 +2091,7 @@ static const GMarkupParser markup_parser = }; static gboolean -xml_isspace (gchar c) +xml_isspace (char c) { return (c == ' ' || c == '\t' || c == '\n' || c == '\r'); } @@ -2106,8 +2106,8 @@ link_free (GtkLabelLink *link) static gboolean parse_uri_markup (GtkLabel *self, - const gchar *str, - gchar **new_str, + const char *str, + char **new_str, GtkLabelLink **links, guint *out_n_links, GError **error) @@ -2272,13 +2272,13 @@ extract_mnemonic_keyval (const char *text, static void gtk_label_set_markup_internal (GtkLabel *self, - const gchar *str, + const char *str, gboolean with_uline) { - gchar *text = NULL; + char *text = NULL; GError *error = NULL; PangoAttrList *attrs = NULL; - gchar *str_for_display = NULL; + char *str_for_display = NULL; GtkLabelLink *links = NULL; guint n_links = 0; PangoAttribute *mnemonic_attr = NULL; @@ -2402,7 +2402,7 @@ error_set: **/ void gtk_label_set_markup (GtkLabel *self, - const gchar *str) + const char *str) { g_return_if_fail (GTK_IS_LABEL (self)); @@ -2434,7 +2434,7 @@ gtk_label_set_markup (GtkLabel *self, */ void gtk_label_set_markup_with_mnemonic (GtkLabel *self, - const gchar *str) + const char *str) { g_return_if_fail (GTK_IS_LABEL (self)); @@ -2460,7 +2460,7 @@ gtk_label_set_markup_with_mnemonic (GtkLabel *self, * Returns: the text in the label widget. This is the internal * string used by the label, and must not be modified. **/ -const gchar * +const char * gtk_label_get_text (GtkLabel *self) { g_return_val_if_fail (GTK_IS_LABEL (self), NULL); @@ -3553,7 +3553,7 @@ gtk_label_snapshot (GtkWidget *widget, **/ void gtk_label_set_text_with_mnemonic (GtkLabel *self, - const gchar *str) + const char *str) { g_return_if_fail (GTK_IS_LABEL (self)); g_return_if_fail (str != NULL); @@ -3593,8 +3593,8 @@ get_layout_index (GtkLabel *self, int *index) { int trailing = 0; - const gchar *cluster; - const gchar *cluster_end; + const char *cluster; + const char *cluster_end; gboolean inside; int lx, ly; @@ -5511,7 +5511,7 @@ gtk_label_clear_links (GtkLabel *self) static gboolean gtk_label_activate_link (GtkLabel *self, - const gchar *uri) + const char *uri) { GtkWidget *widget = GTK_WIDGET (self); GtkWidget *toplevel = GTK_WIDGET (gtk_widget_get_root (widget)); @@ -5573,7 +5573,7 @@ gtk_label_activate_current_link (GtkLabel *self) * Returns: (nullable): the currently active URI or %NULL if there is none. * The string is owned by GTK+ and must not be freed or modified. */ -const gchar * +const char * gtk_label_get_current_uri (GtkLabel *self) { const GtkLabelLink *link; @@ -5711,7 +5711,7 @@ _gtk_label_get_n_links (GtkLabel *self) return 0; } -const gchar * +const char * _gtk_label_get_link_uri (GtkLabel *self, int idx) { diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 367972fb3f..2547fd511b 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -42,14 +42,14 @@ typedef struct _GtkLabel GtkLabel; GDK_AVAILABLE_IN_ALL GType gtk_label_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_label_new (const gchar *str); +GtkWidget* gtk_label_new (const char *str); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_label_new_with_mnemonic (const gchar *str); +GtkWidget* gtk_label_new_with_mnemonic (const char *str); GDK_AVAILABLE_IN_ALL void gtk_label_set_text (GtkLabel *self, - const gchar *str); + const char *str); GDK_AVAILABLE_IN_ALL -const gchar* gtk_label_get_text (GtkLabel *self); +const char * gtk_label_get_text (GtkLabel *self); GDK_AVAILABLE_IN_ALL void gtk_label_set_attributes (GtkLabel *self, PangoAttrList *attrs); @@ -57,12 +57,12 @@ GDK_AVAILABLE_IN_ALL PangoAttrList *gtk_label_get_attributes (GtkLabel *self); GDK_AVAILABLE_IN_ALL void gtk_label_set_label (GtkLabel *self, - const gchar *str); + const char *str); GDK_AVAILABLE_IN_ALL -const gchar * gtk_label_get_label (GtkLabel *self); +const char * gtk_label_get_label (GtkLabel *self); GDK_AVAILABLE_IN_ALL void gtk_label_set_markup (GtkLabel *self, - const gchar *str); + const char *str); GDK_AVAILABLE_IN_ALL void gtk_label_set_use_markup (GtkLabel *self, gboolean setting); @@ -76,7 +76,7 @@ gboolean gtk_label_get_use_underline (GtkLabel *self); GDK_AVAILABLE_IN_ALL void gtk_label_set_markup_with_mnemonic (GtkLabel *self, - const gchar *str); + const char *str); GDK_AVAILABLE_IN_ALL guint gtk_label_get_mnemonic_keyval (GtkLabel *self); GDK_AVAILABLE_IN_ALL @@ -86,7 +86,7 @@ GDK_AVAILABLE_IN_ALL GtkWidget *gtk_label_get_mnemonic_widget (GtkLabel *self); GDK_AVAILABLE_IN_ALL void gtk_label_set_text_with_mnemonic (GtkLabel *self, - const gchar *str); + const char *str); GDK_AVAILABLE_IN_ALL void gtk_label_set_justify (GtkLabel *self, GtkJustification jtype); @@ -150,7 +150,7 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_label_get_single_line_mode (GtkLabel *self); GDK_AVAILABLE_IN_ALL -const gchar *gtk_label_get_current_uri (GtkLabel *self); +const char *gtk_label_get_current_uri (GtkLabel *self); GDK_AVAILABLE_IN_ALL void gtk_label_set_xalign (GtkLabel *self, diff --git a/gtk/gtklabelprivate.h b/gtk/gtklabelprivate.h index 42b624a59d..3533949e86 100644 --- a/gtk/gtklabelprivate.h +++ b/gtk/gtklabelprivate.h @@ -34,7 +34,7 @@ int _gtk_label_get_link_at (GtkLabel *label, int pos); void _gtk_label_activate_link (GtkLabel *label, int idx); -const gchar *_gtk_label_get_link_uri (GtkLabel *label, +const char *_gtk_label_get_link_uri (GtkLabel *label, int idx); void _gtk_label_get_link_extent (GtkLabel *label, int idx, diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c index 41811c89b8..19942b55e8 100644 --- a/gtk/gtklevelbar.c +++ b/gtk/gtklevelbar.c @@ -159,7 +159,7 @@ static guint signals[NUM_SIGNALS] = { 0, }; typedef struct _GtkLevelBarClass GtkLevelBarClass; typedef struct { - gchar *name; + char *name; gdouble value; } GtkLevelBarOffset; @@ -187,7 +187,7 @@ struct _GtkLevelBarClass { GtkWidgetClass parent_class; void (* offset_changed) (GtkLevelBar *self, - const gchar *name); + const char *name); }; static void gtk_level_bar_set_value_internal (GtkLevelBar *self, @@ -201,7 +201,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkLevelBar, gtk_level_bar, GTK_TYPE_WIDGET, gtk_level_bar_buildable_init)) static GtkLevelBarOffset * -gtk_level_bar_offset_new (const gchar *name, +gtk_level_bar_offset_new (const char *name, gdouble value) { GtkLevelBarOffset *offset = g_slice_new0 (GtkLevelBarOffset); @@ -224,7 +224,7 @@ offset_find_func (gconstpointer data, gconstpointer user_data) { const GtkLevelBarOffset *offset = data; - const gchar *name = user_data; + const char *name = user_data; return g_strcmp0 (name, offset->name); } @@ -241,7 +241,7 @@ offset_sort_func (gconstpointer a, static gboolean gtk_level_bar_ensure_offset (GtkLevelBar *self, - const gchar *name, + const char *name, gdouble value) { GList *existing; @@ -570,7 +570,7 @@ static void update_level_style_classes (GtkLevelBar *self) { gdouble value; - const gchar *value_class = NULL; + const char *value_class = NULL; GtkLevelBarOffset *offset, *prev_offset; GList *l; int num_filled, num_blocks, i; @@ -666,9 +666,9 @@ typedef struct { static void offset_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -686,8 +686,8 @@ offset_start_element (GtkBuildableParseContext *context, } else if (strcmp (element_name, "offset") == 0) { - const gchar *name; - const gchar *value; + const char *name; + const char *value; GValue gvalue = G_VALUE_INIT; GtkLevelBarOffset *offset; @@ -731,7 +731,7 @@ static gboolean gtk_level_bar_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -762,7 +762,7 @@ static void gtk_level_bar_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { OffsetsParserData *data = user_data; @@ -1311,7 +1311,7 @@ gtk_level_bar_set_inverted (GtkLevelBar *self, */ void gtk_level_bar_remove_offset_value (GtkLevelBar *self, - const gchar *name) + const char *name) { GList *existing; @@ -1343,7 +1343,7 @@ gtk_level_bar_remove_offset_value (GtkLevelBar *self, */ void gtk_level_bar_add_offset_value (GtkLevelBar *self, - const gchar *name, + const char *name, gdouble value) { GQuark name_quark; @@ -1372,7 +1372,7 @@ gtk_level_bar_add_offset_value (GtkLevelBar *self, */ gboolean gtk_level_bar_get_offset_value (GtkLevelBar *self, - const gchar *name, + const char *name, gdouble *value) { GList *existing; diff --git a/gtk/gtklevelbar.h b/gtk/gtklevelbar.h index 55defd25b1..33a03c4c7c 100644 --- a/gtk/gtklevelbar.h +++ b/gtk/gtklevelbar.h @@ -100,14 +100,14 @@ gboolean gtk_level_bar_get_inverted (GtkLevelBar *self); GDK_AVAILABLE_IN_ALL void gtk_level_bar_add_offset_value (GtkLevelBar *self, - const gchar *name, + const char *name, gdouble value); GDK_AVAILABLE_IN_ALL void gtk_level_bar_remove_offset_value (GtkLevelBar *self, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL gboolean gtk_level_bar_get_offset_value (GtkLevelBar *self, - const gchar *name, + const char *name, gdouble *value); G_END_DECLS diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 38755b92db..155f43450c 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -515,9 +515,9 @@ gtk_link_button_popup_menu (GtkWidget *widget, * Returns: a new link button widget. */ GtkWidget * -gtk_link_button_new (const gchar *uri) +gtk_link_button_new (const char *uri) { - gchar *utf8_uri = NULL; + char *utf8_uri = NULL; GtkWidget *retval; g_return_val_if_fail (uri != NULL, NULL); @@ -563,8 +563,8 @@ gtk_link_button_new (const gchar *uri) * Returns: (transfer none): a new link button widget. */ GtkWidget * -gtk_link_button_new_with_label (const gchar *uri, - const gchar *label) +gtk_link_button_new_with_label (const char *uri, + const char *label) { GtkWidget *retval; @@ -590,7 +590,7 @@ gtk_link_button_query_tooltip_cb (GtkWidget *widget, gpointer data) { GtkLinkButton *link_button = GTK_LINK_BUTTON (widget); - const gchar *label, *uri; + const char *label, *uri; const char *text, *markup; label = gtk_button_get_label (GTK_BUTTON (link_button)); @@ -621,7 +621,7 @@ gtk_link_button_query_tooltip_cb (GtkWidget *widget, */ void gtk_link_button_set_uri (GtkLinkButton *link_button, - const gchar *uri) + const char *uri) { g_return_if_fail (GTK_IS_LINK_BUTTON (link_button)); g_return_if_fail (uri != NULL); @@ -643,7 +643,7 @@ gtk_link_button_set_uri (GtkLinkButton *link_button, * Returns: a valid URI. The returned string is owned by the link button * and should not be modified or freed. */ -const gchar * +const char * gtk_link_button_get_uri (GtkLinkButton *link_button) { g_return_val_if_fail (GTK_IS_LINK_BUTTON (link_button), NULL); diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h index aaa922ed43..90390ff7eb 100644 --- a/gtk/gtklinkbutton.h +++ b/gtk/gtklinkbutton.h @@ -42,16 +42,16 @@ GDK_AVAILABLE_IN_ALL GType gtk_link_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_link_button_new (const gchar *uri); +GtkWidget * gtk_link_button_new (const char *uri); GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_link_button_new_with_label (const gchar *uri, - const gchar *label); +GtkWidget * gtk_link_button_new_with_label (const char *uri, + const char *label); GDK_AVAILABLE_IN_ALL -const gchar * gtk_link_button_get_uri (GtkLinkButton *link_button); +const char * gtk_link_button_get_uri (GtkLinkButton *link_button); GDK_AVAILABLE_IN_ALL void gtk_link_button_set_uri (GtkLinkButton *link_button, - const gchar *uri); + const char *uri); GDK_AVAILABLE_IN_ALL gboolean gtk_link_button_get_visited (GtkLinkButton *link_button); diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c index 0601c3da65..7b9affd94e 100644 --- a/gtk/gtklistbox.c +++ b/gtk/gtklistbox.c @@ -332,7 +332,7 @@ static void gtk_list_box_row_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (buildable), GTK_WIDGET (child)); @@ -3241,7 +3241,7 @@ gtk_list_box_row_get_selectable (GtkListBoxRow *row) static void gtk_list_box_row_set_action_name (GtkActionable *actionable, - const gchar *action_name) + const char *action_name) { GtkListBoxRow *row = GTK_LIST_BOX_ROW (actionable); GtkListBoxRowPrivate *priv = ROW_PRIV (row); @@ -3327,7 +3327,7 @@ gtk_list_box_row_set_property (GObject *obj, } } -static const gchar * +static const char * gtk_list_box_row_get_action_name (GtkActionable *actionable) { GtkListBoxRow *row = GTK_LIST_BOX_ROW (actionable); @@ -3481,7 +3481,7 @@ static void gtk_list_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (type && strcmp (type, "placeholder") == 0) gtk_list_box_set_placeholder (GTK_LIST_BOX (buildable), GTK_WIDGET (child)); diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index edd4630f0f..e27feedc52 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -75,7 +75,7 @@ * * for (i = 0; i < 10; i++) * { - * gchar *some_data; + * char *some_data; * * some_data = get_some_data (i); * @@ -286,13 +286,13 @@ static gboolean gtk_list_store_has_default_sort_func (GtkTreeSortable *so static gboolean gtk_list_store_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); G_DEFINE_TYPE_WITH_CODE (GtkListStore, gtk_list_store, G_TYPE_OBJECT, @@ -1022,7 +1022,7 @@ gtk_list_store_set_valist_internal (GtkListStore *list_store, while (column != -1) { GValue value = G_VALUE_INIT; - gchar *error = NULL; + char *error = NULL; if (column < 0 || column >= priv->n_columns) { @@ -2327,7 +2327,7 @@ gtk_list_store_insert_with_valuesv (GtkListStore *list_store, */ typedef struct { gboolean translatable; - gchar *context; + char *context; int id; } ColInfo; @@ -2343,14 +2343,14 @@ typedef struct { int n_columns; int row_column; gboolean is_data; - const gchar *domain; + const char *domain; } SubParserData; static void list_store_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -2359,8 +2359,8 @@ list_store_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "col") == 0) { int id = -1; - const gchar *id_str; - const gchar *msg_context = NULL; + const char *id_str; + const char *msg_context = NULL; gboolean translatable = FALSE; ColInfo *info; GValue val = G_VALUE_INIT; @@ -2437,7 +2437,7 @@ list_store_start_element (GtkBuildableParseContext *context, } else if (strcmp (element_name, "column") == 0) { - const gchar *type; + const char *type; if (!_gtk_builder_check_parent (data->builder, context, "columns", error)) return; @@ -2462,7 +2462,7 @@ list_store_start_element (GtkBuildableParseContext *context, static void list_store_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -2510,7 +2510,7 @@ list_store_end_element (GtkBuildableParseContext *context, if (type == G_TYPE_INVALID) { g_warning ("Unknown type %s specified in treemodel %s", - (const gchar*)l->data, + (const char *)l->data, gtk_buildable_get_name (GTK_BUILDABLE (data->object))); continue; } @@ -2531,14 +2531,14 @@ list_store_end_element (GtkBuildableParseContext *context, static void list_store_text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) { SubParserData *data = (SubParserData*)user_data; int i; - gchar *string; + char *string; ColInfo *info; if (!data->is_data) @@ -2550,7 +2550,7 @@ list_store_text (GtkBuildableParseContext *context, string = g_strndup (text, text_len); if (info->translatable && text_len) { - gchar *translated; + char *translated; /* FIXME: This will not use the domain set in the .ui file, * since the parser is not telling the builder about the domain. @@ -2585,7 +2585,7 @@ static gboolean gtk_list_store_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -2636,7 +2636,7 @@ static void gtk_list_store_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer parser_data) { SubParserData *data = (SubParserData*)parser_data; diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c index be9ea8d7d4..bdca740d7b 100644 --- a/gtk/gtklockbutton.c +++ b/gtk/gtklockbutton.c @@ -74,9 +74,9 @@ struct _GtkLockButton GPermission *permission; GCancellable *cancellable; - gchar *tooltip_lock; - gchar *tooltip_unlock; - gchar *tooltip_not_authorized; + char *tooltip_lock; + char *tooltip_unlock; + char *tooltip_not_authorized; GIcon *icon_lock; GIcon *icon_unlock; @@ -339,7 +339,7 @@ update_state (GtkLockButton *button) gboolean sensitive; gboolean visible; GIcon *icon; - const gchar *tooltip; + const char *tooltip; if (button->permission) { diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 3d62da6f04..e33e73cd83 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -309,7 +309,7 @@ gtk_get_interface_age (void) * The returned string is owned by GTK and should not be modified * or freed. */ -const gchar* +const char * gtk_check_version (guint required_major, guint required_minor, guint required_micro) @@ -594,7 +594,7 @@ _gtk_module_has_mixed_deps (GModule *module_to_check) static void do_pre_parse_initialization (void) { - const gchar *env_string; + const char *env_string; double slowdown; if (pre_initialized) @@ -965,7 +965,7 @@ gtk_get_locale_direction (void) * Do *not* translate it to "predefinito:LTR", if it * it isn't default:LTR or default:RTL it will not work */ - gchar *e = _("default:LTR"); + char *e = _("default:LTR"); GtkTextDirection dir = GTK_TEXT_DIR_LTR; if (g_strcmp0 (e, "default:RTL") == 0) diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index ba1e1ac9f8..9191011ec9 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -64,7 +64,7 @@ GDK_AVAILABLE_IN_ALL guint gtk_get_interface_age (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -const gchar* gtk_check_version (guint required_major, +const char * gtk_check_version (guint required_major, guint required_minor, guint required_micro); diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index d673c2e7d5..3fe5fc51da 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -4,7 +4,7 @@ # parameters. if VOID is used as the parameter # list, no additional parameters may be present. # BOOLEAN for boolean types (gboolean) -# CHAR for signed char types (gchar) +# CHAR for signed char types (char) # UCHAR for unsigned char types (guchar) # INT for signed integer types (int) # UINT for unsigned integer types (guint) @@ -14,7 +14,7 @@ # FLAGS for flag enumeration types (guint) # FLOAT for single-precision float types (gfloat) # DOUBLE for double-precision float types (gdouble) -# STRING for string types (gchar*) +# STRING for string types (char *) # BOXED for boxed (anonymous but reference counted) types (GBoxed*) # POINTER for anonymous pointer types (gpointer) # OBJECT for GObject or derived types (GObject*) diff --git a/gtk/gtkmediastream.c b/gtk/gtkmediastream.c index 60a1a6d1c9..120d4a656f 100644 --- a/gtk/gtkmediastream.c +++ b/gtk/gtkmediastream.c @@ -1179,7 +1179,7 @@ void gtk_media_stream_error (GtkMediaStream *self, GQuark domain, int code, - const gchar *format, + const char *format, ...) { GError *error; @@ -1213,7 +1213,7 @@ void gtk_media_stream_error_valist (GtkMediaStream *self, GQuark domain, int code, - const gchar *format, + const char *format, va_list args) { GError *error; diff --git a/gtk/gtkmediastream.h b/gtk/gtkmediastream.h index 72d7f4ddd1..8c5a0c47c8 100644 --- a/gtk/gtkmediastream.h +++ b/gtk/gtkmediastream.h @@ -141,13 +141,13 @@ GDK_AVAILABLE_IN_ALL void gtk_media_stream_error (GtkMediaStream *self, GQuark domain, int code, - const gchar *format, + const char *format, ...) G_GNUC_PRINTF (4, 5); GDK_AVAILABLE_IN_ALL void gtk_media_stream_error_valist (GtkMediaStream *self, GQuark domain, int code, - const gchar *format, + const char *format, va_list args) G_GNUC_PRINTF (4, 0); G_END_DECLS diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index 01c1a4a8d2..bdcab6c80c 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -66,7 +66,7 @@ static void gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box static void gtk_menu_section_box_new_submenu (GtkMenuTrackerItem *item, GtkMenuSectionBox *toplevel, GtkWidget *focus, - const gchar *name); + const char *name); static GtkWidget * gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, GtkMenuSectionBox *parent); @@ -325,7 +325,7 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item, { GtkWidget *stack = NULL; GtkWidget *parent = NULL; - gchar *name; + char *name; widget = g_object_new (GTK_TYPE_MODEL_BUTTON, "menu-name", gtk_menu_tracker_item_get_label (item), @@ -517,7 +517,7 @@ static void gtk_menu_section_box_new_submenu (GtkMenuTrackerItem *item, GtkMenuSectionBox *toplevel, GtkWidget *focus, - const gchar *name) + const char *name) { GtkMenuSectionBox *box; GtkWidget *button; @@ -556,9 +556,9 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, GtkMenuSectionBox *parent) { GtkMenuSectionBox *box; - const gchar *label; - const gchar *hint; - const gchar *text_direction; + const char *label; + const char *hint; + const char *text_direction; box = g_object_new (GTK_TYPE_MENU_SECTION_BOX, NULL); box->indicators = g_object_ref (parent->indicators); diff --git a/gtk/gtkmenutracker.c b/gtk/gtkmenutracker.c index ba3bbfc6aa..da87bcf1d0 100644 --- a/gtk/gtkmenutracker.c +++ b/gtk/gtkmenutracker.c @@ -73,7 +73,7 @@ struct _GtkMenuTrackerSection { gpointer model; /* may be a GtkMenuTrackerItem or a GMenuModel */ GSList *items; - gchar *action_namespace; + char *action_namespace; guint separator_label : 1; guint with_separators : 1; @@ -88,7 +88,7 @@ static GtkMenuTrackerSection * gtk_menu_tracker_section_new (GtkMenuTracker gboolean with_separators, gboolean separator_label, int offset, - const gchar *action_namespace); + const char *action_namespace); static void gtk_menu_tracker_section_free (GtkMenuTrackerSection *section); static GtkMenuTrackerSection * @@ -318,7 +318,7 @@ gtk_menu_tracker_add_items (GtkMenuTracker *tracker, if (submenu != NULL && tracker->merge_sections) { GtkMenuTrackerSection *subsection; - gchar *action_namespace = NULL; + char *action_namespace = NULL; gboolean has_label; has_label = g_menu_model_get_item_attribute (model, position + n_items, @@ -329,7 +329,7 @@ gtk_menu_tracker_add_items (GtkMenuTracker *tracker, if (section->action_namespace) { - gchar *namespace; + char *namespace; namespace = g_strjoin (".", section->action_namespace, action_namespace, NULL); subsection = gtk_menu_tracker_section_new (tracker, submenu, FALSE, has_label, offset, namespace); @@ -478,7 +478,7 @@ gtk_menu_tracker_section_new (GtkMenuTracker *tracker, gboolean with_separators, gboolean separator_label, int offset, - const gchar *action_namespace) + const char *action_namespace) { GtkMenuTrackerSection *section; @@ -555,7 +555,7 @@ gtk_menu_tracker_new (GtkActionObservable *observable, gboolean with_separators, gboolean merge_sections, gboolean mac_os_mode, - const gchar *action_namespace, + const char *action_namespace, GtkMenuTrackerInsertFunc insert_func, GtkMenuTrackerRemoveFunc remove_func, gpointer user_data) @@ -578,7 +578,7 @@ gtk_menu_tracker_new (GtkActionObservable *observable, GtkMenuTracker * gtk_menu_tracker_new_for_item_link (GtkMenuTrackerItem *item, - const gchar *link_name, + const char *link_name, gboolean merge_sections, gboolean mac_os_mode, GtkMenuTrackerInsertFunc insert_func, @@ -587,7 +587,7 @@ gtk_menu_tracker_new_for_item_link (GtkMenuTrackerItem *item, { GtkMenuTracker *tracker; GMenuModel *submenu; - gchar *namespace; + char *namespace; submenu = _gtk_menu_tracker_item_get_link (item, link_name); namespace = _gtk_menu_tracker_item_get_link_namespace (item); diff --git a/gtk/gtkmenutrackeritem.c b/gtk/gtkmenutrackeritem.c index 2cf2effa8a..6390ba8a64 100644 --- a/gtk/gtkmenutrackeritem.c +++ b/gtk/gtkmenutrackeritem.c @@ -85,8 +85,8 @@ struct _GtkMenuTrackerItem GObject parent_instance; GtkActionObservable *observable; - gchar *action_namespace; - gchar *action_and_target; + char *action_namespace; + char *action_and_target; GMenuItem *item; GtkMenuTrackerItemRole role : 4; guint is_separator : 1; @@ -289,7 +289,7 @@ gtk_menu_tracker_item_update_visibility (GtkMenuTrackerItem *self) static void gtk_menu_tracker_item_action_added (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, const GVariantType *parameter_type, gboolean enabled, GVariant *state) @@ -362,7 +362,7 @@ gtk_menu_tracker_item_action_added (GtkActionObserver *observer, static void gtk_menu_tracker_item_action_enabled_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, gboolean enabled) { GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer); @@ -385,7 +385,7 @@ gtk_menu_tracker_item_action_enabled_changed (GtkActionObserver *observer, static void gtk_menu_tracker_item_action_state_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, + const char *action_name, GVariant *state) { GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer); @@ -419,7 +419,7 @@ gtk_menu_tracker_item_action_state_changed (GtkActionObserver *observer, static void gtk_menu_tracker_item_action_removed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name) + const char *action_name) { GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer); gboolean was_sensitive, was_toggled; @@ -461,8 +461,8 @@ gtk_menu_tracker_item_action_removed (GtkActionObserver *observer, static void gtk_menu_tracker_item_primary_accel_changed (GtkActionObserver *observer, GtkActionObservable *observable, - const gchar *action_name, - const gchar *action_and_target) + const char *action_name, + const char *action_and_target) { GtkMenuTrackerItem *self = GTK_MENU_TRACKER_ITEM (observer); @@ -485,12 +485,12 @@ _gtk_menu_tracker_item_new (GtkActionObservable *observable, GMenuModel *model, int item_index, gboolean mac_os_mode, - const gchar *action_namespace, + const char *action_namespace, gboolean is_separator) { GtkMenuTrackerItem *self; - const gchar *action_name; - const gchar *hidden_when; + const char *action_name; + const char *hidden_when; g_return_val_if_fail (GTK_IS_ACTION_OBSERVABLE (observable), NULL); g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL); @@ -601,7 +601,7 @@ gtk_menu_tracker_item_get_is_separator (GtkMenuTrackerItem *self) */ gboolean gtk_menu_tracker_item_get_has_link (GtkMenuTrackerItem *self, - const gchar *link_name) + const char *link_name) { GMenuModel *link; @@ -616,10 +616,10 @@ gtk_menu_tracker_item_get_has_link (GtkMenuTrackerItem *self, return FALSE; } -const gchar * +const char * gtk_menu_tracker_item_get_label (GtkMenuTrackerItem *self) { - const gchar *label = NULL; + const char *label = NULL; g_menu_item_get_attribute (self->item, G_MENU_ATTRIBUTE_LABEL, "&s", &label); @@ -688,10 +688,10 @@ gtk_menu_tracker_item_get_toggled (GtkMenuTrackerItem *self) return self->toggled; } -const gchar * +const char * gtk_menu_tracker_item_get_accel (GtkMenuTrackerItem *self) { - const gchar *accel; + const char *accel; if (!self->action_and_target) return NULL; @@ -705,30 +705,30 @@ gtk_menu_tracker_item_get_accel (GtkMenuTrackerItem *self) return gtk_action_muxer_get_primary_accel (GTK_ACTION_MUXER (self->observable), self->action_and_target); } -const gchar * +const char * gtk_menu_tracker_item_get_special (GtkMenuTrackerItem *self) { - const gchar *special = NULL; + const char *special = NULL; g_menu_item_get_attribute (self->item, "x-gtk-private-special", "&s", &special); return special; } -const gchar * +const char * gtk_menu_tracker_item_get_display_hint (GtkMenuTrackerItem *self) { - const gchar *display_hint = NULL; + const char *display_hint = NULL; g_menu_item_get_attribute (self->item, "display-hint", "&s", &display_hint); return display_hint; } -const gchar * +const char * gtk_menu_tracker_item_get_text_direction (GtkMenuTrackerItem *self) { - const gchar *text_direction = NULL; + const char *text_direction = NULL; g_menu_item_get_attribute (self->item, "text-direction", "&s", &text_direction); @@ -737,15 +737,15 @@ gtk_menu_tracker_item_get_text_direction (GtkMenuTrackerItem *self) GMenuModel * _gtk_menu_tracker_item_get_link (GtkMenuTrackerItem *self, - const gchar *link_name) + const char *link_name) { return g_menu_item_get_link (self->item, link_name); } -gchar * +char * _gtk_menu_tracker_item_get_link_namespace (GtkMenuTrackerItem *self) { - const gchar *namespace; + const char *namespace; if (g_menu_item_get_attribute (self->item, "action-namespace", "&s", &namespace)) { @@ -784,7 +784,7 @@ gtk_menu_tracker_item_set_submenu_shown (GtkMenuTrackerItem *self, void gtk_menu_tracker_item_activated (GtkMenuTrackerItem *self) { - const gchar *action_name; + const char *action_name; GVariant *action_target; g_return_if_fail (GTK_IS_MENU_TRACKER_ITEM (self)); @@ -804,7 +804,7 @@ gtk_menu_tracker_item_activated (GtkMenuTrackerItem *self) typedef struct { GtkMenuTrackerItem *item; - gchar *submenu_action; + char *submenu_action; gboolean first_time; } GtkMenuTrackerOpener; @@ -855,7 +855,7 @@ gtk_menu_tracker_opener_update (GtkMenuTrackerOpener *opener) static void gtk_menu_tracker_opener_added (GActionGroup *group, - const gchar *action_name, + const char *action_name, gpointer user_data) { GtkMenuTrackerOpener *opener = user_data; @@ -866,7 +866,7 @@ gtk_menu_tracker_opener_added (GActionGroup *group, static void gtk_menu_tracker_opener_removed (GActionGroup *action_group, - const gchar *action_name, + const char *action_name, gpointer user_data) { GtkMenuTrackerOpener *opener = user_data; @@ -877,7 +877,7 @@ gtk_menu_tracker_opener_removed (GActionGroup *action_group, static void gtk_menu_tracker_opener_changed (GActionGroup *action_group, - const gchar *action_name, + const char *action_name, GVariant *new_state, gpointer user_data) { @@ -909,7 +909,7 @@ gtk_menu_tracker_opener_free (gpointer data) static GtkMenuTrackerOpener * gtk_menu_tracker_opener_new (GtkMenuTrackerItem *item, - const gchar *submenu_action) + const char *submenu_action) { GtkMenuTrackerOpener *opener; @@ -935,7 +935,7 @@ void gtk_menu_tracker_item_request_submenu_shown (GtkMenuTrackerItem *self, gboolean shown) { - const gchar *submenu_action; + const char *submenu_action; gboolean has_submenu_action; if (shown == self->submenu_requested) diff --git a/gtk/gtkmenutrackeritemprivate.h b/gtk/gtkmenutrackeritemprivate.h index 2b81866314..a3c9164053 100644 --- a/gtk/gtkmenutrackeritemprivate.h +++ b/gtk/gtkmenutrackeritemprivate.h @@ -46,23 +46,23 @@ GtkMenuTrackerItem * _gtk_menu_tracker_item_new (GtkActi GMenuModel *model, int item_index, gboolean mac_os_mode, - const gchar *action_namespace, + const char *action_namespace, gboolean is_separator); -const gchar * gtk_menu_tracker_item_get_special (GtkMenuTrackerItem *self); +const char * gtk_menu_tracker_item_get_special (GtkMenuTrackerItem *self); -const gchar * gtk_menu_tracker_item_get_display_hint (GtkMenuTrackerItem *self); +const char * gtk_menu_tracker_item_get_display_hint (GtkMenuTrackerItem *self); -const gchar * gtk_menu_tracker_item_get_text_direction (GtkMenuTrackerItem *self); +const char * gtk_menu_tracker_item_get_text_direction (GtkMenuTrackerItem *self); GtkActionObservable * _gtk_menu_tracker_item_get_observable (GtkMenuTrackerItem *self); gboolean gtk_menu_tracker_item_get_is_separator (GtkMenuTrackerItem *self); gboolean gtk_menu_tracker_item_get_has_link (GtkMenuTrackerItem *self, - const gchar *link_name); + const char *link_name); -const gchar * gtk_menu_tracker_item_get_label (GtkMenuTrackerItem *self); +const char * gtk_menu_tracker_item_get_label (GtkMenuTrackerItem *self); GIcon * gtk_menu_tracker_item_get_icon (GtkMenuTrackerItem *self); @@ -74,12 +74,12 @@ GtkMenuTrackerItemRole gtk_menu_tracker_item_get_role (GtkMenu gboolean gtk_menu_tracker_item_get_toggled (GtkMenuTrackerItem *self); -const gchar * gtk_menu_tracker_item_get_accel (GtkMenuTrackerItem *self); +const char * gtk_menu_tracker_item_get_accel (GtkMenuTrackerItem *self); GMenuModel * _gtk_menu_tracker_item_get_link (GtkMenuTrackerItem *self, - const gchar *link_name); + const char *link_name); -gchar * _gtk_menu_tracker_item_get_link_namespace (GtkMenuTrackerItem *self); +char * _gtk_menu_tracker_item_get_link_namespace (GtkMenuTrackerItem *self); gboolean gtk_menu_tracker_item_may_disappear (GtkMenuTrackerItem *self); diff --git a/gtk/gtkmenutrackerprivate.h b/gtk/gtkmenutrackerprivate.h index 92a0f47739..9d2602cbfb 100644 --- a/gtk/gtkmenutrackerprivate.h +++ b/gtk/gtkmenutrackerprivate.h @@ -37,13 +37,13 @@ GtkMenuTracker * gtk_menu_tracker_new (GtkActi gboolean with_separators, gboolean merge_sections, gboolean mac_os_mode, - const gchar *action_namespace, + const char *action_namespace, GtkMenuTrackerInsertFunc insert_func, GtkMenuTrackerRemoveFunc remove_func, gpointer user_data); GtkMenuTracker * gtk_menu_tracker_new_for_item_link (GtkMenuTrackerItem *item, - const gchar *link_name, + const char *link_name, gboolean merge_sections, gboolean mac_os_mode, GtkMenuTrackerInsertFunc insert_func, diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index b3c9278146..0f4b49f20d 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -287,7 +287,7 @@ setup_type (GtkMessageDialog *dialog, GtkMessageType type) { GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (dialog); - const gchar *name = NULL; + const char *name = NULL; AtkObject *atk_obj; if (priv->message_type == type) @@ -337,7 +337,7 @@ update_title (GObject *dialog, GParamSpec *pspec, GtkWidget *label) { - const gchar *title; + const char *title; title = gtk_window_get_title (GTK_WINDOW (dialog)); gtk_label_set_label (GTK_LABEL (label), title); @@ -413,7 +413,7 @@ gtk_message_dialog_set_property (GObject *object, break; case PROP_SECONDARY_TEXT: { - const gchar *txt = g_value_get_string (value); + const char *txt = g_value_get_string (value); if (gtk_label_get_use_markup (GTK_LABEL (priv->secondary_label))) gtk_label_set_markup (GTK_LABEL (priv->secondary_label), txt); @@ -510,12 +510,12 @@ gtk_message_dialog_new (GtkWindow *parent, GtkDialogFlags flags, GtkMessageType type, GtkButtonsType buttons, - const gchar *message_format, + const char *message_format, ...) { GtkWidget *widget; GtkDialog *dialog; - gchar* msg = NULL; + char * msg = NULL; va_list args; g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL); @@ -593,12 +593,12 @@ gtk_message_dialog_new_with_markup (GtkWindow *parent, GtkDialogFlags flags, GtkMessageType type, GtkButtonsType buttons, - const gchar *message_format, + const char *message_format, ...) { GtkWidget *widget; va_list args; - gchar *msg = NULL; + char *msg = NULL; g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL); @@ -628,7 +628,7 @@ gtk_message_dialog_new_with_markup (GtkWindow *parent, **/ void gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog, - const gchar *str) + const char *str) { GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog); @@ -649,12 +649,12 @@ gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog, */ void gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, - const gchar *message_format, + const char *message_format, ...) { GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog); va_list args; - gchar *msg = NULL; + char *msg = NULL; g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog)); @@ -695,7 +695,7 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, * to escape it. * |[<!-- language="C" --> - * gchar *msg; + * char *msg; * * msg = g_markup_printf_escaped (message_format, ...); * gtk_message_dialog_format_secondary_markup (message_dialog, @@ -705,12 +705,12 @@ gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, */ void gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog, - const gchar *message_format, + const char *message_format, ...) { GtkMessageDialogPrivate *priv = gtk_message_dialog_get_instance_private (message_dialog); va_list args; - gchar *msg = NULL; + char *msg = NULL; g_return_if_fail (GTK_IS_MESSAGE_DIALOG (message_dialog)); diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h index ddfca46465..4a1ababd74 100644 --- a/gtk/gtkmessagedialog.h +++ b/gtk/gtkmessagedialog.h @@ -82,7 +82,7 @@ GtkWidget* gtk_message_dialog_new (GtkWindow *parent, GtkDialogFlags flags, GtkMessageType type, GtkButtonsType buttons, - const gchar *message_format, + const char *message_format, ...) G_GNUC_PRINTF (5, 6); GDK_AVAILABLE_IN_ALL @@ -90,21 +90,21 @@ GtkWidget* gtk_message_dialog_new_with_markup (GtkWindow *parent, GtkDialogFlags flags, GtkMessageType type, GtkButtonsType buttons, - const gchar *message_format, + const char *message_format, ...) G_GNUC_PRINTF (5, 6); GDK_AVAILABLE_IN_ALL void gtk_message_dialog_set_markup (GtkMessageDialog *message_dialog, - const gchar *str); + const char *str); GDK_AVAILABLE_IN_ALL void gtk_message_dialog_format_secondary_text (GtkMessageDialog *message_dialog, - const gchar *message_format, + const char *message_format, ...) G_GNUC_PRINTF (2, 3); GDK_AVAILABLE_IN_ALL void gtk_message_dialog_format_secondary_markup (GtkMessageDialog *message_dialog, - const gchar *message_format, + const char *message_format, ...) G_GNUC_PRINTF (2, 3); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c index d6147d6327..c577accb6b 100644 --- a/gtk/gtkmodelbutton.c +++ b/gtk/gtkmodelbutton.c @@ -171,7 +171,7 @@ struct _GtkModelButton GtkWidget *end_indicator; GtkWidget *popover; GtkActionHelper *action_helper; - gchar *menu_name; + char *menu_name; GtkButtonRole role; GtkSizeGroup *indicators; char *accel; @@ -458,8 +458,8 @@ update_node_name (GtkModelButton *self) { AtkObject *accessible; AtkRole a11y_role; - const gchar *start_name; - const gchar *end_name; + const char *start_name; + const char *end_name; accessible = gtk_widget_get_accessible (GTK_WIDGET (self)); switch (self->role) @@ -613,7 +613,7 @@ gtk_model_button_set_icon (GtkModelButton *self, static void gtk_model_button_set_text (GtkModelButton *button, - const gchar *text) + const char *text) { gtk_label_set_text_with_mnemonic (GTK_LABEL (button->label), text ? text : ""); @@ -650,7 +650,7 @@ gtk_model_button_set_active (GtkModelButton *button, static void gtk_model_button_set_menu_name (GtkModelButton *button, - const gchar *menu_name) + const char *menu_name) { g_free (button->menu_name); button->menu_name = g_strdup (menu_name); diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index c6d81cbd4b..9e487a64d6 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -101,14 +101,14 @@ split_file_list (const char *str) return files; } -static gchar ** +static char ** get_module_path (void) { - const gchar *module_path_env; - const gchar *exe_prefix; - gchar *module_path; - gchar *default_dir; - static gchar **result = NULL; + const char *module_path_env; + const char *exe_prefix; + char *module_path; + char *default_dir; + static char **result = NULL; if (result) return result; @@ -144,18 +144,18 @@ get_module_path (void) * * Returns: the search path for the module type. Free with g_strfreev(). **/ -gchar ** -_gtk_get_module_path (const gchar *type) +char ** +_gtk_get_module_path (const char *type) { - gchar **paths = get_module_path(); - gchar **path; - gchar **result; + char **paths = get_module_path(); + char **path; + char **result; int count = 0; for (path = paths; *path; path++) count++; - result = g_new (gchar *, count * 4 + 1); + result = g_new (char *, count * 4 + 1); count = 0; for (path = get_module_path (); *path; path++) @@ -165,7 +165,7 @@ _gtk_get_module_path (const gchar *type) for (use_version = TRUE; use_version >= FALSE; use_version--) for (use_host = TRUE; use_host >= FALSE; use_host--) { - gchar *tmp_dir; + char *tmp_dir; if (use_version && use_host) tmp_dir = g_build_filename (*path, GTK_BINARY_VERSION, GTK_HOST, type, NULL); diff --git a/gtk/gtkmodulesprivate.h b/gtk/gtkmodulesprivate.h index b02455d765..c3a1ea59ab 100644 --- a/gtk/gtkmodulesprivate.h +++ b/gtk/gtkmodulesprivate.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS -gchar ** _gtk_get_module_path (const gchar *type); +char ** _gtk_get_module_path (const char *type); G_END_DECLS diff --git a/gtk/gtkmountoperation-stub.c b/gtk/gtkmountoperation-stub.c index be8472a016..afcf474440 100644 --- a/gtk/gtkmountoperation-stub.c +++ b/gtk/gtkmountoperation-stub.c @@ -45,8 +45,8 @@ gboolean _gtk_mount_operation_lookup_info (GtkMountOperationLookupContext *context, GPid pid, int size_pixels, - gchar **out_name, - gchar **out_command_line, + char **out_name, + char **out_command_line, GdkTexture **out_texture) { return FALSE; diff --git a/gtk/gtkmountoperation-x11.c b/gtk/gtkmountoperation-x11.c index 5d2f10c01b..0dd2ae7480 100644 --- a/gtk/gtkmountoperation-x11.c +++ b/gtk/gtkmountoperation-x11.c @@ -131,7 +131,7 @@ get_utf8_property (GdkDisplay *display, int format; gulong nitems; gulong bytes_after; - gchar *val; + char *val; int err, result; char *retval; Atom utf8_string; @@ -588,9 +588,9 @@ static GPid pid_get_parent (GPid pid) { GPid ppid; - gchar **tokens; - gchar *stat_filename; - gchar *stat_contents; + char **tokens; + char *stat_filename; + char *stat_contents; gsize stat_len; ppid = 0; @@ -616,7 +616,7 @@ pid_get_parent (GPid pid) { if (g_str_has_prefix (tokens[n], "PPid:")) { - gchar *endp; + char *endp; endp = NULL; ppid = strtoll (tokens[n] + sizeof "PPid:" - 1, &endp, 10); @@ -641,16 +641,16 @@ pid_get_parent (GPid pid) return ppid; } -static gchar * +static char * pid_get_env (GPid pid, - const gchar *key) + const char *key) { - gchar *ret; - gchar *env_filename; - gchar *env; + char *ret; + char *env_filename; + char *env; gsize env_len; gsize key_len; - gchar *end; + char *end; ret = NULL; @@ -676,7 +676,7 @@ pid_get_env (GPid pid, ret = g_strdup (env + n + key_len + 1); /* skip invalid UTF-8 */ - if (!g_utf8_validate (ret, -1, (const gchar **) &end)) + if (!g_utf8_validate (ret, -1, (const char **) &end)) *end = '\0'; break; } @@ -692,14 +692,14 @@ pid_get_env (GPid pid, return ret; } -static gchar * +static char * pid_get_command_line (GPid pid) { - gchar *cmdline_filename; - gchar *cmdline_contents; + char *cmdline_filename; + char *cmdline_contents; gsize cmdline_len; guint n; - gchar *end; + char *end; cmdline_contents = NULL; @@ -718,7 +718,7 @@ pid_get_command_line (GPid pid) } /* skip invalid UTF-8 */ - if (!g_utf8_validate (cmdline_contents, -1, (const gchar **) &end)) + if (!g_utf8_validate (cmdline_contents, -1, (const char **) &end)) *end = '\0'; out: @@ -765,8 +765,8 @@ out: return ppid; } -static gchar * -pid_get_env (GPid pid, const gchar *key) +static char * +pid_get_env (GPid pid, const char *key) { size_t len; char **strs; @@ -793,7 +793,7 @@ pid_get_env (GPid pid, const gchar *key) ret = g_strdup (strs[i] + key_len + 1); /* skip invalid UTF-8 */ - if (!g_utf8_validate (ret, -1, (const gchar **) &end)) + if (!g_utf8_validate (ret, -1, (const char **) &end)) *end = '\0'; break; } @@ -804,7 +804,7 @@ pid_get_env (GPid pid, const gchar *key) return ret; } -static gchar * +static char * pid_get_command_line (GPid pid) { size_t len; @@ -825,7 +825,7 @@ pid_get_command_line (GPid pid) ret = g_strjoinv (" ", strs); /* skip invalid UTF-8 */ - if (!g_utf8_validate (ret, -1, (const gchar **) &end)) + if (!g_utf8_validate (ret, -1, (const char **) &end)) *end = '\0'; g_free (strs); @@ -842,14 +842,14 @@ pid_get_parent (GPid pid) return 0; } -static gchar * +static char * pid_get_env (GPid pid, - const gchar *key) + const char *key) { return NULL; } -static gchar * +static char * pid_get_command_line (GPid pid) { return NULL; @@ -859,26 +859,26 @@ pid_get_command_line (GPid pid) /* ---------------------------------------------------------------------------------------------------- */ -static gchar * +static char * get_name_for_window_with_pid (GtkMountOperationLookupContext *context, GPid pid) { Window window; Window windowid_window; - gchar *ret; + char *ret; ret = NULL; window = GPOINTER_TO_INT (g_hash_table_lookup (context->pid_to_window, GINT_TO_POINTER (pid))); if (window == None) { - gchar *windowid_value; + char *windowid_value; /* check for $WINDOWID (set by terminals) and see if we can get the title that way */ windowid_value = pid_get_env (pid, "WINDOWID"); if (windowid_value != NULL) { - gchar *endp; + char *endp; endp = NULL; windowid_window = (Window) g_ascii_strtoll (windowid_value, &endp, 10); @@ -978,7 +978,7 @@ get_texture_for_window_with_pid (GtkMountOperationLookupContext *context, /* ---------------------------------------------------------------------------------------------------- */ -static const gchar *well_known_commands[] = +static const char *well_known_commands[] = { /* translators: this string is a name for the 'less' command */ "less", N_("Terminal Pager"), @@ -993,8 +993,8 @@ gboolean _gtk_mount_operation_lookup_info (GtkMountOperationLookupContext *context, GPid pid, int size_pixels, - gchar **out_name, - gchar **out_command_line, + char **out_name, + char **out_command_line, GdkTexture **out_texture) { g_return_val_if_fail (out_name != NULL && *out_name == NULL, FALSE); @@ -1024,8 +1024,8 @@ _gtk_mount_operation_lookup_info (GtkMountOperationLookupContext *context, strlen (*out_command_line) > 0 && (*out_command_line)[0] != ' ') { guint n; - gchar *s; - gchar *p; + char *s; + char *p; /* find the first character after the first argument */ s = strchr (*out_command_line, ' '); diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index a54d109f58..20dc09b097 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -197,7 +197,7 @@ gtk_mount_operation_class_init (GtkMountOperationClass *klass) static void gtk_mount_operation_init (GtkMountOperation *operation) { - gchar *name_owner; + char *name_owner; operation->priv = gtk_mount_operation_get_instance_private (operation); @@ -375,7 +375,7 @@ pw_dialog_got_response (GtkDialog *dialog, if (text && strlen (text) > 0) { guint64 pim; - gchar *end = NULL; + char *end = NULL; errno = 0; pim = g_ascii_strtoull (text, &end, 10); @@ -421,7 +421,7 @@ static gboolean pim_entry_is_valid (GtkWidget *entry_widget) { const char *text; - gchar *end = NULL; + char *end = NULL; guint64 pim; if (entry_widget == NULL) @@ -561,9 +561,9 @@ table_add_entry (GtkMountOperation *operation, static void gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, - const gchar *message, - const gchar *default_user, - const gchar *default_domain) + const char *message, + const char *default_user, + const char *default_domain) { GtkMountOperationPrivate *priv; GtkWidget *widget; @@ -575,8 +575,8 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, GtkWidget *content_area, *action_area; gboolean can_anonymous; guint rows; - gchar *primary; - const gchar *secondary; + char *primary; + const char *secondary; PangoAttrList *attrs; gboolean use_header; @@ -826,7 +826,7 @@ call_password_proxy_cb (GObject *source, GMountOperationResult result; GVariant *result_details; GVariantIter iter; - const gchar *key; + const char *key; GVariant *value; GError *error = NULL; @@ -867,7 +867,7 @@ gtk_mount_operation_ask_password_do_proxy (GtkMountOperation *operation, const char *default_user, const char *default_domain) { - gchar id[255]; + char id[255]; g_sprintf(id, "GtkMountOperation%p", operation); operation->priv->handler_showing = TRUE; @@ -999,7 +999,7 @@ call_question_proxy_cb (GObject *source, GMountOperationResult result; GVariant *result_details; GVariantIter iter; - const gchar *key; + const char *key; GVariant *value; GError *error = NULL; @@ -1031,7 +1031,7 @@ gtk_mount_operation_ask_question_do_proxy (GtkMountOperation *operation, const char *message, const char *choices[]) { - gchar id[255]; + char id[255]; g_sprintf(id, "GtkMountOperation%p", operation); operation->priv->handler_showing = TRUE; @@ -1186,10 +1186,10 @@ add_pid_to_process_list_store (GtkMountOperation *mount_operation, GtkListStore *list_store, GPid pid) { - gchar *command_line; - gchar *name; + char *command_line; + char *name; GdkTexture *texture; - gchar *markup; + char *markup; GtkTreeIter iter; name = NULL; @@ -1514,7 +1514,7 @@ create_show_processes_dialog (GtkMountOperation *op, GtkTreeViewColumn *column; GtkCellRenderer *renderer; GtkListStore *list_store; - gchar *s; + char *s; gboolean use_header; GtkGesture *gesture; GtkEventController *controller; @@ -1652,7 +1652,7 @@ call_processes_proxy_cb (GObject *source, GMountOperationResult result; GVariant *result_details; GVariantIter iter; - const gchar *key; + const char *key; GVariant *value; GError *error = NULL; @@ -1691,7 +1691,7 @@ gtk_mount_operation_show_processes_do_proxy (GtkMountOperation *operation, GArray *processes, const char *choices[]) { - gchar id[255]; + char id[255]; g_sprintf(id, "GtkMountOperation%p", operation); operation->priv->handler_showing = TRUE; diff --git a/gtk/gtkmountoperationprivate.h b/gtk/gtkmountoperationprivate.h index 7750946368..522970772c 100644 --- a/gtk/gtkmountoperationprivate.h +++ b/gtk/gtkmountoperationprivate.h @@ -38,8 +38,8 @@ GtkMountOperationLookupContext *_gtk_mount_operation_lookup_context_get (GdkDis gboolean _gtk_mount_operation_lookup_info (GtkMountOperationLookupContext *context, GPid pid, int size_pixels, - gchar **out_name, - gchar **out_command_line, + char **out_name, + char **out_command_line, GdkTexture **out_texture); void _gtk_mount_operation_lookup_context_free (GtkMountOperationLookupContext *context); diff --git a/gtk/gtkmultifilter.c b/gtk/gtkmultifilter.c index 4fb5e9af77..922b8fb868 100644 --- a/gtk/gtkmultifilter.c +++ b/gtk/gtkmultifilter.c @@ -103,7 +103,7 @@ static void gtk_multi_filter_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_FILTER (child)) gtk_multi_filter_append (GTK_MULTI_FILTER (buildable), g_object_ref (GTK_FILTER (child))); diff --git a/gtk/gtkmultisorter.c b/gtk/gtkmultisorter.c index d25753c6e1..bbdaf13cc6 100644 --- a/gtk/gtkmultisorter.c +++ b/gtk/gtkmultisorter.c @@ -224,7 +224,7 @@ static void gtk_multi_sorter_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_SORTER (child)) gtk_multi_sorter_append (GTK_MULTI_SORTER (buildable), g_object_ref (GTK_SORTER (child))); diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index b0c6cacedb..a96e704475 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -897,7 +897,7 @@ static void gtk_notebook_buildable_init (GtkBuildableIface *iface); static void gtk_notebook_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); static void gtk_notebook_gesture_pressed (GtkGestureClick *gesture, int n_press, @@ -1461,7 +1461,7 @@ static void gtk_notebook_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { GtkNotebook *notebook = GTK_NOTEBOOK (buildable); @@ -6439,7 +6439,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook, if (notebook->show_tabs) { - gchar string[32]; + char string[32]; g_snprintf (string, sizeof(string), _("Page %u"), g_list_position (notebook->children, list)); @@ -6480,7 +6480,7 @@ gtk_notebook_set_tab_label (GtkNotebook *notebook, void gtk_notebook_set_tab_label_text (GtkNotebook *notebook, GtkWidget *child, - const gchar *tab_text) + const char *tab_text) { GtkWidget *tab_label = NULL; @@ -6503,7 +6503,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook, * widget is not a #GtkLabel. The string is owned by the widget and must not be * freed. */ -const gchar * +const char * gtk_notebook_get_tab_label_text (GtkNotebook *notebook, GtkWidget *child) { @@ -6605,7 +6605,7 @@ gtk_notebook_set_menu_label (GtkNotebook *notebook, void gtk_notebook_set_menu_label_text (GtkNotebook *notebook, GtkWidget *child, - const gchar *menu_text) + const char *menu_text) { GtkWidget *menu_label = NULL; @@ -6633,7 +6633,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook, * widget is not a #GtkLabel. The string is owned by the widget and must not be * freed. */ -const gchar * +const char * gtk_notebook_get_menu_label_text (GtkNotebook *notebook, GtkWidget *child) { @@ -6759,7 +6759,7 @@ gtk_notebook_reorder_child (GtkNotebook *notebook, */ void gtk_notebook_set_group_name (GtkNotebook *notebook, - const gchar *group_name) + const char *group_name) { GQuark group; @@ -6783,7 +6783,7 @@ gtk_notebook_set_group_name (GtkNotebook *notebook, * * Returns: (nullable) (transfer none): the group name, or %NULL if none is set */ -const gchar * +const char * gtk_notebook_get_group_name (GtkNotebook *notebook) { g_return_val_if_fail (GTK_IS_NOTEBOOK (notebook), NULL); diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 9d869fe5f8..d02e384e74 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -101,9 +101,9 @@ void gtk_notebook_remove_page (GtkNotebook *notebook, GDK_AVAILABLE_IN_ALL void gtk_notebook_set_group_name (GtkNotebook *notebook, - const gchar *group_name); + const char *group_name); GDK_AVAILABLE_IN_ALL -const gchar *gtk_notebook_get_group_name (GtkNotebook *notebook); +const char *gtk_notebook_get_group_name (GtkNotebook *notebook); @@ -177,9 +177,9 @@ void gtk_notebook_set_tab_label (GtkNotebook *notebook, GDK_AVAILABLE_IN_ALL void gtk_notebook_set_tab_label_text (GtkNotebook *notebook, GtkWidget *child, - const gchar *tab_text); + const char *tab_text); GDK_AVAILABLE_IN_ALL -const gchar * gtk_notebook_get_tab_label_text (GtkNotebook *notebook, +const char * gtk_notebook_get_tab_label_text (GtkNotebook *notebook, GtkWidget *child); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_notebook_get_menu_label (GtkNotebook *notebook, @@ -191,10 +191,10 @@ void gtk_notebook_set_menu_label (GtkNotebook *notebook, GDK_AVAILABLE_IN_ALL void gtk_notebook_set_menu_label_text (GtkNotebook *notebook, GtkWidget *child, - const gchar *menu_text); + const char *menu_text); GDK_AVAILABLE_IN_ALL -const gchar * gtk_notebook_get_menu_label_text (GtkNotebook *notebook, - GtkWidget *child); +const char * gtk_notebook_get_menu_label_text (GtkNotebook *notebook, + GtkWidget *child); GDK_AVAILABLE_IN_ALL void gtk_notebook_reorder_child (GtkNotebook *notebook, GtkWidget *child, diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index 9444cfd96a..c1c641f012 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -374,7 +374,7 @@ static void gtk_overlay_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) { diff --git a/gtk/gtkpadcontroller.h b/gtk/gtkpadcontroller.h index 40a6a2fc20..c1163d13c3 100644 --- a/gtk/gtkpadcontroller.h +++ b/gtk/gtkpadcontroller.h @@ -90,8 +90,8 @@ void gtk_pad_controller_set_action (GtkPadController *controller, GtkPadActionType type, int index, int mode, - const gchar *label, - const gchar *action_name); + const char *label, + const char *action_name); G_END_DECLS diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c index b84e7e21e3..94f7748785 100644 --- a/gtk/gtkpagesetup.c +++ b/gtk/gtkpagesetup.c @@ -502,7 +502,7 @@ gtk_page_setup_get_page_height (GtkPageSetup *setup, */ gboolean gtk_page_setup_load_file (GtkPageSetup *setup, - const gchar *file_name, + const char *file_name, GError **error) { gboolean retval = FALSE; @@ -534,7 +534,7 @@ gtk_page_setup_load_file (GtkPageSetup *setup, * Returns: the restored #GtkPageSetup */ GtkPageSetup * -gtk_page_setup_new_from_file (const gchar *file_name, +gtk_page_setup_new_from_file (const char *file_name, GError **error) { GtkPageSetup *setup = gtk_page_setup_new (); @@ -585,7 +585,7 @@ string_to_enum (GType type, gboolean gtk_page_setup_load_key_file (GtkPageSetup *setup, GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error) { GtkPaperSize *paper_size; @@ -671,7 +671,7 @@ out: */ GtkPageSetup * gtk_page_setup_new_from_key_file (GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error) { GtkPageSetup *setup = gtk_page_setup_new (); @@ -756,7 +756,7 @@ enum_to_string (GType type, void gtk_page_setup_to_key_file (GtkPageSetup *setup, GKeyFile *key_file, - const gchar *group_name) + const char *group_name) { GtkPaperSize *paper_size; char *orientation; diff --git a/gtk/gtkpagesetup.h b/gtk/gtkpagesetup.h index a8a7f3e344..7c081e1cd2 100644 --- a/gtk/gtkpagesetup.h +++ b/gtk/gtkpagesetup.h @@ -103,7 +103,7 @@ gdouble gtk_page_setup_get_page_height (GtkPageSetup *setup, /* Saving and restoring page setup */ GDK_AVAILABLE_IN_ALL -GtkPageSetup *gtk_page_setup_new_from_file (const gchar *file_name, +GtkPageSetup *gtk_page_setup_new_from_file (const char *file_name, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_page_setup_load_file (GtkPageSetup *setup, @@ -115,17 +115,17 @@ gboolean gtk_page_setup_to_file (GtkPageSetup *setup, GError **error); GDK_AVAILABLE_IN_ALL GtkPageSetup *gtk_page_setup_new_from_key_file (GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_page_setup_load_key_file (GtkPageSetup *setup, GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error); GDK_AVAILABLE_IN_ALL void gtk_page_setup_to_key_file (GtkPageSetup *setup, GKeyFile *key_file, - const gchar *group_name); + const char *group_name); GDK_AVAILABLE_IN_ALL GVariant *gtk_page_setup_to_gvariant (GtkPageSetup *setup); diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index b45913dc3d..d641151b95 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -118,7 +118,7 @@ static void paper_size_changed (GtkDropDown *combo_ static void load_print_backends (GtkPageSetupUnixDialog *dialog); -static const gchar common_paper_sizes[][16] = { +static const char common_paper_sizes[][16] = { "na_letter", "na_legal", "iso_a4", @@ -601,13 +601,13 @@ printer_changed_callback (GtkDropDown *combo_box, /* We do this munging because we don't want to show zero digits after the decimal point, and not to many such digits if they are nonzero. I wish printf let you specify max precision for %f... */ -static gchar * +static char * double_to_string (gdouble d, GtkUnit unit) { - gchar *val, *p; + char *val, *p; struct lconv *locale_data; - const gchar *decimal_point; + const char *decimal_point; int decimal_point_len; locale_data = localeconv (); @@ -658,10 +658,10 @@ paper_size_changed (GtkDropDown *combo_box, GtkPageSetup *page_setup, *last_page_setup; guint selected; GtkUnit unit; - gchar *str, *w, *h; - gchar *top, *bottom, *left, *right; + char *str, *w, *h; + char *top, *bottom, *left, *right; GtkLabel *label; - const gchar *unit_str; + const char *unit_str; label = GTK_LABEL (dialog->paper_size_label); @@ -764,7 +764,7 @@ paper_size_changed (GtkDropDown *combo_box, * Returns: the new #GtkPageSetupUnixDialog */ GtkWidget * -gtk_page_setup_unix_dialog_new (const gchar *title, +gtk_page_setup_unix_dialog_new (const char *title, GtkWindow *parent) { GtkWidget *result; @@ -858,7 +858,7 @@ gtk_page_setup_unix_dialog_get_page_setup (GtkPageSetupUnixDialog *dialog) static gboolean set_active_printer (GtkPageSetupUnixDialog *dialog, - const gchar *printer_name) + const char *printer_name) { GtkTreeModel *model; GtkTreeIter iter; @@ -903,7 +903,7 @@ void gtk_page_setup_unix_dialog_set_print_settings (GtkPageSetupUnixDialog *dialog, GtkPrintSettings *print_settings) { - const gchar *format_for_printer; + const char *format_for_printer; if (dialog->print_settings == print_settings) return; diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h index 06cee9dc32..9d8f6047fb 100644 --- a/gtk/gtkpagesetupunixdialog.h +++ b/gtk/gtkpagesetupunixdialog.h @@ -37,7 +37,7 @@ typedef struct _GtkPageSetupUnixDialog GtkPageSetupUnixDialog; GDK_AVAILABLE_IN_ALL GType gtk_page_setup_unix_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_page_setup_unix_dialog_new (const gchar *title, +GtkWidget * gtk_page_setup_unix_dialog_new (const char *title, GtkWindow *parent); GDK_AVAILABLE_IN_ALL void gtk_page_setup_unix_dialog_set_page_setup (GtkPageSetupUnixDialog *dialog, diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 7c6d07ab4d..a930450e64 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -785,7 +785,7 @@ static void gtk_paned_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { GtkPaned *self = GTK_PANED (buildable); diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c index bce931cdf0..f8b0a54866 100644 --- a/gtk/gtkpango.c +++ b/gtk/gtkpango.c @@ -31,7 +31,7 @@ static AtkAttributeSet * add_attribute (AtkAttributeSet *attributes, AtkTextAttribute attr, - const gchar *value) + const char *value) { AtkAttribute *at; @@ -78,7 +78,7 @@ _gtk_pango_get_default_attributes (AtkAttributeSet *attributes, font = pango_context_get_font_description (context); if (font) { - gchar buf[60]; + char buf[60]; attributes = add_attribute (attributes, ATK_TEXT_ATTR_STYLE, atk_text_attribute_get_value (ATK_TEXT_ATTR_STYLE, pango_font_description_get_style (font))); @@ -183,8 +183,8 @@ _gtk_pango_get_run_attributes (AtkAttributeSet *attributes, int index, start_index, end_index; gboolean is_next; glong len; - const gchar *text; - gchar *value; + const char *text; + char *value; text = pango_layout_get_text (layout); len = g_utf8_strlen (text, -1); @@ -526,7 +526,7 @@ pango_layout_get_line_before (PangoLayout *layout, PangoLayoutIter *iter; PangoLayoutLine *line, *prev_line = NULL, *prev_prev_line = NULL; int index, start_index, end_index; - const gchar *text; + const char *text; gboolean found = FALSE; text = pango_layout_get_text (layout); @@ -599,7 +599,7 @@ pango_layout_get_line_at (PangoLayout *layout, PangoLayoutIter *iter; PangoLayoutLine *line, *prev_line = NULL; int index, start_index, end_index; - const gchar *text; + const char *text; gboolean found = FALSE; text = pango_layout_get_text (layout); @@ -663,7 +663,7 @@ pango_layout_get_line_after (PangoLayout *layout, PangoLayoutIter *iter; PangoLayoutLine *line, *prev_line = NULL; int index, start_index, end_index; - const gchar *text; + const char *text; gboolean found = FALSE; text = pango_layout_get_text (layout); @@ -743,14 +743,14 @@ pango_layout_get_line_after (PangoLayout *layout, * Returns: a newly allocated string containing a slice of text * from layout. Free with g_free(). */ -gchar * +char * _gtk_pango_get_text_before (PangoLayout *layout, AtkTextBoundary boundary_type, int offset, int *start_offset, int *end_offset) { - const gchar *text; + const char *text; int start, end; const PangoLogAttr *attrs; int n_attrs; @@ -848,14 +848,14 @@ _gtk_pango_get_text_before (PangoLayout *layout, * Returns: a newly allocated string containing a slice of text * from layout. Free with g_free(). */ -gchar * +char * _gtk_pango_get_text_after (PangoLayout *layout, AtkTextBoundary boundary_type, int offset, int *start_offset, int *end_offset) { - const gchar *text; + const char *text; int start, end; const PangoLogAttr *attrs; int n_attrs; @@ -959,14 +959,14 @@ _gtk_pango_get_text_after (PangoLayout *layout, * Returns: a newly allocated string containing a slice of text * from layout. Free with g_free(). */ -gchar * +char * _gtk_pango_get_text_at (PangoLayout *layout, AtkTextBoundary boundary_type, int offset, int *start_offset, int *end_offset) { - const gchar *text; + const char *text; int start, end; const PangoLogAttr *attrs; int n_attrs; diff --git a/gtk/gtkpango.h b/gtk/gtkpango.h index 6bffb9223d..1f60925a98 100644 --- a/gtk/gtkpango.h +++ b/gtk/gtkpango.h @@ -41,17 +41,17 @@ AtkAttributeSet *_gtk_pango_get_run_attributes (AtkAttributeSet *attributes, int *start_offset, int *end_offset); -gchar *_gtk_pango_get_text_before (PangoLayout *layout, +char *_gtk_pango_get_text_before (PangoLayout *layout, AtkTextBoundary boundary_type, int offset, int *start_offset, int *end_offset); -gchar *_gtk_pango_get_text_at (PangoLayout *layout, +char *_gtk_pango_get_text_at (PangoLayout *layout, AtkTextBoundary boundary_type, int offset, int *start_offset, int *end_offset); -gchar *_gtk_pango_get_text_after (PangoLayout *layout, +char *_gtk_pango_get_text_after (PangoLayout *layout, AtkTextBoundary boundary_type, int offset, int *start_offset, @@ -63,7 +63,7 @@ PangoAttrList *_gtk_pango_attr_list_merge (PangoAttrList *into, gboolean gtk_buildable_attribute_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 0144425fc5..7dbddd65af 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -64,9 +64,9 @@ struct _GtkPaperSize const PaperInfo *info; /* If these are not set we fall back to info */ - gchar *name; - gchar *display_name; - gchar *ppd_name; + char *name; + char *display_name; + char *ppd_name; gdouble width, height; /* Stored in mm */ gboolean is_custom; @@ -78,7 +78,7 @@ G_DEFINE_BOXED_TYPE (GtkPaperSize, gtk_paper_size, gtk_paper_size_free) static const PaperInfo * -lookup_paper_info (const gchar *name) +lookup_paper_info (const char *name) { int lower = 0; int upper = G_N_ELEMENTS (standard_names_offsets) - 1; @@ -102,7 +102,7 @@ lookup_paper_info (const gchar *name) } static gboolean -parse_media_size (const gchar *size, +parse_media_size (const char *size, gdouble *width_mm, gdouble *height_mm) { @@ -143,8 +143,8 @@ parse_media_size (const gchar *size, } static gboolean -parse_full_media_size_name (const gchar *full_name, - gchar **name, +parse_full_media_size_name (const char *full_name, + char **name, gdouble *width_mm, gdouble *height_mm) { @@ -221,7 +221,7 @@ gtk_paper_size_new_from_info (const PaperInfo *info) * to free it */ GtkPaperSize * -gtk_paper_size_new (const gchar *name) +gtk_paper_size_new (const char *name) { GtkPaperSize *size; char *short_name; @@ -271,10 +271,10 @@ gtk_paper_size_new (const gchar *name) return size; } -static gchar * -improve_displayname (const gchar *name) +static char * +improve_displayname (const char *name) { - gchar *p, *p1, *p2, *s; + char *p, *p1, *p2, *s; p = strrchr (name, 'x'); if (p && p != name && @@ -311,8 +311,8 @@ improve_displayname (const gchar *name) * to free it */ GtkPaperSize * -gtk_paper_size_new_from_ppd (const gchar *ppd_name, - const gchar *ppd_display_name, +gtk_paper_size_new_from_ppd (const char *ppd_name, + const char *ppd_display_name, gdouble width, gdouble height) { @@ -390,16 +390,16 @@ gtk_paper_size_new_from_ppd (const gchar *ppd_name, * to free it */ GtkPaperSize * -gtk_paper_size_new_from_ipp (const gchar *ipp_name, +gtk_paper_size_new_from_ipp (const char *ipp_name, gdouble width, gdouble height) { GtkPaperSize *size; - const gchar *name = NULL; + const char *name = NULL; gboolean found = FALSE; float x_dimension; float y_dimension; - gchar *display_name = NULL; + char *display_name = NULL; int i; /* Find paper size according to its name */ @@ -477,8 +477,8 @@ gtk_paper_size_new_from_ipp (const gchar *ipp_name, * to free it */ GtkPaperSize * -gtk_paper_size_new_custom (const gchar *name, - const gchar *display_name, +gtk_paper_size_new_custom (const char *name, + const char *display_name, gdouble width, gdouble height, GtkUnit unit) @@ -621,7 +621,7 @@ gtk_paper_size_get_paper_sizes (gboolean include_custom) * * Returns: the name of @size */ -const gchar * +const char * gtk_paper_size_get_name (GtkPaperSize *size) { if (size->name) @@ -638,10 +638,10 @@ gtk_paper_size_get_name (GtkPaperSize *size) * * Returns: the human-readable name of @size */ -const gchar * +const char * gtk_paper_size_get_display_name (GtkPaperSize *size) { - const gchar *display_name; + const char *display_name; if (size->display_name) return size->display_name; @@ -661,7 +661,7 @@ gtk_paper_size_get_display_name (GtkPaperSize *size) * * Returns: the PPD name of @size */ -const gchar * +const char * gtk_paper_size_get_ppd_name (GtkPaperSize *size) { if (size->ppd_name) @@ -767,7 +767,7 @@ gtk_paper_size_set_size (GtkPaperSize *size, * Returns: the name of the default paper size. The string * is owned by GTK and should not be modified. */ -const gchar * +const char * gtk_paper_size_get_default (void) { char *locale, *freeme = NULL; @@ -857,7 +857,7 @@ gtk_paper_size_get_default_bottom_margin (GtkPaperSize *size, GtkUnit unit) { gdouble margin; - const gchar *name; + const char *name; margin = _gtk_print_convert_to_mm (0.25, GTK_UNIT_INCH); @@ -923,14 +923,14 @@ gtk_paper_size_get_default_right_margin (GtkPaperSize *size, */ GtkPaperSize * gtk_paper_size_new_from_key_file (GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error) { GtkPaperSize *paper_size = NULL; - gchar *name = NULL; - gchar *ppd_name = NULL; - gchar *display_name = NULL; - gchar *freeme = NULL; + char *name = NULL; + char *ppd_name = NULL; + char *display_name = NULL; + char *freeme = NULL; gdouble width, height; GError *err = NULL; @@ -1009,7 +1009,7 @@ out: void gtk_paper_size_to_key_file (GtkPaperSize *size, GKeyFile *key_file, - const gchar *group_name) + const char *group_name) { const char *name, *ppd_name, *display_name; diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h index eafe75a76e..04e7389fab 100644 --- a/gtk/gtkpapersize.h +++ b/gtk/gtkpapersize.h @@ -88,19 +88,19 @@ GDK_AVAILABLE_IN_ALL GType gtk_paper_size_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkPaperSize *gtk_paper_size_new (const gchar *name); +GtkPaperSize *gtk_paper_size_new (const char *name); GDK_AVAILABLE_IN_ALL -GtkPaperSize *gtk_paper_size_new_from_ppd (const gchar *ppd_name, - const gchar *ppd_display_name, +GtkPaperSize *gtk_paper_size_new_from_ppd (const char *ppd_name, + const char *ppd_display_name, gdouble width, gdouble height); GDK_AVAILABLE_IN_ALL -GtkPaperSize *gtk_paper_size_new_from_ipp (const gchar *ipp_name, +GtkPaperSize *gtk_paper_size_new_from_ipp (const char *ipp_name, gdouble width, gdouble height); GDK_AVAILABLE_IN_ALL -GtkPaperSize *gtk_paper_size_new_custom (const gchar *name, - const gchar *display_name, +GtkPaperSize *gtk_paper_size_new_custom (const char *name, + const char *display_name, gdouble width, gdouble height, GtkUnit unit); @@ -117,11 +117,11 @@ GList *gtk_paper_size_get_paper_sizes (gboolean include_custom); /* The width is always the shortest side, measure in mm */ GDK_AVAILABLE_IN_ALL -const gchar *gtk_paper_size_get_name (GtkPaperSize *size); +const char *gtk_paper_size_get_name (GtkPaperSize *size); GDK_AVAILABLE_IN_ALL -const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size); +const char *gtk_paper_size_get_display_name (GtkPaperSize *size); GDK_AVAILABLE_IN_ALL -const gchar *gtk_paper_size_get_ppd_name (GtkPaperSize *size); +const char *gtk_paper_size_get_ppd_name (GtkPaperSize *size); GDK_AVAILABLE_IN_ALL gdouble gtk_paper_size_get_width (GtkPaperSize *size, GtkUnit unit); @@ -153,16 +153,16 @@ gdouble gtk_paper_size_get_default_right_margin (GtkPaperSize *size, GtkUnit unit); GDK_AVAILABLE_IN_ALL -const gchar *gtk_paper_size_get_default (void); +const char *gtk_paper_size_get_default (void); GDK_AVAILABLE_IN_ALL GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error); GDK_AVAILABLE_IN_ALL void gtk_paper_size_to_key_file (GtkPaperSize *size, GKeyFile *key_file, - const gchar *group_name); + const char *group_name); GDK_AVAILABLE_IN_ALL GtkPaperSize *gtk_paper_size_new_from_gvariant (GVariant *variant); diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index d4f74d8016..c24b931e02 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -238,7 +238,7 @@ gtk_path_bar_init (GtkPathBar *path_bar) home = g_get_home_dir (); if (home != NULL) { - const gchar *desktop; + const char *desktop; path_bar->home_file = g_file_new_for_path (home); /* FIXME: Need file system backend specific way of getting the @@ -986,7 +986,7 @@ gtk_path_bar_update_button_appearance (GtkPathBar *path_bar, ButtonData *button_data, gboolean current_dir) { - const gchar *dir_name = get_dir_name (button_data); + const char *dir_name = get_dir_name (button_data); gtk_widget_remove_css_class (button_data->button, "text-button"); gtk_widget_remove_css_class (button_data->button, "image-button"); @@ -1217,7 +1217,7 @@ gtk_path_bar_get_info_callback (GObject *source, struct SetFileInfo *file_info = data; GFileInfo *info; ButtonData *button_data; - const gchar *display_name; + const char *display_name; gboolean is_hidden; info = g_file_query_info_finish (file, result, NULL); diff --git a/gtk/gtkpicture.h b/gtk/gtkpicture.h index b4076365c6..80f0334f0e 100644 --- a/gtk/gtkpicture.h +++ b/gtk/gtkpicture.h @@ -45,9 +45,9 @@ GtkWidget* gtk_picture_new_for_pixbuf (GdkPixbuf GDK_AVAILABLE_IN_ALL GtkWidget* gtk_picture_new_for_file (GFile *file); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new_for_filename (const gchar *filename); +GtkWidget* gtk_picture_new_for_filename (const char *filename); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_picture_new_for_resource (const gchar *resource_path); +GtkWidget* gtk_picture_new_for_resource (const char *resource_path); GDK_AVAILABLE_IN_ALL void gtk_picture_set_paintable (GtkPicture *self, @@ -61,10 +61,10 @@ GDK_AVAILABLE_IN_ALL GFile * gtk_picture_get_file (GtkPicture *self); GDK_AVAILABLE_IN_ALL void gtk_picture_set_filename (GtkPicture *self, - const gchar *filename); + const char *filename); GDK_AVAILABLE_IN_ALL void gtk_picture_set_resource (GtkPicture *self, - const gchar *resource_path); + const char *resource_path); GDK_AVAILABLE_IN_ALL void gtk_picture_set_pixbuf (GtkPicture *self, GdkPixbuf *pixbuf); diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c index 03a5cf05e7..a0f3a9c070 100644 --- a/gtk/gtkplacessidebar.c +++ b/gtk/gtkplacessidebar.c @@ -142,7 +142,7 @@ struct _GtkPlacesSidebar { GtkWidget *rename_entry; GtkWidget *rename_button; GtkWidget *rename_error; - gchar *rename_uri; + char *rename_uri; gulong trash_monitor_changed_id; GtkWidget *trash_row; @@ -166,7 +166,7 @@ struct _GtkPlacesSidebar { GDBusProxy *hostnamed_proxy; GCancellable *hostnamed_cancellable; - gchar *hostname; + char *hostname; GtkPlacesOpenFlags open_flags; @@ -188,8 +188,8 @@ struct _GtkPlacesSidebarClass { GFile *location, GtkPlacesOpenFlags open_flags); void (* show_error_message) (GtkPlacesSidebar *sidebar, - const gchar *primary, - const gchar *secondary); + const char *primary, + const char *secondary); GdkDragAction (* drag_action_requested) (GtkPlacesSidebar *sidebar, GFile *dest_file, GSList *source_file_list); @@ -310,8 +310,8 @@ emit_open_location (GtkPlacesSidebar *sidebar, static void emit_show_error_message (GtkPlacesSidebar *sidebar, - const gchar *primary, - const gchar *secondary) + const char *primary, + const char *secondary) { g_signal_emit (sidebar, places_sidebar_signals[SHOW_ERROR_MESSAGE], 0, primary, secondary); @@ -411,10 +411,10 @@ static GtkWidget* add_place (GtkPlacesSidebar *sidebar, GtkPlacesSidebarPlaceType place_type, GtkPlacesSidebarSectionType section_type, - const gchar *name, + const char *name, GIcon *start_icon, GIcon *end_icon, - const gchar *uri, + const char *uri, GDrive *drive, GVolume *volume, GMount *mount, @@ -424,7 +424,7 @@ add_place (GtkPlacesSidebar *sidebar, gpointer *cloud_provider_account, #endif const int index, - const gchar *tooltip) + const char *tooltip) { gboolean show_eject, show_unmount; gboolean show_eject_button; @@ -524,7 +524,7 @@ recent_files_setting_is_enabled (GtkPlacesSidebar *sidebar) static gboolean recent_scheme_is_supported (void) { - const gchar * const *supported; + const char * const *supported; supported = g_vfs_get_supported_uri_schemes (g_vfs_get_default ()); if (supported != NULL) @@ -542,11 +542,11 @@ should_show_recent (GtkPlacesSidebar *sidebar) } static gboolean -path_is_home_dir (const gchar *path) +path_is_home_dir (const char *path) { GFile *home_dir; GFile *location; - const gchar *home_path; + const char *home_path; gboolean res; home_path = g_get_home_dir (); @@ -566,7 +566,7 @@ path_is_home_dir (const gchar *path) static void open_home (GtkPlacesSidebar *sidebar) { - const gchar *home_path; + const char *home_path; GFile *home_dir; home_path = g_get_home_dir (); @@ -588,12 +588,12 @@ add_special_dirs (GtkPlacesSidebar *sidebar) dirs = NULL; for (index = 0; index < G_USER_N_DIRECTORIES; index++) { - const gchar *path; + const char *path; GFile *root; GIcon *start_icon; - gchar *name; - gchar *mount_uri; - gchar *tooltip; + char *name; + char *mount_uri; + char *tooltip; if (!_gtk_bookmarks_manager_get_is_xdg_dir_builtin (index)) continue; @@ -630,16 +630,16 @@ add_special_dirs (GtkPlacesSidebar *sidebar) g_free (mount_uri); g_free (tooltip); - dirs = g_list_prepend (dirs, (gchar *)path); + dirs = g_list_prepend (dirs, (char *)path); } g_list_free (dirs); } -static gchar * +static char * get_home_directory_uri (void) { - const gchar *home; + const char *home; home = g_get_home_dir (); if (!home) @@ -648,10 +648,10 @@ get_home_directory_uri (void) return g_filename_to_uri (home, NULL, NULL); } -static gchar * +static char * get_desktop_directory_uri (void) { - const gchar *name; + const char *name; name = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP); @@ -668,7 +668,7 @@ static gboolean should_show_file (GtkPlacesSidebar *sidebar, GFile *file) { - gchar *path; + char *path; path = g_file_get_path (file); if (path) @@ -684,7 +684,7 @@ static gboolean file_is_shown (GtkPlacesSidebar *sidebar, GFile *file) { - gchar *uri; + char *uri; GtkWidget *row; gboolean found = FALSE; @@ -732,9 +732,9 @@ on_app_shortcuts_query_complete (GObject *source, if (info) { - gchar *uri; - gchar *tooltip; - const gchar *name; + char *uri; + char *tooltip; + const char *name; GIcon *start_icon; name = g_file_info_get_display_name (info); @@ -804,9 +804,9 @@ on_bookmark_query_info_complete (GObject *source, GFile *root = G_FILE (source); GError *error = NULL; GFileInfo *info; - gchar *bookmark_name; - gchar *mount_uri; - gchar *tooltip; + char *bookmark_name; + char *mount_uri; + char *tooltip; GIcon *start_icon; info = g_file_query_info_finish (root, result, &error); @@ -857,7 +857,7 @@ is_external_volume (GVolume *volume) { gboolean is_external; GDrive *drive; - gchar *id; + char *id; drive = g_volume_get_drive (volume); id = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_CLASS); @@ -897,10 +897,10 @@ create_cloud_provider_account_row (GtkPlacesSidebar *sidebar, { GIcon *end_icon; GIcon *start_icon; - const gchar *mount_path; - const gchar *name; - gchar *mount_uri; - gchar *tooltip; + const char *mount_path; + const char *name; + char *mount_uri; + char *tooltip; guint provider_account_status; start_icon = cloud_providers_account_get_icon (account); @@ -981,12 +981,12 @@ update_places (GtkPlacesSidebar *sidebar) GVolume *volume; GSList *bookmarks, *sl; int index; - gchar *original_uri, *name, *identifier; + char *original_uri, *name, *identifier; GtkListBoxRow *selected; - gchar *home_uri; + char *home_uri; GIcon *start_icon; GFile *root; - gchar *tooltip; + char *tooltip; GList *network_mounts, *network_volumes; GIcon *new_bookmark_icon; GtkWidget *child; @@ -1504,7 +1504,7 @@ check_valid_drop_target (GtkPlacesSidebar *sidebar, GtkPlacesSidebarPlaceType place_type; GtkPlacesSidebarSectionType section_type; gboolean valid = FALSE; - gchar *uri; + char *uri; GFile *dest_file; int drag_action; @@ -1658,7 +1658,7 @@ drag_motion_callback (GtkDropTarget *target, GdkDragAction action; GtkListBoxRow *row; GtkPlacesSidebarPlaceType place_type; - gchar *drop_target_uri = NULL; + char *drop_target_uri = NULL; int row_index; int row_placeholder_index; const GValue *value; @@ -1777,7 +1777,7 @@ reorder_bookmarks (GtkPlacesSidebar *sidebar, GtkSidebarRow *row, int new_position) { - gchar *uri; + char *uri; GFile *file; g_object_get (row, "uri", &uri, NULL); @@ -1825,7 +1825,7 @@ drag_drop_callback (GtkDropTarget *target, int target_order_index; GtkPlacesSidebarPlaceType target_place_type; GtkPlacesSidebarSectionType target_section_type; - gchar *target_uri; + char *target_uri; GtkListBoxRow *target_row; gboolean result; @@ -1961,8 +1961,8 @@ drive_start_from_bookmark_cb (GObject *source_object, { GtkPlacesSidebar *sidebar; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; sidebar = GTK_PLACES_SIDEBAR (user_data); @@ -1990,8 +1990,8 @@ volume_mount_cb (GObject *source_object, GtkPlacesSidebar *sidebar; GVolume *volume; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; GMount *mount; volume = G_VOLUME (source_object); @@ -2095,7 +2095,7 @@ open_volume (GtkSidebarRow *row, static void open_uri (GtkPlacesSidebar *sidebar, - const gchar *uri, + const char *uri, GtkPlacesOpenFlags open_flags) { GFile *location; @@ -2109,7 +2109,7 @@ static void open_row (GtkSidebarRow *row, GtkPlacesOpenFlags open_flags) { - gchar *uri; + char *uri; GDrive *drive; GVolume *volume; GtkPlacesSidebarPlaceType place_type; @@ -2176,8 +2176,8 @@ add_shortcut_cb (GSimpleAction *action, gpointer data) { GtkPlacesSidebar *sidebar = data; - gchar *uri; - gchar *name; + char *uri; + char *name; GFile *location; g_object_get (sidebar->context_row, @@ -2202,9 +2202,9 @@ rename_entry_changed (GtkEntry *entry, GtkPlacesSidebar *sidebar) { GtkPlacesSidebarPlaceType type; - gchar *name; - gchar *uri; - const gchar *new_name; + char *name; + char *uri; + const char *new_name; gboolean found = FALSE; GtkWidget *row; @@ -2248,7 +2248,7 @@ static void do_rename (GtkButton *button, GtkPlacesSidebar *sidebar) { - gchar *new_text; + char *new_text; GFile *file; new_text = g_strdup (gtk_editable_get_text (GTK_EDITABLE (sidebar->rename_entry))); @@ -2290,7 +2290,7 @@ create_rename_popover (GtkPlacesSidebar *sidebar) GtkWidget *entry; GtkWidget *button; GtkWidget *error; - gchar *str; + char *str; if (sidebar->rename_popover) return; @@ -2385,8 +2385,8 @@ setup_popover_shadowing (GtkWidget *popover) static void show_rename_popover (GtkSidebarRow *row) { - gchar *name; - gchar *uri; + char *name; + char *uri; GtkPlacesSidebar *sidebar; g_object_get (row, @@ -2444,7 +2444,7 @@ static void remove_bookmark (GtkSidebarRow *row) { GtkPlacesSidebarPlaceType type; - gchar *uri; + char *uri; GFile *file; GtkPlacesSidebar *sidebar; @@ -2510,8 +2510,8 @@ unmount_mount_cb (GObject *source_object, { if (error->code != G_IO_ERROR_FAILED_HANDLED) { - gchar *name; - gchar *primary; + char *name; + char *primary; name = g_mount_get_name (mount); primary = g_strdup_printf (_("Unable to unmount “%s”"), name); @@ -2679,8 +2679,8 @@ drive_stop_cb (GObject *source_object, { GtkPlacesSidebar *sidebar; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; sidebar = user_data; @@ -2708,8 +2708,8 @@ drive_eject_cb (GObject *source_object, { GtkPlacesSidebar *sidebar; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; sidebar = user_data; @@ -2737,8 +2737,8 @@ volume_eject_cb (GObject *source_object, { GtkPlacesSidebar *sidebar; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; sidebar = user_data; @@ -2766,8 +2766,8 @@ mount_eject_cb (GObject *source_object, { GtkPlacesSidebar *sidebar; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; sidebar = user_data; @@ -2914,8 +2914,8 @@ drive_poll_for_media_cb (GObject *source_object, { GtkPlacesSidebar *sidebar; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; sidebar = GTK_PLACES_SIDEBAR (user_data); @@ -2962,8 +2962,8 @@ drive_start_cb (GObject *source_object, { GtkPlacesSidebar *sidebar; GError *error; - gchar *primary; - gchar *name; + char *primary; + char *name; sidebar = GTK_PLACES_SIDEBAR (user_data); @@ -3550,7 +3550,7 @@ list_box_sort_func (GtkListBoxRow *row1, { GtkPlacesSidebarSectionType section_type_1, section_type_2; GtkPlacesSidebarPlaceType place_type_1, place_type_2; - gchar *label_1, *label_2; + char *label_1, *label_2; int index_1, index_2; int retval = 0; @@ -3636,7 +3636,7 @@ update_hostname (GtkPlacesSidebar *sidebar) { GVariant *variant; gsize len; - const gchar *hostname; + const char *hostname; if (sidebar->hostnamed_proxy == NULL) return; @@ -4478,8 +4478,8 @@ gtk_places_sidebar_set_location (GtkPlacesSidebar *sidebar, GFile *location) { GtkWidget *row; - gchar *row_uri; - gchar *uri; + char *row_uri; + char *uri; gboolean found = FALSE; g_return_if_fail (GTK_IS_PLACES_SIDEBAR (sidebar)); @@ -4548,7 +4548,7 @@ gtk_places_sidebar_get_location (GtkPlacesSidebar *sidebar) if (selected) { - gchar *uri; + char *uri; g_object_get (selected, "uri", &uri, NULL); file = g_file_new_for_uri (uri); @@ -4558,11 +4558,11 @@ gtk_places_sidebar_get_location (GtkPlacesSidebar *sidebar) return file; } -gchar * +char * gtk_places_sidebar_get_location_title (GtkPlacesSidebar *sidebar) { GtkListBoxRow *selected; - gchar *title; + char *title; g_return_val_if_fail (sidebar != NULL, NULL); @@ -4904,7 +4904,7 @@ gtk_places_sidebar_get_nth_bookmark (GtkPlacesSidebar *sidebar, row = gtk_widget_get_next_sibling (row)) { GtkPlacesSidebarPlaceType place_type; - gchar *uri; + char *uri; if (!GTK_IS_LIST_BOX_ROW (row)) continue; diff --git a/gtk/gtkplacessidebarprivate.h b/gtk/gtkplacessidebarprivate.h index 8d037a0d84..512ef23cf3 100644 --- a/gtk/gtkplacessidebarprivate.h +++ b/gtk/gtkplacessidebarprivate.h @@ -137,7 +137,7 @@ typedef enum { N_PLACES } GtkPlacesSidebarPlaceType; -gchar *gtk_places_sidebar_get_location_title (GtkPlacesSidebar *sidebar); +char *gtk_places_sidebar_get_location_title (GtkPlacesSidebar *sidebar); G_END_DECLS diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c index 7316bd1478..cdf88ae974 100644 --- a/gtk/gtkplacesview.c +++ b/gtk/gtkplacesview.c @@ -60,8 +60,8 @@ struct _GtkPlacesViewClass GtkPlacesOpenFlags open_flags); void (* show_error_message) (GtkPlacesSidebar *sidebar, - const gchar *primary, - const gchar *secondary); + const char *primary, + const char *secondary); }; struct _GtkPlacesView @@ -78,7 +78,7 @@ struct _GtkPlacesView GCancellable *cancellable; - gchar *search_query; + char *search_query; GtkWidget *actionbar; GtkWidget *address_entry; @@ -160,7 +160,7 @@ enum { LAST_SIGNAL }; -const gchar *unsupported_protocols [] = +const char *unsupported_protocols [] = { "file", "afc", "obex", "http", "trash", "burn", "computer", @@ -184,8 +184,8 @@ emit_open_location (GtkPlacesView *view, static void emit_show_error_message (GtkPlacesView *view, - gchar *primary_message, - gchar *secondary_message) + char *primary_message, + char *secondary_message) { g_signal_emit (view, places_view_signals[SHOW_ERROR_MESSAGE], 0, primary_message, secondary_message); @@ -202,8 +202,8 @@ server_list_load (GtkPlacesView *view) { GBookmarkFile *bookmarks; GError *error = NULL; - gchar *datadir; - gchar *filename; + char *datadir; + char *filename; bookmarks = g_bookmark_file_new (); datadir = g_build_filename (g_get_user_config_dir (), "gtk-4.0", NULL); @@ -262,7 +262,7 @@ server_list_load (GtkPlacesView *view) static void server_list_save (GBookmarkFile *bookmarks) { - gchar *filename; + char *filename; filename = g_build_filename (g_get_user_config_dir (), "gtk-4.0", "servers", NULL); g_bookmark_file_to_file (bookmarks, filename, NULL); @@ -276,8 +276,8 @@ server_list_add_server (GtkPlacesView *view, GBookmarkFile *bookmarks; GFileInfo *info; GError *error; - gchar *title; - gchar *uri; + char *title; + char *uri; error = NULL; bookmarks = server_list_load (view); @@ -308,7 +308,7 @@ server_list_add_server (GtkPlacesView *view, static void server_list_remove_server (GtkPlacesView *view, - const gchar *uri) + const char *uri) { GBookmarkFile *bookmarks; @@ -489,7 +489,7 @@ is_external_volume (GVolume *volume) { gboolean is_external; GDrive *drive; - gchar *id; + char *id; drive = g_volume_get_drive (volume); id = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_CLASS); @@ -510,7 +510,7 @@ is_external_volume (GVolume *volume) typedef struct { - gchar *uri; + char *uri; GtkPlacesView *view; } RemoveServerData; @@ -527,7 +527,7 @@ populate_servers (GtkPlacesView *view) { GBookmarkFile *server_list; GtkWidget *child; - gchar **uris; + char **uris; gsize num_uris; int i; @@ -561,8 +561,8 @@ populate_servers (GtkPlacesView *view) GtkWidget *grid; GtkWidget *button; GtkWidget *label; - gchar *name; - gchar *dup_uri; + char *name; + char *dup_uri; name = g_bookmark_file_get_title (server_list, uris[i], NULL); dup_uri = g_strdup (uris[i]); @@ -706,9 +706,9 @@ add_volume (GtkPlacesView *view, GMount *mount; GFile *root; GIcon *icon; - gchar *identifier; - gchar *name; - gchar *path; + char *identifier; + char *name; + char *path; if (is_external_volume (volume)) return; @@ -754,10 +754,10 @@ add_mount (GtkPlacesView *view, gboolean is_network; GFile *root; GIcon *icon; - gchar *name; - gchar *path; - gchar *uri; - gchar *schema; + char *name; + char *path; + char *uri; + char *schema; icon = g_mount_get_icon (mount); name = g_mount_get_name (mount); @@ -814,8 +814,8 @@ static void add_file (GtkPlacesView *view, GFile *file, GIcon *icon, - const gchar *display_name, - const gchar *path, + const char *display_name, + const char *path, gboolean is_network) { GtkWidget *row; @@ -939,10 +939,10 @@ populate_networks (GtkPlacesView *view, GList *l; GFile *file; GFile *activatable_file; - gchar *uri; + char *uri; GFileType type; GIcon *icon; - gchar *display_name; + char *display_name; for (l = detected_networks; l != NULL; l = l->next) { @@ -1044,7 +1044,7 @@ static void fetch_networks (GtkPlacesView *view) { GFile *network_file; - const gchar * const *supported_uris; + const char * const *supported_uris; gboolean found; supported_uris = g_vfs_get_supported_uri_schemes (g_vfs_get_default ()); @@ -1565,8 +1565,8 @@ unmount_cb (GtkWidget *widget, static void attach_protocol_row_to_grid (GtkGrid *grid, - const gchar *protocol_name, - const gchar *protocol_prefix) + const char *protocol_name, + const char *protocol_prefix) { GtkWidget *name_label; GtkWidget *prefix_label; @@ -1583,7 +1583,7 @@ attach_protocol_row_to_grid (GtkGrid *grid, static void populate_available_protocols_grid (GtkGrid *grid) { - const gchar* const *supported_protocols; + const char * const *supported_protocols; gboolean has_any = FALSE; supported_protocols = g_vfs_get_supported_uri_schemes (g_vfs_get_default ()); @@ -1830,7 +1830,7 @@ on_eject_button_clicked (GtkWidget *widget, static void on_connect_button_clicked (GtkPlacesView *view) { - const gchar *uri; + const char *uri; GFile *file; file = NULL; @@ -1863,8 +1863,8 @@ on_connect_button_clicked (GtkPlacesView *view) static void on_address_entry_text_changed (GtkPlacesView *view) { - const gchar* const *supported_protocols; - gchar *address, *scheme; + const char * const *supported_protocols; + char *address, *scheme; gboolean supported; supported = FALSE; @@ -1918,7 +1918,7 @@ on_recent_servers_listbox_row_activated (GtkPlacesView *view, GtkPlacesViewRow *row, GtkWidget *listbox) { - gchar *uri; + char *uri; uri = g_object_get_data (G_OBJECT (row), "uri"); @@ -1943,8 +1943,8 @@ listbox_filter_func (GtkListBoxRow *row, gboolean is_placeholder; gboolean retval; gboolean searching; - gchar *name; - gchar *path; + char *name; + char *path; retval = FALSE; searching = view->search_query && view->search_query[0] != '\0'; @@ -1992,7 +1992,7 @@ listbox_header_func (GtkListBoxRow *row, gpointer user_data) { gboolean row_is_network; - gchar *text; + char *text; text = NULL; row_is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-network")); @@ -2074,8 +2074,8 @@ listbox_sort_func (GtkListBoxRow *row1, { gboolean row1_is_network; gboolean row2_is_network; - gchar *path1; - gchar *path2; + char *path1; + char *path2; gboolean *is_placeholder1; gboolean *is_placeholder2; int retval; @@ -2443,7 +2443,7 @@ gtk_places_view_get_open_flags (GtkPlacesView *view) * * Returns: (transfer none): the current search query. */ -const gchar* +const char * gtk_places_view_get_search_query (GtkPlacesView *view) { g_return_val_if_fail (GTK_IS_PLACES_VIEW (view), NULL); @@ -2461,7 +2461,7 @@ gtk_places_view_get_search_query (GtkPlacesView *view) */ void gtk_places_view_set_search_query (GtkPlacesView *view, - const gchar *query_text) + const char *query_text) { g_return_if_fail (GTK_IS_PLACES_VIEW (view)); diff --git a/gtk/gtkplacesviewprivate.h b/gtk/gtkplacesviewprivate.h index 368649b1c5..90f954812d 100644 --- a/gtk/gtkplacesviewprivate.h +++ b/gtk/gtkplacesviewprivate.h @@ -44,9 +44,9 @@ GtkPlacesOpenFlags gtk_places_view_get_open_flags (GtkPlacesView void gtk_places_view_set_open_flags (GtkPlacesView *view, GtkPlacesOpenFlags flags); -const gchar* gtk_places_view_get_search_query (GtkPlacesView *view); +const char * gtk_places_view_get_search_query (GtkPlacesView *view); void gtk_places_view_set_search_query (GtkPlacesView *view, - const gchar *query_text); + const char *query_text); gboolean gtk_places_view_get_loading (GtkPlacesView *view); diff --git a/gtk/gtkplacesviewrow.c b/gtk/gtkplacesviewrow.c index cc23339311..8d8611bc1c 100644 --- a/gtk/gtkplacesviewrow.c +++ b/gtk/gtkplacesviewrow.c @@ -88,9 +88,9 @@ measure_available_space_finished (GObject *object, GError *error; guint64 free_space; guint64 total_space; - gchar *formatted_free_size; - gchar *formatted_total_size; - gchar *label; + char *formatted_free_size; + char *formatted_total_size; + char *label; guint plural_form; error = NULL; diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 90a19cb6e0..62ae3c902a 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -1831,7 +1831,7 @@ static void gtk_popover_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_popover_set_child (GTK_POPOVER (buildable), GTK_WIDGET (child)); diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c index 127683ea3e..2108f15535 100644 --- a/gtk/gtkpopovermenu.c +++ b/gtk/gtkpopovermenu.c @@ -577,7 +577,7 @@ gtk_popover_menu_new (void) */ void gtk_popover_menu_open_submenu (GtkPopoverMenu *popover, - const gchar *name) + const char *name) { GtkWidget *stack; diff --git a/gtk/gtkpopovermenuprivate.h b/gtk/gtkpopovermenuprivate.h index 215fa1ea99..6c3da47950 100644 --- a/gtk/gtkpopovermenuprivate.h +++ b/gtk/gtkpopovermenuprivate.h @@ -38,7 +38,7 @@ void gtk_popover_menu_add_submenu (GtkPopoverMenu *popover, GtkWidget *submenu, const char *name); void gtk_popover_menu_open_submenu (GtkPopoverMenu *popover, - const gchar *name); + const char *name); G_END_DECLS diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index d89cd02182..0dd6d5ddc7 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -132,8 +132,8 @@ gtk_print_backend_load_modules (void) { GList *result; GtkPrintBackend *backend; - gchar *setting; - gchar **backends; + char *setting; + char **backends; int i; GtkSettings *settings; GIOExtensionPoint *ep; @@ -201,7 +201,7 @@ static void request_password (GtkPrintBack gpointer auth_info_default, gpointer auth_info_display, gpointer auth_info_visible, - const gchar *prompt, + const char *prompt, gboolean can_store_auth_info); static void @@ -506,7 +506,7 @@ gtk_print_backend_printer_list_is_done (GtkPrintBackend *backend) GtkPrinter * gtk_print_backend_find_printer (GtkPrintBackend *backend, - const gchar *printer_name) + const char *printer_name) { GtkPrinter *result = NULL; guint i; @@ -544,8 +544,8 @@ gtk_print_backend_print_stream (GtkPrintBackend *backend, void gtk_print_backend_set_password (GtkPrintBackend *backend, - gchar **auth_info_required, - gchar **auth_info, + char **auth_info_required, + char **auth_info, gboolean store_auth_info) { g_return_if_fail (GTK_IS_PRINT_BACKEND (backend)); @@ -569,7 +569,7 @@ static void store_entry (GtkEntry *entry, gpointer user_data) { - gchar **data = (gchar **) user_data; + char **data = (char **) user_data; if (*data != NULL) { @@ -619,24 +619,24 @@ request_password (GtkPrintBackend *backend, gpointer auth_info_default, gpointer auth_info_display, gpointer auth_info_visible, - const gchar *prompt, + const char *prompt, gboolean can_store_auth_info) { GtkPrintBackendPrivate *priv = backend->priv; GtkWidget *dialog, *box, *main_box, *label, *icon, *vbox, *entry, *chkbtn; GtkWidget *focus = NULL; GtkWidget *content_area; - gchar *markup; + char *markup; int length; int i; - gchar **ai_required = (gchar **) auth_info_required; - gchar **ai_default = (gchar **) auth_info_default; - gchar **ai_display = (gchar **) auth_info_display; + char **ai_required = (char **) auth_info_required; + char **ai_default = (char **) auth_info_default; + char **ai_display = (char **) auth_info_display; gboolean *ai_visible = (gboolean *) auth_info_visible; priv->auth_info_required = g_strdupv (ai_required); length = g_strv_length (ai_required); - priv->auth_info = g_new0 (gchar *, length + 1); + priv->auth_info = g_new0 (char *, length + 1); priv->store_auth_info = FALSE; dialog = gtk_dialog_new_with_buttons ( _("Authentication"), NULL, GTK_DIALOG_MODAL, diff --git a/gtk/gtkprintbackendprivate.h b/gtk/gtkprintbackendprivate.h index 54d8347d1c..60bf250949 100644 --- a/gtk/gtkprintbackendprivate.h +++ b/gtk/gtkprintbackendprivate.h @@ -124,13 +124,13 @@ struct _GtkPrintBackendClass gpointer auth_info_default, gpointer auth_info_display, gpointer auth_info_visible, - const gchar *prompt, + const char *prompt, gboolean can_store_auth_info); /* not a signal */ void (*set_password) (GtkPrintBackend *backend, - gchar **auth_info_required, - gchar **auth_info, + char **auth_info_required, + char **auth_info, gboolean store_auth_info); gboolean (*printer_get_hard_margins_for_paper_size) (GtkPrinter *printer, @@ -154,7 +154,7 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_print_backend_printer_list_is_done (GtkPrintBackend *print_backend); GDK_AVAILABLE_IN_ALL GtkPrinter *gtk_print_backend_find_printer (GtkPrintBackend *print_backend, - const gchar *printer_name); + const char *printer_name); GDK_AVAILABLE_IN_ALL void gtk_print_backend_print_stream (GtkPrintBackend *print_backend, GtkPrintJob *job, @@ -168,8 +168,8 @@ GDK_AVAILABLE_IN_ALL void gtk_print_backend_destroy (GtkPrintBackend *print_backend); GDK_AVAILABLE_IN_ALL void gtk_print_backend_set_password (GtkPrintBackend *backend, - gchar **auth_info_required, - gchar **auth_info, + char **auth_info_required, + char **auth_info, gboolean can_store_auth_info); /* Backend-only functions for GtkPrintBackend */ @@ -213,19 +213,19 @@ void gtk_printer_set_is_default (GtkPrinter *printer, gboolean val); GDK_AVAILABLE_IN_ALL void gtk_printer_set_icon_name (GtkPrinter *printer, - const gchar *icon); + const char *icon); GDK_AVAILABLE_IN_ALL gboolean gtk_printer_set_job_count (GtkPrinter *printer, int count); GDK_AVAILABLE_IN_ALL gboolean gtk_printer_set_location (GtkPrinter *printer, - const gchar *location); + const char *location); GDK_AVAILABLE_IN_ALL gboolean gtk_printer_set_description (GtkPrinter *printer, - const gchar *description); + const char *description); GDK_AVAILABLE_IN_ALL gboolean gtk_printer_set_state_message (GtkPrinter *printer, - const gchar *message); + const char *message); void gtk_print_backends_init (void); diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c index b74a8c63c0..f10b3f7043 100644 --- a/gtk/gtkprinter.c +++ b/gtk/gtkprinter.c @@ -50,10 +50,10 @@ static void gtk_printer_finalize (GObject *object); struct _GtkPrinterPrivate { - gchar *name; - gchar *location; - gchar *description; - gchar *icon_name; + char *name; + char *location; + char *description; + char *icon_name; guint is_active : 1; guint is_paused : 1; @@ -65,7 +65,7 @@ struct _GtkPrinterPrivate guint accepts_pdf : 1; guint accepts_ps : 1; - gchar *state_message; + char *state_message; int job_count; GtkPrintBackend *backend; @@ -377,7 +377,7 @@ gtk_printer_get_property (GObject *object, * Returns: a new #GtkPrinter **/ GtkPrinter * -gtk_printer_new (const gchar *name, +gtk_printer_new (const char *name, GtkPrintBackend *backend, gboolean virtual_) { @@ -418,7 +418,7 @@ gtk_printer_get_backend (GtkPrinter *printer) * * Returns: the name of @printer */ -const gchar * +const char * gtk_printer_get_name (GtkPrinter *printer) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -436,7 +436,7 @@ gtk_printer_get_name (GtkPrinter *printer) * * Returns: the description of @printer */ -const gchar * +const char * gtk_printer_get_description (GtkPrinter *printer) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -448,7 +448,7 @@ gtk_printer_get_description (GtkPrinter *printer) gboolean gtk_printer_set_description (GtkPrinter *printer, - const gchar *description) + const char *description) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -472,7 +472,7 @@ gtk_printer_set_description (GtkPrinter *printer, * * Returns: the state message of @printer */ -const gchar * +const char * gtk_printer_get_state_message (GtkPrinter *printer) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -484,7 +484,7 @@ gtk_printer_get_state_message (GtkPrinter *printer) gboolean gtk_printer_set_state_message (GtkPrinter *printer, - const gchar *message) + const char *message) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -508,7 +508,7 @@ gtk_printer_set_state_message (GtkPrinter *printer, * * Returns: the location of @printer */ -const gchar * +const char * gtk_printer_get_location (GtkPrinter *printer) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -520,7 +520,7 @@ gtk_printer_get_location (GtkPrinter *printer) gboolean gtk_printer_set_location (GtkPrinter *printer, - const gchar *location) + const char *location) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -544,7 +544,7 @@ gtk_printer_set_location (GtkPrinter *printer, * * Returns: the icon name for @printer */ -const gchar * +const char * gtk_printer_get_icon_name (GtkPrinter *printer) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); @@ -556,7 +556,7 @@ gtk_printer_get_icon_name (GtkPrinter *printer) void gtk_printer_set_icon_name (GtkPrinter *printer, - const gchar *icon) + const char *icon) { GtkPrinterPrivate *priv = gtk_printer_get_instance_private (printer); diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h index dea92fcfd3..71a55bab46 100644 --- a/gtk/gtkprinter.h +++ b/gtk/gtkprinter.h @@ -81,21 +81,21 @@ typedef struct _GtkPrintBackend GtkPrintBackend; GDK_AVAILABLE_IN_ALL GType gtk_printer_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkPrinter *gtk_printer_new (const gchar *name, +GtkPrinter *gtk_printer_new (const char *name, GtkPrintBackend *backend, gboolean virtual_); GDK_AVAILABLE_IN_ALL GtkPrintBackend *gtk_printer_get_backend (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL -const gchar * gtk_printer_get_name (GtkPrinter *printer); +const char * gtk_printer_get_name (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL -const gchar * gtk_printer_get_state_message (GtkPrinter *printer); +const char * gtk_printer_get_state_message (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL -const gchar * gtk_printer_get_description (GtkPrinter *printer); +const char * gtk_printer_get_description (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL -const gchar * gtk_printer_get_location (GtkPrinter *printer); +const char * gtk_printer_get_location (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL -const gchar * gtk_printer_get_icon_name (GtkPrinter *printer); +const char * gtk_printer_get_icon_name (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL int gtk_printer_get_job_count (GtkPrinter *printer); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c index 800b76ed88..59cb79b113 100644 --- a/gtk/gtkprinteroptionwidget.c +++ b/gtk/gtkprinteroptionwidget.c @@ -53,7 +53,7 @@ static void deconstruct_widgets (GtkPrinterOptionWidget *widget); static void construct_widgets (GtkPrinterOptionWidget *widget); static void update_widgets (GtkPrinterOptionWidget *widget); -static gchar *trim_long_filename (const gchar *filename); +static char *trim_long_filename (const char *filename); struct GtkPrinterOptionWidgetPrivate { @@ -516,8 +516,8 @@ combo_box_new (void) static void combo_box_append (GtkWidget *combo, - const gchar *display_text, - const gchar *value) + const char *display_text, + const char *value) { GtkWidget *dropdown; GListModel *model; @@ -537,7 +537,7 @@ combo_box_append (GtkWidget *combo, static void combo_box_set (GtkWidget *combo, - const gchar *value) + const char *value) { GtkWidget *dropdown; GListModel *model; @@ -563,7 +563,7 @@ combo_box_set (GtkWidget *combo, } } -static gchar * +static char * combo_box_get (GtkWidget *combo, gboolean *custom) { GtkWidget *dropdown; @@ -739,13 +739,13 @@ filesave_choose_cb (GtkWidget *button, gtk_window_present (GTK_WINDOW (dialog)); } -static gchar * -filter_numeric (const gchar *val, +static char * +filter_numeric (const char *val, gboolean allow_neg, gboolean allow_dec, gboolean *changed_out) { - gchar *filtered_val; + char *filtered_val; int i, j; int len = strlen (val); gboolean dec_set = FALSE; @@ -789,8 +789,8 @@ combo_changed_cb (GtkWidget *combo, GtkPrinterOptionWidget *widget) { GtkPrinterOptionWidgetPrivate *priv = widget->priv; - gchar *value; - gchar *filtered_val = NULL; + char *value; + char *filtered_val = NULL; gboolean changed; gboolean custom = TRUE; @@ -849,7 +849,7 @@ entry_changed_cb (GtkWidget *entry, GtkPrinterOptionWidget *widget) { GtkPrinterOptionWidgetPrivate *priv = widget->priv; - const gchar *value; + const char *value; g_signal_handler_block (priv->source, priv->source_changed_handler); value = gtk_editable_get_text (GTK_EDITABLE (entry)); @@ -865,7 +865,7 @@ radio_changed_cb (GtkWidget *button, GtkPrinterOptionWidget *widget) { GtkPrinterOptionWidgetPrivate *priv = widget->priv; - gchar *value; + char *value; g_signal_handler_block (priv->source, priv->source_changed_handler); value = g_object_get_data (G_OBJECT (button), "value"); @@ -877,9 +877,9 @@ radio_changed_cb (GtkWidget *button, static void select_maybe (GtkWidget *widget, - const gchar *value) + const char *value) { - gchar *v = g_object_get_data (G_OBJECT (widget), "value"); + char *v = g_object_get_data (G_OBJECT (widget), "value"); if (strcmp (value, v) == 0) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); @@ -887,7 +887,7 @@ select_maybe (GtkWidget *widget, static void alternative_set (GtkWidget *box, - const gchar *value) + const char *value) { GtkWidget *child; @@ -899,8 +899,8 @@ alternative_set (GtkWidget *box, static GSList * alternative_append (GtkWidget *box, - const gchar *label, - const gchar *value, + const char *label, + const char *value, GtkPrinterOptionWidget *widget, GSList *group) { @@ -1071,17 +1071,17 @@ construct_widgets (GtkPrinterOptionWidget *widget) * If the filename exceeds FILENAME_LENGTH_MAX, then trim it and replace * the first three letters with three dots. */ -static gchar * -trim_long_filename (const gchar *filename) +static char * +trim_long_filename (const char *filename) { - const gchar *home; + const char *home; int len, offset; - gchar *result; + char *result; home = g_get_home_dir (); if (g_str_has_prefix (filename, home)) { - gchar *homeless_filename; + char *homeless_filename; offset = g_utf8_strlen (home, -1); len = g_utf8_strlen (filename, -1); @@ -1095,7 +1095,7 @@ trim_long_filename (const gchar *filename) len = g_utf8_strlen (result, -1); if (len > FILENAME_LENGTH_MAX) { - gchar *suffix; + char *suffix; suffix = g_utf8_substring (result, len - FILENAME_LENGTH_MAX, len); g_free (result); @@ -1153,8 +1153,8 @@ update_widgets (GtkPrinterOptionWidget *widget) } case GTK_PRINTER_OPTION_TYPE_FILESAVE: { - gchar *text; - gchar *filename; + char *text; + char *filename; filename = g_filename_from_uri (source->value, NULL, NULL); if (filename != NULL) @@ -1162,7 +1162,7 @@ update_widgets (GtkPrinterOptionWidget *widget) text = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL); if (text != NULL) { - gchar *short_filename; + char *short_filename; short_filename = trim_long_filename (text); gtk_button_set_label (GTK_BUTTON (priv->button), short_filename); @@ -1201,7 +1201,7 @@ gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *widget) return widget->priv->label; } -const gchar * +const char * gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget) { GtkPrinterOptionWidgetPrivate *priv = widget->priv; diff --git a/gtk/gtkprinteroptionwidget.h b/gtk/gtkprinteroptionwidget.h index 30f77f40f9..bb39fd25cb 100644 --- a/gtk/gtkprinteroptionwidget.h +++ b/gtk/gtkprinteroptionwidget.h @@ -67,7 +67,7 @@ gboolean gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidge GDK_AVAILABLE_IN_ALL GtkWidget *gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting); GDK_AVAILABLE_IN_ALL -const gchar *gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *setting); +const char *gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *setting); G_END_DECLS diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 2e6dfbca9c..50f3d68db8 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -62,7 +62,7 @@ struct _GtkPrintJob { GObject parent_instance; - gchar *title; + char *title; GIOChannel *spool_io; cairo_surface_t *surface; @@ -297,7 +297,7 @@ gtk_print_job_finalize (GObject *object) * Returns: a new #GtkPrintJob **/ GtkPrintJob * -gtk_print_job_new (const gchar *title, +gtk_print_job_new (const char *title, GtkPrinter *printer, GtkPrintSettings *settings, GtkPageSetup *page_setup) @@ -352,7 +352,7 @@ gtk_print_job_get_printer (GtkPrintJob *job) * * Returns: the title of @job */ -const gchar * +const char * gtk_print_job_get_title (GtkPrintJob *job) { g_return_val_if_fail (GTK_IS_PRINT_JOB (job), NULL); @@ -405,7 +405,7 @@ gtk_print_job_set_status (GtkPrintJob *job, **/ gboolean gtk_print_job_set_source_file (GtkPrintJob *job, - const gchar *filename, + const char *filename, GError **error) { GError *tmp_error; @@ -475,7 +475,7 @@ cairo_surface_t * gtk_print_job_get_surface (GtkPrintJob *job, GError **error) { - gchar *filename = NULL; + char *filename = NULL; gdouble width, height; GtkPaperSize *paper_size; int fd; diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index 25983ad602..cc300aa10e 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -53,7 +53,7 @@ typedef void (*GtkPrintJobCompleteFunc) (GtkPrintJob *print_job, GDK_AVAILABLE_IN_ALL GType gtk_print_job_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkPrintJob *gtk_print_job_new (const gchar *title, +GtkPrintJob *gtk_print_job_new (const char *title, GtkPrinter *printer, GtkPrintSettings *settings, GtkPageSetup *page_setup); @@ -62,12 +62,12 @@ GtkPrintSettings *gtk_print_job_get_settings (GtkPrintJob GDK_AVAILABLE_IN_ALL GtkPrinter *gtk_print_job_get_printer (GtkPrintJob *job); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_job_get_title (GtkPrintJob *job); +const char * gtk_print_job_get_title (GtkPrintJob *job); GDK_AVAILABLE_IN_ALL GtkPrintStatus gtk_print_job_get_status (GtkPrintJob *job); GDK_AVAILABLE_IN_ALL gboolean gtk_print_job_set_source_file (GtkPrintJob *job, - const gchar *filename, + const char *filename, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_print_job_set_source_fd (GtkPrintJob *job, diff --git a/gtk/gtkprintoperation-private.h b/gtk/gtkprintoperation-private.h index 15708a03d2..5f178fc4dc 100644 --- a/gtk/gtkprintoperation-private.h +++ b/gtk/gtkprintoperation-private.h @@ -36,16 +36,16 @@ struct _GtkPrintOperationPrivate GtkPrintOperationAction action; GtkPrintStatus status; GError *error; - gchar *status_string; + char *status_string; GtkPageSetup *default_page_setup; GtkPrintSettings *print_settings; - gchar *job_name; + char *job_name; int nr_of_pages; int nr_of_pages_to_print; int page_position; int current_page; GtkUnit unit; - gchar *export_filename; + char *export_filename; guint use_full_page : 1; guint track_print_status : 1; guint show_progress : 1; @@ -77,7 +77,7 @@ struct _GtkPrintOperationPrivate GtkNumberUpLayout manual_number_up_layout; GtkWidget *custom_widget; - gchar *custom_tab_label; + char *custom_tab_label; gpointer platform_data; GDestroyNotify free_platform_data; @@ -116,7 +116,7 @@ cairo_surface_t * _gtk_print_operation_platform_backend_create_preview_sur GtkPageSetup *page_setup, gdouble *dpi_x, gdouble *dpi_y, - gchar **target); + char **target); void _gtk_print_operation_platform_backend_resize_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, cairo_surface_t *surface); @@ -129,7 +129,7 @@ void _gtk_print_operation_platform_backend_preview_end_page void _gtk_print_operation_set_status (GtkPrintOperation *op, GtkPrintStatus status, - const gchar *string); + const char *string); /* GtkPrintContext private functions: */ diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index 1095d7440c..61391de98a 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -62,7 +62,7 @@ typedef struct typedef struct _PrinterFinder PrinterFinder; static void printer_finder_free (PrinterFinder *finder); -static void find_printer (const gchar *printer, +static void find_printer (const char *printer, GFunc func, gpointer data); @@ -147,14 +147,14 @@ op_unix_free (GtkPrintOperationUnix *op_unix) g_free (op_unix); } -static gchar * -shell_command_substitute_file (const gchar *cmd, - const gchar *pdf_filename, - const gchar *settings_filename, +static char * +shell_command_substitute_file (const char *cmd, + const char *pdf_filename, + const char *settings_filename, gboolean *pdf_filename_replaced, gboolean *settings_filename_replaced) { - const gchar *inptr, *start; + const char *inptr, *start; GString *final; g_return_val_if_fail (cmd != NULL, NULL); @@ -206,21 +206,21 @@ static void gtk_print_operation_unix_launch_preview (GtkPrintOperation *op, cairo_surface_t *surface, GtkWindow *parent, - const gchar *filename) + const char *filename) { GAppInfo *appinfo; GdkAppLaunchContext *context; - gchar *cmd; - gchar *preview_cmd; + char *cmd; + char *preview_cmd; GtkSettings *settings; GtkPrintSettings *print_settings = NULL; GtkPageSetup *page_setup; GKeyFile *key_file = NULL; - gchar *data = NULL; + char *data = NULL; gsize data_len; - gchar *settings_filename = NULL; - gchar *quoted_filename; - gchar *quoted_settings_filename; + char *settings_filename = NULL; + char *quoted_filename; + char *quoted_settings_filename; gboolean filename_used = FALSE; gboolean settings_used = FALSE; GdkDisplay *display; @@ -305,7 +305,7 @@ gtk_print_operation_unix_launch_preview (GtkPrintOperation *op, if (error != NULL) { - gchar* uri; + char * uri; g_warning ("Error launching preview: %s", error->message); @@ -431,7 +431,7 @@ get_print_dialog (GtkPrintOperation *op, { GtkPrintOperationPrivate *priv = op->priv; GtkWidget *pd, *label; - const gchar *custom_tab_label; + const char *custom_tab_label; pd = gtk_print_unix_dialog_new (NULL, parent); @@ -712,7 +712,7 @@ gtk_print_operation_unix_run_dialog_async (GtkPrintOperation *op, { GtkWidget *pd; PrintResponseData *rdata; - const gchar *printer_name; + const char *printer_name; rdata = g_new (PrintResponseData, 1); rdata->op = g_object_ref (op); @@ -784,9 +784,9 @@ gtk_print_operation_unix_create_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, gdouble *dpi_x, gdouble *dpi_y, - gchar **target) + char **target) { - gchar *filename; + char *filename; int fd; GtkPaperSize *paper_size; gdouble w, h; @@ -851,7 +851,7 @@ gtk_print_operation_unix_run_dialog (GtkPrintOperation *op, { GtkWidget *pd; PrintResponseData rdata; - const gchar *printer_name; + const char *printer_name; rdata.op = op; rdata.do_print = FALSE; @@ -1056,7 +1056,7 @@ struct _PrinterFinder gboolean found_printer; GFunc func; gpointer data; - gchar *printer_name; + char *printer_name; GList *backends; guint timeout_tag; GtkPrinter *printer; @@ -1205,7 +1205,7 @@ printer_finder_free (PrinterFinder *finder) } static void -find_printer (const gchar *printer, +find_printer (const char *printer, GFunc func, gpointer data) { @@ -1260,7 +1260,7 @@ void _gtk_print_operation_platform_backend_launch_preview (GtkPrintOperation *op, cairo_surface_t *surface, GtkWindow *parent, - const gchar *filename) + const char *filename) { if (gdk_should_use_portal ()) gtk_print_operation_portal_launch_preview (op, surface, parent, filename); @@ -1273,7 +1273,7 @@ _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation GtkPageSetup *page_setup, gdouble *dpi_x, gdouble *dpi_y, - gchar **target) + char **target) { return gtk_print_operation_unix_create_preview_surface (op, page_setup, dpi_x, dpi_y, target); } diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index ad430760d4..55c0a554fd 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -435,11 +435,11 @@ paper_size_to_win32 (GtkPaperSize *paper_size) return 0; } -static gchar* +static char * get_default_printer (void) { wchar_t *win32_printer_name = NULL; - gchar *printer_name = NULL; + char *printer_name = NULL; DWORD needed; GetDefaultPrinterW (NULL, &needed); @@ -1585,7 +1585,7 @@ gtk_print_operation_run_without_dialog (GtkPrintOperation *op, /* No printer selected. Get the system default printer and store * it in settings. */ - gchar *tmp_printer = get_default_printer (); + char *tmp_printer = get_default_printer (); if (!tmp_printer) { result = GTK_PRINT_OPERATION_RESULT_ERROR; @@ -1970,7 +1970,7 @@ void _gtk_print_operation_platform_backend_launch_preview (GtkPrintOperation *op, cairo_surface_t *surface, GtkWindow *parent, - const gchar *filename) + const char *filename) { HDC dc; HENHMETAFILE metafile; @@ -2012,7 +2012,7 @@ _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation GtkPageSetup *page_setup, gdouble *dpi_x, gdouble *dpi_y, - gchar **target) + char **target) { GtkPaperSize *paper_size; HDC metafile_dc; diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 1410eea5a0..5a43683afb 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -528,7 +528,7 @@ typedef struct GtkPrintContext *print_context; GtkWindow *parent; cairo_surface_t *surface; - gchar *filename; + char *filename; gboolean wait; PrintPagesData *pages_data; } PreviewOp; @@ -1520,7 +1520,7 @@ gtk_print_operation_get_print_settings (GtkPrintOperation *op) **/ void gtk_print_operation_set_job_name (GtkPrintOperation *op, - const gchar *job_name) + const char *job_name) { GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op); @@ -1690,10 +1690,10 @@ gtk_print_operation_set_track_print_status (GtkPrintOperation *op, void _gtk_print_operation_set_status (GtkPrintOperation *op, GtkPrintStatus status, - const gchar *string) + const char *string) { GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op); - static const gchar *status_strs[] = { + static const char *status_strs[] = { NC_("print operation status", "Initial state"), NC_("print operation status", "Preparing to print"), NC_("print operation status", "Generating data"), @@ -1758,7 +1758,7 @@ gtk_print_operation_get_status (GtkPrintOperation *op) * Returns: a string representation of the status * of the print operation **/ -const gchar * +const char * gtk_print_operation_get_status_string (GtkPrintOperation *op) { g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), ""); @@ -1855,7 +1855,7 @@ gtk_print_operation_set_allow_async (GtkPrintOperation *op, */ void gtk_print_operation_set_custom_tab_label (GtkPrintOperation *op, - const gchar *label) + const char *label) { GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op); @@ -1884,7 +1884,7 @@ gtk_print_operation_set_custom_tab_label (GtkPrintOperation *op, */ void gtk_print_operation_set_export_filename (GtkPrintOperation *op, - const gchar *filename) + const char *filename) { GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op); @@ -2231,7 +2231,7 @@ static void update_progress (PrintPagesData *data) { GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op); - gchar *text = NULL; + char *text = NULL; if (data->progress) { diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h index 4751290210..8055e57e31 100644 --- a/gtk/gtkprintoperation.h +++ b/gtk/gtkprintoperation.h @@ -234,7 +234,7 @@ GDK_AVAILABLE_IN_ALL GtkPrintSettings * gtk_print_operation_get_print_settings (GtkPrintOperation *op); GDK_AVAILABLE_IN_ALL void gtk_print_operation_set_job_name (GtkPrintOperation *op, - const gchar *job_name); + const char *job_name); GDK_AVAILABLE_IN_ALL void gtk_print_operation_set_n_pages (GtkPrintOperation *op, int n_pages); @@ -249,7 +249,7 @@ void gtk_print_operation_set_unit (GtkPrintOper GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_print_operation_set_export_filename (GtkPrintOperation *op, - const gchar *filename); + const char *filename); GDK_AVAILABLE_IN_ALL void gtk_print_operation_set_track_print_status (GtkPrintOperation *op, gboolean track_status); @@ -261,7 +261,7 @@ void gtk_print_operation_set_allow_async (GtkPrintOper gboolean allow_async); GDK_AVAILABLE_IN_ALL void gtk_print_operation_set_custom_tab_label (GtkPrintOperation *op, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL GtkPrintOperationResult gtk_print_operation_run (GtkPrintOperation *op, GtkPrintOperationAction action, @@ -273,7 +273,7 @@ void gtk_print_operation_get_error (GtkPrintOper GDK_AVAILABLE_IN_ALL GtkPrintStatus gtk_print_operation_get_status (GtkPrintOperation *op); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_operation_get_status_string (GtkPrintOperation *op); +const char * gtk_print_operation_get_status_string (GtkPrintOperation *op); GDK_AVAILABLE_IN_ALL gboolean gtk_print_operation_is_finished (GtkPrintOperation *op); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c index e0a1e9582f..261e2c74e2 100644 --- a/gtk/gtkprintsettings.c +++ b/gtk/gtkprintsettings.c @@ -158,9 +158,9 @@ gtk_print_settings_copy (GtkPrintSettings *other) * * Returns: the string value for @key */ -const gchar * +const char * gtk_print_settings_get (GtkPrintSettings *settings, - const gchar *key) + const char *key) { return g_hash_table_lookup (settings->hash, key); } @@ -175,8 +175,8 @@ gtk_print_settings_get (GtkPrintSettings *settings, */ void gtk_print_settings_set (GtkPrintSettings *settings, - const gchar *key, - const gchar *value) + const char *key, + const char *value) { if (value == NULL) gtk_print_settings_unset (settings, key); @@ -196,7 +196,7 @@ gtk_print_settings_set (GtkPrintSettings *settings, */ void gtk_print_settings_unset (GtkPrintSettings *settings, - const gchar *key) + const char *key) { g_hash_table_remove (settings->hash, key); } @@ -212,7 +212,7 @@ gtk_print_settings_unset (GtkPrintSettings *settings, */ gboolean gtk_print_settings_has_key (GtkPrintSettings *settings, - const gchar *key) + const char *key) { return gtk_print_settings_get (settings, key) != NULL; } @@ -233,9 +233,9 @@ gtk_print_settings_has_key (GtkPrintSettings *settings, **/ gboolean gtk_print_settings_get_bool (GtkPrintSettings *settings, - const gchar *key) + const char *key) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, key); if (g_strcmp0 (val, "true") == 0) @@ -261,10 +261,10 @@ gtk_print_settings_get_bool (GtkPrintSettings *settings, */ static gboolean gtk_print_settings_get_bool_with_default (GtkPrintSettings *settings, - const gchar *key, + const char *key, gboolean default_val) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, key); if (g_strcmp0 (val, "true") == 0) @@ -286,7 +286,7 @@ gtk_print_settings_get_bool_with_default (GtkPrintSettings *settings, */ void gtk_print_settings_set_bool (GtkPrintSettings *settings, - const gchar *key, + const char *key, gboolean value) { if (value) @@ -311,10 +311,10 @@ gtk_print_settings_set_bool (GtkPrintSettings *settings, */ gdouble gtk_print_settings_get_double_with_default (GtkPrintSettings *settings, - const gchar *key, + const char *key, gdouble def) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, key); if (val == NULL) @@ -334,7 +334,7 @@ gtk_print_settings_get_double_with_default (GtkPrintSettings *settings, */ gdouble gtk_print_settings_get_double (GtkPrintSettings *settings, - const gchar *key) + const char *key) { return gtk_print_settings_get_double_with_default (settings, key, 0.0); } @@ -349,10 +349,10 @@ gtk_print_settings_get_double (GtkPrintSettings *settings, */ void gtk_print_settings_set_double (GtkPrintSettings *settings, - const gchar *key, + const char *key, gdouble value) { - gchar buf[G_ASCII_DTOSTR_BUF_SIZE]; + char buf[G_ASCII_DTOSTR_BUF_SIZE]; g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE, value); gtk_print_settings_set (settings, key, buf); @@ -371,7 +371,7 @@ gtk_print_settings_set_double (GtkPrintSettings *settings, */ gdouble gtk_print_settings_get_length (GtkPrintSettings *settings, - const gchar *key, + const char *key, GtkUnit unit) { gdouble length = gtk_print_settings_get_double (settings, key); @@ -389,7 +389,7 @@ gtk_print_settings_get_length (GtkPrintSettings *settings, */ void gtk_print_settings_set_length (GtkPrintSettings *settings, - const gchar *key, + const char *key, gdouble value, GtkUnit unit) { @@ -410,10 +410,10 @@ gtk_print_settings_set_length (GtkPrintSettings *settings, */ int gtk_print_settings_get_int_with_default (GtkPrintSettings *settings, - const gchar *key, + const char *key, int def) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, key); if (val == NULL) @@ -433,7 +433,7 @@ gtk_print_settings_get_int_with_default (GtkPrintSettings *settings, */ int gtk_print_settings_get_int (GtkPrintSettings *settings, - const gchar *key) + const char *key) { return gtk_print_settings_get_int_with_default (settings, key, 0); } @@ -448,10 +448,10 @@ gtk_print_settings_get_int (GtkPrintSettings *settings, */ void gtk_print_settings_set_int (GtkPrintSettings *settings, - const gchar *key, + const char *key, int value) { - gchar buf[128]; + char buf[128]; g_sprintf (buf, "%d", value); gtk_print_settings_set (settings, key, buf); } @@ -481,7 +481,7 @@ gtk_print_settings_foreach (GtkPrintSettings *settings, * * Returns: the printer name */ -const gchar * +const char * gtk_print_settings_get_printer (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PRINTER); @@ -498,7 +498,7 @@ gtk_print_settings_get_printer (GtkPrintSettings *settings) */ void gtk_print_settings_set_printer (GtkPrintSettings *settings, - const gchar *printer) + const char *printer) { gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_PRINTER, printer); } @@ -515,7 +515,7 @@ gtk_print_settings_set_printer (GtkPrintSettings *settings, GtkPageOrientation gtk_print_settings_get_orientation (GtkPrintSettings *settings) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_ORIENTATION); @@ -545,7 +545,7 @@ void gtk_print_settings_set_orientation (GtkPrintSettings *settings, GtkPageOrientation orientation) { - const gchar *val; + const char *val; switch (orientation) { @@ -578,8 +578,8 @@ gtk_print_settings_set_orientation (GtkPrintSettings *settings, GtkPaperSize * gtk_print_settings_get_paper_size (GtkPrintSettings *settings) { - const gchar *val; - const gchar *name; + const char *val; + const char *name; gdouble w, h; val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PAPER_FORMAT); @@ -610,7 +610,7 @@ void gtk_print_settings_set_paper_size (GtkPrintSettings *settings, GtkPaperSize *paper_size) { - gchar *custom_name; + char *custom_name; if (paper_size == NULL) { @@ -814,7 +814,7 @@ gtk_print_settings_set_reverse (GtkPrintSettings *settings, GtkPrintDuplex gtk_print_settings_get_duplex (GtkPrintSettings *settings) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DUPLEX); @@ -841,7 +841,7 @@ void gtk_print_settings_set_duplex (GtkPrintSettings *settings, GtkPrintDuplex duplex) { - const gchar *str; + const char *str; switch (duplex) { @@ -871,7 +871,7 @@ gtk_print_settings_set_duplex (GtkPrintSettings *settings, GtkPrintQuality gtk_print_settings_get_quality (GtkPrintSettings *settings) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_QUALITY); @@ -901,7 +901,7 @@ void gtk_print_settings_set_quality (GtkPrintSettings *settings, GtkPrintQuality quality) { - const gchar *str; + const char *str; switch (quality) { @@ -934,7 +934,7 @@ gtk_print_settings_set_quality (GtkPrintSettings *settings, GtkPageSet gtk_print_settings_get_page_set (GtkPrintSettings *settings) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PAGE_SET); @@ -961,7 +961,7 @@ void gtk_print_settings_set_page_set (GtkPrintSettings *settings, GtkPageSet page_set) { - const gchar *str; + const char *str; switch (page_set) { @@ -995,7 +995,7 @@ gtk_print_settings_get_number_up_layout (GtkPrintSettings *settings) GtkTextDirection text_direction; GEnumClass *enum_class; GEnumValue *enum_value; - const gchar *val; + const char *val; g_return_val_if_fail (GTK_IS_PRINT_SETTINGS (settings), GTK_NUMBER_UP_LAYOUT_LEFT_TO_RIGHT_TOP_TO_BOTTOM); @@ -1258,7 +1258,7 @@ gtk_print_settings_set_scale (GtkPrintSettings *settings, GtkPrintPages gtk_print_settings_get_print_pages (GtkPrintSettings *settings) { - const gchar *val; + const char *val; val = gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PRINT_PAGES); @@ -1288,7 +1288,7 @@ void gtk_print_settings_set_print_pages (GtkPrintSettings *settings, GtkPrintPages pages) { - const gchar *str; + const char *str; switch (pages) { @@ -1325,8 +1325,8 @@ GtkPageRange * gtk_print_settings_get_page_ranges (GtkPrintSettings *settings, int *num_ranges) { - const gchar *val; - gchar **range_strs; + const char *val; + char **range_strs; GtkPageRange *ranges; int i, n; @@ -1350,7 +1350,7 @@ gtk_print_settings_get_page_ranges (GtkPrintSettings *settings, for (i = 0; i < n; i++) { int start, end; - gchar *str; + char *str; start = (int)strtol (range_strs[i], &str, 10); end = start; @@ -1416,7 +1416,7 @@ gtk_print_settings_set_page_ranges (GtkPrintSettings *settings, * * Returns: the default source */ -const gchar * +const char * gtk_print_settings_get_default_source (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DEFAULT_SOURCE); @@ -1431,7 +1431,7 @@ gtk_print_settings_get_default_source (GtkPrintSettings *settings) */ void gtk_print_settings_set_default_source (GtkPrintSettings *settings, - const gchar *default_source) + const char *default_source) { gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_DEFAULT_SOURCE, default_source); } @@ -1446,7 +1446,7 @@ gtk_print_settings_set_default_source (GtkPrintSettings *settings, * * Returns: the media type */ -const gchar * +const char * gtk_print_settings_get_media_type (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_MEDIA_TYPE); @@ -1463,7 +1463,7 @@ gtk_print_settings_get_media_type (GtkPrintSettings *settings) */ void gtk_print_settings_set_media_type (GtkPrintSettings *settings, - const gchar *media_type) + const char *media_type) { gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_MEDIA_TYPE, media_type); } @@ -1476,7 +1476,7 @@ gtk_print_settings_set_media_type (GtkPrintSettings *settings, * * Returns: the dithering that is used */ -const gchar * +const char * gtk_print_settings_get_dither (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DITHER); @@ -1491,7 +1491,7 @@ gtk_print_settings_get_dither (GtkPrintSettings *settings) */ void gtk_print_settings_set_dither (GtkPrintSettings *settings, - const gchar *dither) + const char *dither) { gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_DITHER, dither); } @@ -1504,7 +1504,7 @@ gtk_print_settings_set_dither (GtkPrintSettings *settings, * * Returns: the finishings */ -const gchar * +const char * gtk_print_settings_get_finishings (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_FINISHINGS); @@ -1519,7 +1519,7 @@ gtk_print_settings_get_finishings (GtkPrintSettings *settings) */ void gtk_print_settings_set_finishings (GtkPrintSettings *settings, - const gchar *finishings) + const char *finishings) { gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_FINISHINGS, finishings); } @@ -1532,7 +1532,7 @@ gtk_print_settings_set_finishings (GtkPrintSettings *settings, * * Returns: the output bin */ -const gchar * +const char * gtk_print_settings_get_output_bin (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_BIN); @@ -1547,7 +1547,7 @@ gtk_print_settings_get_output_bin (GtkPrintSettings *settings) */ void gtk_print_settings_set_output_bin (GtkPrintSettings *settings, - const gchar *output_bin) + const char *output_bin) { gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_BIN, output_bin); } @@ -1566,7 +1566,7 @@ gtk_print_settings_set_output_bin (GtkPrintSettings *settings, */ gboolean gtk_print_settings_load_file (GtkPrintSettings *settings, - const gchar *file_name, + const char *file_name, GError **error) { gboolean retval = FALSE; @@ -1599,7 +1599,7 @@ gtk_print_settings_load_file (GtkPrintSettings *settings, * Returns: the restored #GtkPrintSettings */ GtkPrintSettings * -gtk_print_settings_new_from_file (const gchar *file_name, +gtk_print_settings_new_from_file (const char *file_name, GError **error) { GtkPrintSettings *settings = gtk_print_settings_new (); @@ -1630,10 +1630,10 @@ gtk_print_settings_new_from_file (const gchar *file_name, gboolean gtk_print_settings_load_key_file (GtkPrintSettings *settings, GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error) { - gchar **keys; + char **keys; gsize n_keys, i; GError *err = NULL; @@ -1655,7 +1655,7 @@ gtk_print_settings_load_key_file (GtkPrintSettings *settings, for (i = 0 ; i < n_keys; ++i) { - gchar *value; + char *value; value = g_key_file_get_string (key_file, group_name, @@ -1689,7 +1689,7 @@ gtk_print_settings_load_key_file (GtkPrintSettings *settings, */ GtkPrintSettings * gtk_print_settings_new_from_key_file (GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error) { GtkPrintSettings *settings = gtk_print_settings_new (); @@ -1718,7 +1718,7 @@ gtk_print_settings_new_from_key_file (GKeyFile *key_file, */ gboolean gtk_print_settings_to_file (GtkPrintSettings *settings, - const gchar *file_name, + const char *file_name, GError **error) { GKeyFile *key_file; @@ -1751,12 +1751,12 @@ out: typedef struct { GKeyFile *key_file; - const gchar *group_name; + const char *group_name; } SettingsData; static void -add_value_to_key_file (const gchar *key, - const gchar *value, +add_value_to_key_file (const char *key, + const char *value, SettingsData *data) { g_key_file_set_string (data->key_file, data->group_name, key, value); @@ -1774,7 +1774,7 @@ add_value_to_key_file (const gchar *key, void gtk_print_settings_to_key_file (GtkPrintSettings *settings, GKeyFile *key_file, - const gchar *group_name) + const char *group_name) { SettingsData data; @@ -1793,8 +1793,8 @@ gtk_print_settings_to_key_file (GtkPrintSettings *settings, } static void -add_to_variant (const gchar *key, - const gchar *value, +add_to_variant (const char *key, + const char *value, gpointer data) { GVariantBuilder *builder = data; diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h index e019a54323..2b624c06ef 100644 --- a/gtk/gtkprintsettings.h +++ b/gtk/gtkprintsettings.h @@ -33,8 +33,8 @@ typedef struct _GtkPrintSettings GtkPrintSettings; #define GTK_PRINT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PRINT_SETTINGS, GtkPrintSettings)) #define GTK_IS_PRINT_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PRINT_SETTINGS)) -typedef void (*GtkPrintSettingsFunc) (const gchar *key, - const gchar *value, +typedef void (*GtkPrintSettingsFunc) (const char *key, + const char *value, gpointer user_data); typedef struct _GtkPageRange GtkPageRange; @@ -60,83 +60,83 @@ GDK_AVAILABLE_IN_ALL GtkPrintSettings *gtk_print_settings_copy (GtkPrintSettings *other); GDK_AVAILABLE_IN_ALL -GtkPrintSettings *gtk_print_settings_new_from_file (const gchar *file_name, +GtkPrintSettings *gtk_print_settings_new_from_file (const char *file_name, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_print_settings_load_file (GtkPrintSettings *settings, - const gchar *file_name, + const char *file_name, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_print_settings_to_file (GtkPrintSettings *settings, - const gchar *file_name, + const char *file_name, GError **error); GDK_AVAILABLE_IN_ALL GtkPrintSettings *gtk_print_settings_new_from_key_file (GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_print_settings_load_key_file (GtkPrintSettings *settings, GKeyFile *key_file, - const gchar *group_name, + const char *group_name, GError **error); GDK_AVAILABLE_IN_ALL void gtk_print_settings_to_key_file (GtkPrintSettings *settings, GKeyFile *key_file, - const gchar *group_name); + const char *group_name); GDK_AVAILABLE_IN_ALL gboolean gtk_print_settings_has_key (GtkPrintSettings *settings, - const gchar *key); + const char *key); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_settings_get (GtkPrintSettings *settings, - const gchar *key); +const char * gtk_print_settings_get (GtkPrintSettings *settings, + const char *key); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set (GtkPrintSettings *settings, - const gchar *key, - const gchar *value); + const char *key, + const char *value); GDK_AVAILABLE_IN_ALL void gtk_print_settings_unset (GtkPrintSettings *settings, - const gchar *key); + const char *key); GDK_AVAILABLE_IN_ALL void gtk_print_settings_foreach (GtkPrintSettings *settings, GtkPrintSettingsFunc func, gpointer user_data); GDK_AVAILABLE_IN_ALL gboolean gtk_print_settings_get_bool (GtkPrintSettings *settings, - const gchar *key); + const char *key); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_bool (GtkPrintSettings *settings, - const gchar *key, + const char *key, gboolean value); GDK_AVAILABLE_IN_ALL gdouble gtk_print_settings_get_double (GtkPrintSettings *settings, - const gchar *key); + const char *key); GDK_AVAILABLE_IN_ALL gdouble gtk_print_settings_get_double_with_default (GtkPrintSettings *settings, - const gchar *key, + const char *key, gdouble def); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_double (GtkPrintSettings *settings, - const gchar *key, + const char *key, gdouble value); GDK_AVAILABLE_IN_ALL gdouble gtk_print_settings_get_length (GtkPrintSettings *settings, - const gchar *key, + const char *key, GtkUnit unit); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_length (GtkPrintSettings *settings, - const gchar *key, + const char *key, gdouble value, GtkUnit unit); GDK_AVAILABLE_IN_ALL int gtk_print_settings_get_int (GtkPrintSettings *settings, - const gchar *key); + const char *key); GDK_AVAILABLE_IN_ALL int gtk_print_settings_get_int_with_default (GtkPrintSettings *settings, - const gchar *key, + const char *key, int def); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_int (GtkPrintSettings *settings, - const gchar *key, + const char *key, int value); #define GTK_PRINT_SETTINGS_PRINTER "printer" @@ -206,10 +206,10 @@ void gtk_print_settings_set_int (GtkPrintSettings /* Helpers: */ GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_settings_get_printer (GtkPrintSettings *settings); +const char * gtk_print_settings_get_printer (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_printer (GtkPrintSettings *settings, - const gchar *printer); + const char *printer); GDK_AVAILABLE_IN_ALL GtkPageOrientation gtk_print_settings_get_orientation (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL @@ -315,30 +315,30 @@ GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_page_set (GtkPrintSettings *settings, GtkPageSet page_set); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_settings_get_default_source (GtkPrintSettings *settings); +const char * gtk_print_settings_get_default_source (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_default_source (GtkPrintSettings *settings, - const gchar *default_source); + const char *default_source); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_settings_get_media_type (GtkPrintSettings *settings); +const char * gtk_print_settings_get_media_type (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_media_type (GtkPrintSettings *settings, - const gchar *media_type); + const char *media_type); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_settings_get_dither (GtkPrintSettings *settings); +const char * gtk_print_settings_get_dither (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_dither (GtkPrintSettings *settings, - const gchar *dither); + const char *dither); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_settings_get_finishings (GtkPrintSettings *settings); +const char * gtk_print_settings_get_finishings (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_finishings (GtkPrintSettings *settings, - const gchar *finishings); + const char *finishings); GDK_AVAILABLE_IN_ALL -const gchar * gtk_print_settings_get_output_bin (GtkPrintSettings *settings); +const char * gtk_print_settings_get_output_bin (GtkPrintSettings *settings); GDK_AVAILABLE_IN_ALL void gtk_print_settings_set_output_bin (GtkPrintSettings *settings, - const gchar *output_bin); + const char *output_bin); GDK_AVAILABLE_IN_ALL GVariant *gtk_print_settings_to_gvariant (GtkPrintSettings *settings); diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 75645e0b7c..2b1c89e346 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -180,7 +180,7 @@ static gboolean dialog_get_reverse (GtkPrintUnixDialog *dialog); static int dialog_get_n_copies (GtkPrintUnixDialog *dialog); static gboolean set_active_printer (GtkPrintUnixDialog *dialog, - const gchar *printer_name); + const char *printer_name); static void redraw_page_layout_preview (GtkPrintUnixDialog *dialog); static GListModel *load_print_backends (GtkPrintUnixDialog *dialog); @@ -188,9 +188,9 @@ static GListModel *load_print_backends (GtkPrintUnixDialog *dialog); static void gtk_print_unix_dialog_buildable_init (GtkBuildableIface *iface); static GObject *gtk_print_unix_dialog_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); -static const gchar common_paper_sizes[][16] = { +static const char common_paper_sizes[][16] = { "na_letter", "na_legal", "iso_a4", @@ -332,7 +332,7 @@ struct _GtkPrintUnixDialog gulong options_changed_handler; gulong mark_conflicts_id; - gchar *format_for_printer; + char *format_for_printer; int current_page; GtkCssNode *collate_paper_node; @@ -968,7 +968,7 @@ gtk_print_unix_dialog_buildable_init (GtkBuildableIface *iface) static GObject * gtk_print_unix_dialog_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname) + const char *childname) { GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (buildable); @@ -1201,11 +1201,11 @@ default_printer_list_sort_func (gconstpointer a, } static GtkWidget * -wrap_in_frame (const gchar *label, +wrap_in_frame (const char *label, GtkWidget *child) { GtkWidget *box, *label_widget; - gchar *bold_text; + char *bold_text; label_widget = gtk_label_new (NULL); gtk_widget_set_halign (label_widget, GTK_ALIGN_START); @@ -1230,7 +1230,7 @@ wrap_in_frame (const gchar *label, static gboolean setup_option (GtkPrintUnixDialog *dialog, - const gchar *option_name, + const char *option_name, GtkPrinterOptionWidget *widget) { GtkPrinterOption *option; @@ -1341,7 +1341,7 @@ add_option_to_table (GtkPrinterOption *option, static void setup_page_table (GtkPrinterOptionSet *options, - const gchar *group, + const char *group, GtkWidget *table, GtkWidget *page) { @@ -1381,7 +1381,7 @@ update_print_at_option (GtkPrintUnixDialog *dialog) option = gtk_printer_option_set_lookup (dialog->options, "gtk-print-time-text"); if (option != NULL) { - const gchar *text; + const char *text; text = gtk_editable_get_text (GTK_EDITABLE (dialog->print_at_entry)); gtk_printer_option_set (option, text); @@ -1441,7 +1441,7 @@ static void update_dialog_from_settings (GtkPrintUnixDialog *dialog) { GList *groups, *l; - gchar *group; + char *group; GtkWidget *table, *frame; gboolean has_advanced, has_job; guint nrows; @@ -1559,7 +1559,7 @@ update_dialog_from_capabilities (GtkPrintUnixDialog *dialog) { GtkPrintCapabilities caps; gboolean can_collate; - const gchar *copies; + const char *copies; GtkWidget *button; copies = gtk_editable_get_text (GTK_EDITABLE (dialog->copies_spin)); @@ -2055,7 +2055,7 @@ update_print_at_entry_sensitivity (GtkWidget *button, } static gboolean -is_range_separator (gchar c) +is_range_separator (char c) { return (c == ',' || c == ';' || c == ':'); } @@ -2065,8 +2065,8 @@ dialog_get_page_ranges (GtkPrintUnixDialog *dialog, int *n_ranges_out) { int i, n_ranges; - const gchar *text, *p; - gchar *next; + const char *text, *p; + char *next; GtkPageRange *ranges; int start, end; @@ -2228,8 +2228,8 @@ static int dialog_get_n_copies (GtkPrintUnixDialog *dialog) { GtkAdjustment *adjustment; - const gchar *text; - gchar *endptr = NULL; + const char *text; + char *endptr = NULL; int n_copies; adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (dialog->copies_spin)); @@ -2292,7 +2292,7 @@ dialog_set_reverse (GtkPrintUnixDialog *dialog, static int dialog_get_pages_per_sheet (GtkPrintUnixDialog *dialog) { - const gchar *val; + const char *val; int num; val = gtk_printer_option_widget_get_value (dialog->pages_per_sheet); @@ -2314,7 +2314,7 @@ dialog_get_number_up_layout (GtkPrintUnixDialog *dialog) { GtkPrintCapabilities caps; GtkNumberUpLayout layout; - const gchar *val; + const char *val; GEnumClass *enum_class; GEnumValue *enum_value; @@ -2367,7 +2367,7 @@ draw_page (GtkDrawingArea *da, gboolean landscape; PangoLayout *layout; PangoFontDescription *font; - gchar *text; + char *text; GdkRGBA color; GtkNumberUpLayout number_up_layout; int start_x, end_x, start_y, end_y; @@ -3035,7 +3035,7 @@ paper_size_changed (GtkDropDown *combo_box, * Returns: a new #GtkPrintUnixDialog */ GtkWidget * -gtk_print_unix_dialog_new (const gchar *title, +gtk_print_unix_dialog_new (const char *title, GtkWindow *parent) { GtkWidget *result; @@ -3164,7 +3164,7 @@ gtk_print_unix_dialog_get_current_page (GtkPrintUnixDialog *dialog) static gboolean set_active_printer (GtkPrintUnixDialog *dialog, - const gchar *printer_name) + const char *printer_name) { GListModel *model; GtkPrinter *printer; @@ -3206,7 +3206,7 @@ void gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog, GtkPrintSettings *settings) { - const gchar *printer; + const char *printer; GtkPageRange *ranges; int num_ranges; diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h index 1555668358..fa0b231833 100644 --- a/gtk/gtkprintunixdialog.h +++ b/gtk/gtkprintunixdialog.h @@ -39,7 +39,7 @@ typedef struct _GtkPrintUnixDialog GtkPrintUnixDialog; GDK_AVAILABLE_IN_ALL GType gtk_print_unix_dialog_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget * gtk_print_unix_dialog_new (const gchar *title, +GtkWidget * gtk_print_unix_dialog_new (const char *title, GtkWindow *parent); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkprivate.c b/gtk/gtkprivate.c index 105cf4a8ce..8f3babd83c 100644 --- a/gtk/gtkprivate.c +++ b/gtk/gtkprivate.c @@ -35,31 +35,31 @@ #if !defined G_OS_WIN32 && !(defined GDK_WINDOWING_QUARTZ && defined QUARTZ_RELOCATION) -const gchar * +const char * _gtk_get_datadir (void) { return GTK_DATADIR; } -const gchar * +const char * _gtk_get_libdir (void) { return GTK_LIBDIR; } -const gchar * +const char * _gtk_get_sysconfdir (void) { return GTK_SYSCONFDIR; } -const gchar * +const char * _gtk_get_localedir (void) { return GTK_LOCALEDIR; } -const gchar * +const char * _gtk_get_data_prefix (void) { return GTK_DATA_PREFIX; @@ -92,7 +92,7 @@ _gtk_get_data_prefix (void) * Returns: a dynamically allocated string, free with g_free(). */ -gchar * +char * _gtk_get_lc_ctype (void) { #ifdef G_OS_WIN32 @@ -106,7 +106,7 @@ _gtk_get_lc_ctype (void) * don't have to clickety-click in the Control Panel, you can simply * start the program with LC_ALL=something on the command line.) */ - gchar *p; + char *p; p = getenv ("LC_ALL"); if (p != NULL) @@ -149,7 +149,7 @@ _gtk_single_string_accumulator (GSignalInvocationHint *ihint, gpointer dummy) { gboolean continue_emission; - const gchar *str; + const char *str; str = g_value_get_string (handler_return); g_value_set_string (return_accu, str); diff --git a/gtk/gtkprivate.h b/gtk/gtkprivate.h index 4985f2d125..f3c7148b2e 100644 --- a/gtk/gtkprivate.h +++ b/gtk/gtkprivate.h @@ -52,17 +52,17 @@ G_BEGIN_DECLS #define gtk_internal_return_val_if_fail(__expr, __val) g_return_val_if_fail(__expr, __val) #endif -const gchar * _gtk_get_datadir (void); -const gchar * _gtk_get_libdir (void); -const gchar * _gtk_get_sysconfdir (void); -const gchar * _gtk_get_localedir (void); -const gchar * _gtk_get_data_prefix (void); +const char * _gtk_get_datadir (void); +const char * _gtk_get_libdir (void); +const char * _gtk_get_sysconfdir (void); +const char * _gtk_get_localedir (void); +const char * _gtk_get_data_prefix (void); gboolean _gtk_fnmatch (const char *pattern, const char *string, gboolean no_leading_period); -gchar * _gtk_get_lc_ctype (void); +char * _gtk_get_lc_ctype (void); void _gtk_ensure_resources (void); diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 8490024f4b..7f020026ed 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -95,7 +95,7 @@ struct _GtkProgressBar { GtkWidget parent_instance; - gchar *text; + char *text; GtkWidget *label; GtkWidget *trough_widget; @@ -571,7 +571,7 @@ gtk_progress_bar_finalize (GObject *object) G_OBJECT_CLASS (gtk_progress_bar_parent_class)->finalize (object); } -static gchar * +static char * get_current_text (GtkProgressBar *pbar) { if (pbar->text) @@ -792,7 +792,7 @@ gtk_progress_bar_pulse (GtkProgressBar *pbar) */ void gtk_progress_bar_set_text (GtkProgressBar *pbar, - const gchar *text) + const char *text) { g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar)); @@ -975,7 +975,7 @@ gtk_progress_bar_set_inverted (GtkProgressBar *pbar, * Returns: (nullable): text, or %NULL; this string is owned by the widget * and should not be modified or freed. */ -const gchar* +const char * gtk_progress_bar_get_text (GtkProgressBar *pbar) { g_return_val_if_fail (GTK_IS_PROGRESS_BAR (pbar), NULL); diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index 48a05984a0..dcacd26b8a 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -50,7 +50,7 @@ GDK_AVAILABLE_IN_ALL void gtk_progress_bar_pulse (GtkProgressBar *pbar); GDK_AVAILABLE_IN_ALL void gtk_progress_bar_set_text (GtkProgressBar *pbar, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL void gtk_progress_bar_set_fraction (GtkProgressBar *pbar, gdouble fraction); @@ -63,7 +63,7 @@ void gtk_progress_bar_set_inverted (GtkProgressBar *pbar, gboolean inverted); GDK_AVAILABLE_IN_ALL -const gchar * gtk_progress_bar_get_text (GtkProgressBar *pbar); +const char * gtk_progress_bar_get_text (GtkProgressBar *pbar); GDK_AVAILABLE_IN_ALL gdouble gtk_progress_bar_get_fraction (GtkProgressBar *pbar); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c index cb375a2f14..dc32364879 100644 --- a/gtk/gtkquartz.c +++ b/gtk/gtkquartz.c @@ -216,20 +216,20 @@ _gtk_quartz_get_selection_data_from_pasteboard (NSPasteboard *pasteboard, { if ([[pasteboard types] containsObject:NSFilenamesPboardType]) { - gchar **uris; + char **uris; NSArray *files = [pasteboard propertyListForType:NSFilenamesPboardType]; int n_files = [files count]; int i; selection_data->target = g_intern_static_string ("text/uri-list"); - uris = (gchar **) g_malloc (sizeof (gchar*) * (n_files + 1)); + uris = (char **) g_malloc (sizeof (char *) * (n_files + 1)); for (i = 0; i < n_files; ++i) { NSString* uriString = [files objectAtIndex:i]; uriString = [@"file://" stringByAppendingString:uriString]; uriString = [uriString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - uris[i] = (gchar *) [uriString cStringUsingEncoding:NSUTF8StringEncoding]; + uris[i] = (char *) [uriString cStringUsingEncoding:NSUTF8StringEncoding]; } uris[i] = NULL; @@ -238,12 +238,12 @@ _gtk_quartz_get_selection_data_from_pasteboard (NSPasteboard *pasteboard, } else if ([[pasteboard types] containsObject:NSURLPboardType]) { - gchar *uris[2]; + char *uris[2]; NSURL *url = [NSURL URLFromPasteboard:pasteboard]; selection_data->target = g_intern_static_string ("text/uri-list"); - uris[0] = (gchar *) [[url description] UTF8String]; + uris[0] = (char *) [[url description] UTF8String]; uris[1] = NULL; gtk_selection_data_set_uris (selection_data, uris); @@ -308,7 +308,7 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard, } else if ([type isEqualTo:NSURLPboardType]) { - gchar **uris; + char **uris; uris = gtk_selection_data_get_uris (selection_data); if (uris != NULL) @@ -335,16 +335,16 @@ _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard, * to test for that and remove the last element. */ -static const gchar * +static const char * get_bundle_path (void) { - static gchar *path = NULL; + static char *path = NULL; if (path == NULL) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - gchar *resource_path = g_strdup ([[[NSBundle mainBundle] resourcePath] UTF8String]); - gchar *base; + char *resource_path = g_strdup ([[[NSBundle mainBundle] resourcePath] UTF8String]); + char *base; [pool drain]; base = g_path_get_basename (resource_path); @@ -360,10 +360,10 @@ get_bundle_path (void) return path; } -const gchar * +const char * _gtk_get_datadir (void) { - static gchar *path = NULL; + static char *path = NULL; if (path == NULL) path = g_build_filename (get_bundle_path (), "share", NULL); @@ -371,10 +371,10 @@ _gtk_get_datadir (void) return path; } -const gchar * +const char * _gtk_get_libdir (void) { - static gchar *path = NULL; + static char *path = NULL; if (path == NULL) path = g_build_filename (get_bundle_path (), "lib", NULL); @@ -382,10 +382,10 @@ _gtk_get_libdir (void) return path; } -const gchar * +const char * _gtk_get_localedir (void) { - static gchar *path = NULL; + static char *path = NULL; if (path == NULL) path = g_build_filename (get_bundle_path (), "share", "locale", NULL); @@ -393,10 +393,10 @@ _gtk_get_localedir (void) return path; } -const gchar * +const char * _gtk_get_sysconfdir (void) { - static gchar *path = NULL; + static char *path = NULL; if (path == NULL) path = g_build_filename (get_bundle_path (), "etc", NULL); @@ -404,7 +404,7 @@ _gtk_get_sysconfdir (void) return path; } -const gchar * +const char * _gtk_get_data_prefix (void) { return get_bundle_path (); diff --git a/gtk/gtkquartz.h b/gtk/gtkquartz.h index bf7dee6df1..f55ac8518a 100644 --- a/gtk/gtkquartz.h +++ b/gtk/gtkquartz.h @@ -40,11 +40,11 @@ void _gtk_quartz_set_selection_data_for_pasteboard (NSPasteboard *pasteboard, NSImage *_gtk_quartz_create_image_from_surface (cairo_surface_t *surface); void _gtk_clipboard_handle_event (GdkEventOwnerChange *event); void _gtk_clipboard_store_all (void); -const gchar * _gtk_get_datadir (void); -const gchar * _gtk_get_libdir (void); -const gchar * _gtk_get_localedir (void); -const gchar * _gtk_get_sysconfdir (void); -const gchar * _gtk_get_data_prefix (void); +const char * _gtk_get_datadir (void); +const char * _gtk_get_libdir (void); +const char * _gtk_get_localedir (void); +const char * _gtk_get_sysconfdir (void); +const char * _gtk_get_data_prefix (void); G_END_DECLS diff --git a/gtk/gtkquery.c b/gtk/gtkquery.c index 0078baae37..cabaa0338b 100644 --- a/gtk/gtkquery.c +++ b/gtk/gtkquery.c @@ -26,10 +26,10 @@ struct _GtkQueryPrivate { - gchar *text; + char *text; GFile *location; GList *mime_types; - gchar **words; + char **words; }; G_DEFINE_TYPE_WITH_PRIVATE (GtkQuery, gtk_query, G_TYPE_OBJECT) @@ -68,7 +68,7 @@ gtk_query_new (void) } -const gchar * +const char * gtk_query_get_text (GtkQuery *query) { GtkQueryPrivate *priv = gtk_query_get_instance_private (query); @@ -78,7 +78,7 @@ gtk_query_get_text (GtkQuery *query) void gtk_query_set_text (GtkQuery *query, - const gchar *text) + const char *text) { GtkQueryPrivate *priv = gtk_query_get_instance_private (query); @@ -106,10 +106,10 @@ gtk_query_set_location (GtkQuery *query, g_set_object (&priv->location, file); } -static gchar * -prepare_string_for_compare (const gchar *string) +static char * +prepare_string_for_compare (const char *string) { - gchar *normalized, *res; + char *normalized, *res; normalized = g_utf8_normalize (string, -1, G_NORMALIZE_NFD); res = g_utf8_strdown (normalized, -1); @@ -120,10 +120,10 @@ prepare_string_for_compare (const gchar *string) gboolean gtk_query_matches_string (GtkQuery *query, - const gchar *string) + const char *string) { GtkQueryPrivate *priv = gtk_query_get_instance_private (query); - gchar *prepared; + char *prepared; gboolean found; int i; diff --git a/gtk/gtkquery.h b/gtk/gtkquery.h index 4d18ae3e80..9bff68a476 100644 --- a/gtk/gtkquery.h +++ b/gtk/gtkquery.h @@ -51,16 +51,16 @@ GType gtk_query_get_type (void); GtkQuery *gtk_query_new (void); -const gchar *gtk_query_get_text (GtkQuery *query); +const char *gtk_query_get_text (GtkQuery *query); void gtk_query_set_text (GtkQuery *query, - const gchar *text); + const char *text); GFile *gtk_query_get_location (GtkQuery *query); void gtk_query_set_location (GtkQuery *query, GFile *file); gboolean gtk_query_matches_string (GtkQuery *query, - const gchar *string); + const char *string); G_END_DECLS diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 4d67d0ddca..5a7e4a825b 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -464,7 +464,7 @@ gtk_radio_button_new (GSList *group) */ GtkWidget* gtk_radio_button_new_with_label (GSList *group, - const gchar *label) + const char *label) { GtkWidget *radio_button; @@ -493,7 +493,7 @@ gtk_radio_button_new_with_label (GSList *group, */ GtkWidget* gtk_radio_button_new_with_mnemonic (GSList *group, - const gchar *label) + const char *label) { GtkWidget *radio_button; @@ -539,7 +539,7 @@ gtk_radio_button_new_from_widget (GtkRadioButton *radio_group_member) */ GtkWidget* gtk_radio_button_new_with_label_from_widget (GtkRadioButton *radio_group_member, - const gchar *label) + const char *label) { GSList *l = NULL; if (radio_group_member) @@ -561,7 +561,7 @@ gtk_radio_button_new_with_label_from_widget (GtkRadioButton *radio_group_member, **/ GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio_group_member, - const gchar *label) + const char *label) { GSList *l = NULL; if (radio_group_member) diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index eb2d74582c..d2922fd3da 100644 --- a/gtk/gtkradiobutton.h +++ b/gtk/gtkradiobutton.h @@ -51,16 +51,16 @@ GDK_AVAILABLE_IN_ALL GtkWidget* gtk_radio_button_new_from_widget (GtkRadioButton *radio_group_member); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_radio_button_new_with_label (GSList *group, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_radio_button_new_with_label_from_widget (GtkRadioButton *radio_group_member, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_radio_button_new_with_mnemonic (GSList *group, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL GtkWidget* gtk_radio_button_new_with_mnemonic_from_widget (GtkRadioButton *radio_group_member, - const gchar *label); + const char *label); GDK_AVAILABLE_IN_ALL GSList* gtk_radio_button_get_group (GtkRadioButton *radio_button); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index 8a6ae8c23d..2422f20d85 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -120,8 +120,8 @@ typedef struct { - gchar *name; - gchar *exec; + char *name; + char *exec; guint count; @@ -139,16 +139,16 @@ typedef struct */ struct _GtkRecentInfo { - gchar *uri; + char *uri; - gchar *display_name; - gchar *description; + char *display_name; + char *description; time_t added; time_t modified; time_t visited; - gchar *mime_type; + char *mime_type; RecentAppInfo *applications; int n_applications; @@ -164,7 +164,7 @@ struct _GtkRecentInfo struct _GtkRecentManagerPrivate { - gchar *filename; + char *filename; guint is_dirty : 1; @@ -208,7 +208,7 @@ static void gtk_recent_manager_monitor_changed (GFileMonitor *monit static void gtk_recent_manager_changed (GtkRecentManager *manager); static void gtk_recent_manager_real_changed (GtkRecentManager *manager); static void gtk_recent_manager_set_filename (GtkRecentManager *manager, - const gchar *filename); + const char *filename); static void gtk_recent_manager_clamp_to_age (GtkRecentManager *manager, int age); static void gtk_recent_manager_clamp_to_size (GtkRecentManager *manager, @@ -221,7 +221,7 @@ static void build_recent_items_list (GtkRecentManager *manag static void purge_recent_items_list (GtkRecentManager *manager, GError **error); -static GtkRecentInfo *gtk_recent_info_new (const gchar *uri); +static GtkRecentInfo *gtk_recent_info_new (const char *uri); static void gtk_recent_info_free (GtkRecentInfo *recent_info); static guint signal_changed = 0; @@ -235,10 +235,10 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkRecentManager, gtk_recent_manager, G_TYPE_OBJECT) * contain only lowercase ascii. */ static gboolean -has_case_prefix (const gchar *haystack, - const gchar *needle) +has_case_prefix (const char *haystack, + const char *needle) { - const gchar *h, *n; + const char *h, *n; /* Eat one character at a time. */ h = haystack; @@ -490,7 +490,7 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager) g_bookmark_file_to_file (priv->recent_items, priv->filename, &write_error); if (write_error) { - gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); + char *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); g_warning ("Attempting to store changes into '%s', but failed: %s", utf8 ? utf8 : "(invalid filename)", write_error->message); @@ -500,7 +500,7 @@ gtk_recent_manager_real_changed (GtkRecentManager *manager) if (g_chmod (priv->filename, 0600) < 0) { - gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); + char *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); g_warning ("Attempting to set the permissions of '%s', but failed: %s", utf8 ? utf8 : "(invalid filename)", g_strerror (errno)); @@ -554,7 +554,7 @@ gtk_recent_manager_monitor_changed (GFileMonitor *monitor, } } -static gchar * +static char * get_default_filename (void) { if (g_mkdir_with_parents (g_get_user_data_dir (), 0755) == -1) @@ -576,7 +576,7 @@ get_default_filename (void) static void gtk_recent_manager_set_filename (GtkRecentManager *manager, - const gchar *filename) + const char *filename) { GtkRecentManagerPrivate *priv; GFile *file; @@ -627,7 +627,7 @@ gtk_recent_manager_set_filename (GtkRecentManager *manager, priv->monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); if (error) { - gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); + char *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); g_warning ("Unable to monitor '%s': %s\n" "The GtkRecentManager will not update its contents " "if the file is changed from other instances", @@ -683,7 +683,7 @@ build_recent_items_list (GtkRecentManager *manager) if (read_error->domain == G_FILE_ERROR && read_error->code != G_FILE_ERROR_NOENT) { - gchar *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); + char *utf8 = g_filename_to_utf8 (priv->filename, -1, NULL, NULL, NULL); g_warning ("Attempting to read the recently used resources " "file at '%s', but the parser failed: %s.", utf8 ? utf8 : "(invalid filename)", @@ -764,7 +764,7 @@ gtk_recent_manager_add_item_query_info (GObject *source_object, GtkRecentManager *manager = user_data; GtkRecentData recent_data; GFileInfo *file_info; - gchar *uri, *basename, *content_type; + char *uri, *basename, *content_type; uri = g_file_get_uri (file); @@ -835,7 +835,7 @@ gtk_recent_manager_add_item_query_info (GObject *source_object, */ gboolean gtk_recent_manager_add_item (GtkRecentManager *manager, - const gchar *uri) + const char *uri) { GFile* file; @@ -888,7 +888,7 @@ gtk_recent_manager_add_item (GtkRecentManager *manager, */ gboolean gtk_recent_manager_add_full (GtkRecentManager *manager, - const gchar *uri, + const char *uri, const GtkRecentData *data) { GtkRecentManagerPrivate *priv; @@ -1010,7 +1010,7 @@ gtk_recent_manager_add_full (GtkRecentManager *manager, */ gboolean gtk_recent_manager_remove_item (GtkRecentManager *manager, - const gchar *uri, + const char *uri, GError **error) { GtkRecentManagerPrivate *priv; @@ -1066,7 +1066,7 @@ gtk_recent_manager_remove_item (GtkRecentManager *manager, */ gboolean gtk_recent_manager_has_item (GtkRecentManager *manager, - const gchar *uri) + const char *uri) { GtkRecentManagerPrivate *priv; @@ -1083,7 +1083,7 @@ static void build_recent_info (GBookmarkFile *bookmarks, GtkRecentInfo *info) { - gchar **apps, **groups; + char **apps, **groups; gsize apps_len, groups_len, i; int app_index; @@ -1114,7 +1114,7 @@ build_recent_info (GBookmarkFile *bookmarks, info->n_applications = 0; for (i = 0; i < apps_len; i++) { - gchar *app_name, *app_exec; + char *app_name, *app_exec; guint count; time_t stamp; RecentAppInfo *app_info; @@ -1162,7 +1162,7 @@ build_recent_info (GBookmarkFile *bookmarks, */ GtkRecentInfo * gtk_recent_manager_lookup_item (GtkRecentManager *manager, - const gchar *uri, + const char *uri, GError **error) { GtkRecentManagerPrivate *priv; @@ -1223,8 +1223,8 @@ gtk_recent_manager_lookup_item (GtkRecentManager *manager, */ gboolean gtk_recent_manager_move_item (GtkRecentManager *recent_manager, - const gchar *uri, - const gchar *new_uri, + const char *uri, + const char *new_uri, GError **error) { GtkRecentManagerPrivate *priv; @@ -1291,7 +1291,7 @@ gtk_recent_manager_get_items (GtkRecentManager *manager) { GtkRecentManagerPrivate *priv; GList *retval = NULL; - gchar **uris; + char **uris; gsize uris_len, i; g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), NULL); @@ -1415,7 +1415,7 @@ gtk_recent_manager_clamp_to_age (GtkRecentManager *manager, int age) { GtkRecentManagerPrivate *priv = manager->priv; - gchar **uris; + char **uris; gsize n_uris, i; time_t now; @@ -1428,7 +1428,7 @@ gtk_recent_manager_clamp_to_age (GtkRecentManager *manager, for (i = 0; i < n_uris; i++) { - const gchar *uri = uris[i]; + const char *uri = uris[i]; time_t modified; int item_age; @@ -1446,7 +1446,7 @@ gtk_recent_manager_clamp_to_size (GtkRecentManager *manager, const int size) { GtkRecentManagerPrivate *priv = manager->priv; - gchar **uris; + char **uris; gsize n_uris, i; if (G_UNLIKELY (!priv->recent_items) || G_UNLIKELY (size < 0)) @@ -1462,7 +1462,7 @@ gtk_recent_manager_clamp_to_size (GtkRecentManager *manager, for (i = 0; i < n_uris - size; i++) { - const gchar *uri = uris[i]; + const char *uri = uris[i]; g_bookmark_file_remove_item (priv->recent_items, uri, NULL); } @@ -1478,7 +1478,7 @@ G_DEFINE_BOXED_TYPE (GtkRecentInfo, gtk_recent_info, gtk_recent_info_unref) static GtkRecentInfo * -gtk_recent_info_new (const gchar *uri) +gtk_recent_info_new (const char *uri) { GtkRecentInfo *info; @@ -1578,7 +1578,7 @@ gtk_recent_info_unref (GtkRecentInfo *info) * Returns: the URI of the resource. The returned string is * owned by the recent manager, and should not be freed. */ -const gchar * +const char * gtk_recent_info_get_uri (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); @@ -1596,7 +1596,7 @@ gtk_recent_info_get_uri (GtkRecentInfo *info) * Returns: the display name of the resource. The returned string * is owned by the recent manager, and should not be freed. */ -const gchar * +const char * gtk_recent_info_get_display_name (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); @@ -1616,7 +1616,7 @@ gtk_recent_info_get_display_name (GtkRecentInfo *info) * Returns: the description of the resource. The returned string * is owned by the recent manager, and should not be freed. **/ -const gchar * +const char * gtk_recent_info_get_description (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); @@ -1633,7 +1633,7 @@ gtk_recent_info_get_description (GtkRecentInfo *info) * Returns: the MIME type of the resource. The returned string * is owned by the recent manager, and should not be freed. */ -const gchar * +const char * gtk_recent_info_get_mime_type (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); @@ -1739,8 +1739,8 @@ gtk_recent_info_get_private_hint (GtkRecentInfo *info) */ gboolean gtk_recent_info_get_application_info (GtkRecentInfo *info, - const gchar *app_name, - const gchar **app_exec, + const char *app_name, + const char **app_exec, guint *count, time_t *time_) { @@ -1783,11 +1783,11 @@ gtk_recent_info_get_application_info (GtkRecentInfo *info, * a newly allocated %NULL-terminated array of strings. * Use g_strfreev() to free it. */ -gchar ** +char ** gtk_recent_info_get_applications (GtkRecentInfo *info, gsize *length) { - gchar **retval; + char **retval; gsize n_apps, i; g_return_val_if_fail (info != NULL, NULL); @@ -1802,7 +1802,7 @@ gtk_recent_info_get_applications (GtkRecentInfo *info, n_apps = info->n_applications; - retval = g_new0 (gchar *, n_apps + 1); + retval = g_new0 (char *, n_apps + 1); for (i = 0; i < info->n_applications; i ++) { @@ -1830,7 +1830,7 @@ gtk_recent_info_get_applications (GtkRecentInfo *info, */ gboolean gtk_recent_info_has_application (GtkRecentInfo *info, - const gchar *app_name) + const char *app_name) { g_return_val_if_fail (info != NULL, FALSE); g_return_val_if_fail (app_name != NULL, FALSE); @@ -1847,12 +1847,12 @@ gtk_recent_info_has_application (GtkRecentInfo *info, * * Returns: an application name. Use g_free() to free it. */ -gchar * +char * gtk_recent_info_last_application (GtkRecentInfo *info) { int i; time_t last_stamp = (time_t) -1; - gchar *name = NULL; + char *name = NULL; g_return_val_if_fail (info != NULL, NULL); @@ -1883,7 +1883,7 @@ GIcon * gtk_recent_info_get_gicon (GtkRecentInfo *info) { GIcon *icon = NULL; - gchar *content_type; + char *content_type; g_return_val_if_fail (info != NULL, NULL); @@ -1935,7 +1935,7 @@ gtk_recent_info_is_local (GtkRecentInfo *info) gboolean gtk_recent_info_exists (GtkRecentInfo *info) { - gchar *filename; + char *filename; GStatBuf stat_buf; gboolean retval = FALSE; @@ -1978,11 +1978,11 @@ gtk_recent_info_match (GtkRecentInfo *info_a, } /* taken from gnome-vfs-uri.c */ -static const gchar * -get_method_string (const gchar *substring, - gchar **method_string) +static const char * +get_method_string (const char *substring, + char **method_string) { - const gchar *p; + const char *p; char *method; for (p = substring; @@ -2050,15 +2050,15 @@ make_valid_utf8 (const char *name) return g_string_free (string, FALSE); } -static gchar * -get_uri_shortname_for_display (const gchar *uri) +static char * +get_uri_shortname_for_display (const char *uri) { - gchar *name = NULL; + char *name = NULL; gboolean validated = FALSE; if (has_case_prefix (uri, "file:/")) { - gchar *local_file; + char *local_file; local_file = g_filename_from_uri (uri, NULL, NULL); @@ -2073,9 +2073,9 @@ get_uri_shortname_for_display (const gchar *uri) if (!name) { - gchar *method; - gchar *local_file; - const gchar *rest; + char *method; + char *local_file; + const char *rest; rest = get_method_string (uri, &method); local_file = g_filename_display_basename (rest); @@ -2090,7 +2090,7 @@ get_uri_shortname_for_display (const gchar *uri) if (!validated && !g_utf8_validate (name, -1, NULL)) { - gchar *utf8_name; + char *utf8_name; utf8_name = make_valid_utf8 (name); g_free (name); @@ -2113,10 +2113,10 @@ get_uri_shortname_for_display (const gchar *uri) * Returns: A newly-allocated string in UTF-8 encoding * free it with g_free() */ -gchar * +char * gtk_recent_info_get_short_name (GtkRecentInfo *info) { - gchar *short_name; + char *short_name; g_return_val_if_fail (info != NULL, NULL); @@ -2139,17 +2139,17 @@ gtk_recent_info_get_short_name (GtkRecentInfo *info) * Returns: (nullable): a newly allocated UTF-8 string containing the * resource’s URI or %NULL. Use g_free() when done using it. */ -gchar * +char * gtk_recent_info_get_uri_display (GtkRecentInfo *info) { - gchar *retval; + char *retval; g_return_val_if_fail (info != NULL, NULL); retval = NULL; if (gtk_recent_info_is_local (info)) { - gchar *filename; + char *filename; filename = g_filename_from_uri (info->uri, NULL, NULL); if (!filename) @@ -2206,11 +2206,11 @@ gtk_recent_info_get_age (GtkRecentInfo *info) * a newly allocated %NULL terminated array of strings. * Use g_strfreev() to free it. */ -gchar ** +char ** gtk_recent_info_get_groups (GtkRecentInfo *info, gsize *length) { - gchar **retval; + char **retval; gsize n_groups, i; g_return_val_if_fail (info != NULL, NULL); @@ -2225,7 +2225,7 @@ gtk_recent_info_get_groups (GtkRecentInfo *info, n_groups = info->n_groups; - retval = g_new0 (gchar *, n_groups + 1); + retval = g_new0 (char *, n_groups + 1); for (i = 0; i < info->n_groups; i ++) retval[i] = g_strdup (info->groups[i]); @@ -2250,7 +2250,7 @@ gtk_recent_info_get_groups (GtkRecentInfo *info, */ gboolean gtk_recent_info_has_group (GtkRecentInfo *info, - const gchar *group_name) + const char *group_name) { int i; @@ -2287,7 +2287,7 @@ gtk_recent_info_has_group (GtkRecentInfo *info, */ GAppInfo * gtk_recent_info_create_app_info (GtkRecentInfo *info, - const gchar *app_name, + const char *app_name, GError **error) { RecentAppInfo *ai; diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h index 9167ab8bef..2f32db3415 100644 --- a/gtk/gtkrecentmanager.h +++ b/gtk/gtkrecentmanager.h @@ -68,15 +68,15 @@ typedef struct _GtkRecentManagerPrivate GtkRecentManagerPrivate; **/ struct _GtkRecentData { - gchar *display_name; - gchar *description; + char *display_name; + char *description; - gchar *mime_type; + char *mime_type; - gchar *app_name; - gchar *app_exec; + char *app_name; + char *app_exec; - gchar **groups; + char **groups; gboolean is_private; }; @@ -162,26 +162,26 @@ GtkRecentManager *gtk_recent_manager_get_default (void); GDK_AVAILABLE_IN_ALL gboolean gtk_recent_manager_add_item (GtkRecentManager *manager, - const gchar *uri); + const char *uri); GDK_AVAILABLE_IN_ALL gboolean gtk_recent_manager_add_full (GtkRecentManager *manager, - const gchar *uri, + const char *uri, const GtkRecentData *recent_data); GDK_AVAILABLE_IN_ALL gboolean gtk_recent_manager_remove_item (GtkRecentManager *manager, - const gchar *uri, + const char *uri, GError **error); GDK_AVAILABLE_IN_ALL GtkRecentInfo * gtk_recent_manager_lookup_item (GtkRecentManager *manager, - const gchar *uri, + const char *uri, GError **error); GDK_AVAILABLE_IN_ALL gboolean gtk_recent_manager_has_item (GtkRecentManager *manager, - const gchar *uri); + const char *uri); GDK_AVAILABLE_IN_ALL gboolean gtk_recent_manager_move_item (GtkRecentManager *manager, - const gchar *uri, - const gchar *new_uri, + const char *uri, + const char *new_uri, GError **error); GDK_AVAILABLE_IN_ALL GList * gtk_recent_manager_get_items (GtkRecentManager *manager); @@ -199,13 +199,13 @@ GDK_AVAILABLE_IN_ALL void gtk_recent_info_unref (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL -const gchar * gtk_recent_info_get_uri (GtkRecentInfo *info); +const char * gtk_recent_info_get_uri (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL -const gchar * gtk_recent_info_get_display_name (GtkRecentInfo *info); +const char * gtk_recent_info_get_display_name (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL -const gchar * gtk_recent_info_get_description (GtkRecentInfo *info); +const char * gtk_recent_info_get_description (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL -const gchar * gtk_recent_info_get_mime_type (GtkRecentInfo *info); +const char * gtk_recent_info_get_mime_type (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL time_t gtk_recent_info_get_added (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL @@ -216,34 +216,34 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_recent_info_get_private_hint (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL gboolean gtk_recent_info_get_application_info (GtkRecentInfo *info, - const gchar *app_name, - const gchar **app_exec, + const char *app_name, + const char **app_exec, guint *count, time_t *time_); GDK_AVAILABLE_IN_ALL GAppInfo * gtk_recent_info_create_app_info (GtkRecentInfo *info, - const gchar *app_name, + const char *app_name, GError **error); GDK_AVAILABLE_IN_ALL -gchar ** gtk_recent_info_get_applications (GtkRecentInfo *info, +char ** gtk_recent_info_get_applications (GtkRecentInfo *info, gsize *length) G_GNUC_MALLOC; GDK_AVAILABLE_IN_ALL -gchar * gtk_recent_info_last_application (GtkRecentInfo *info) G_GNUC_MALLOC; +char * gtk_recent_info_last_application (GtkRecentInfo *info) G_GNUC_MALLOC; GDK_AVAILABLE_IN_ALL gboolean gtk_recent_info_has_application (GtkRecentInfo *info, - const gchar *app_name); + const char *app_name); GDK_AVAILABLE_IN_ALL -gchar ** gtk_recent_info_get_groups (GtkRecentInfo *info, +char ** gtk_recent_info_get_groups (GtkRecentInfo *info, gsize *length) G_GNUC_MALLOC; GDK_AVAILABLE_IN_ALL gboolean gtk_recent_info_has_group (GtkRecentInfo *info, - const gchar *group_name); + const char *group_name); GDK_AVAILABLE_IN_ALL GIcon * gtk_recent_info_get_gicon (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL -gchar * gtk_recent_info_get_short_name (GtkRecentInfo *info) G_GNUC_MALLOC; +char * gtk_recent_info_get_short_name (GtkRecentInfo *info) G_GNUC_MALLOC; GDK_AVAILABLE_IN_ALL -gchar * gtk_recent_info_get_uri_display (GtkRecentInfo *info) G_GNUC_MALLOC; +char * gtk_recent_info_get_uri_display (GtkRecentInfo *info) G_GNUC_MALLOC; GDK_AVAILABLE_IN_ALL int gtk_recent_info_get_age (GtkRecentInfo *info); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c index 158152480c..f63bbf1e54 100644 --- a/gtk/gtkrevealer.c +++ b/gtk/gtkrevealer.c @@ -138,7 +138,7 @@ static void gtk_revealer_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_revealer_set_child (GTK_REVEALER (buildable), GTK_WIDGET (child)); diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index 2e3b3374ab..791cac94ed 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -161,7 +161,7 @@ struct _GtkScaleMark { gdouble value; int stop_position; - gchar *markup; + char *markup; GtkWidget *label_widget; GtkWidget *indicator_widget; GtkWidget *widget; @@ -205,15 +205,15 @@ static void gtk_scale_buildable_interface_init (GtkBuildableIface *iface) static gboolean gtk_scale_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_scale_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); -static gchar * gtk_scale_format_value (GtkScale *scale, +static char * gtk_scale_format_value (GtkScale *scale, gdouble value); @@ -1484,13 +1484,13 @@ gtk_scale_real_get_layout_offsets (GtkScale *scale, *y = value_bounds.origin.y; } -static gchar * -weed_out_neg_zero (gchar *str, +static char * +weed_out_neg_zero (char *str, int digits) { if (str[0] == '-') { - gchar neg_zero[8]; + char neg_zero[8]; g_snprintf (neg_zero, 8, "%0.*f", digits, -0.0); if (strcmp (neg_zero, str) == 0) memmove (str, str + 1, strlen (str)); @@ -1656,7 +1656,7 @@ void gtk_scale_add_mark (GtkScale *scale, gdouble value, GtkPositionType position, - const gchar *markup) + const char *markup) { GtkWidget *widget; GtkScalePrivate *priv = gtk_scale_get_instance_private (scale); @@ -1800,7 +1800,7 @@ typedef struct gdouble value; GtkPositionType position; GString *markup; - gchar *context; + char *context; gboolean translatable; } MarkData; @@ -1814,9 +1814,9 @@ mark_data_free (MarkData *data) static void marks_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -1834,11 +1834,11 @@ marks_start_element (GtkBuildableParseContext *context, } else if (strcmp (element_name, "mark") == 0) { - const gchar *value_str; + const char *value_str; gdouble value = 0; - const gchar *position_str = NULL; + const char *position_str = NULL; GtkPositionType position = GTK_POS_BOTTOM; - const gchar *msg_context = NULL; + const char *msg_context = NULL; gboolean translatable = FALSE; MarkData *mark; @@ -1905,7 +1905,7 @@ marks_start_element (GtkBuildableParseContext *context, static void marks_text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -1932,7 +1932,7 @@ static gboolean gtk_scale_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -1962,7 +1962,7 @@ static void gtk_scale_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { GtkScale *scale = GTK_SCALE (buildable); @@ -1971,7 +1971,7 @@ gtk_scale_buildable_custom_finished (GtkBuildable *buildable, if (strcmp (tagname, "marks") == 0) { GSList *m; - const gchar *markup; + const char *markup; marks_data = (MarksSubparserData *)user_data; diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index 0d1422fbb5..5dd9609bd5 100644 --- a/gtk/gtkscale.h +++ b/gtk/gtkscale.h @@ -121,7 +121,7 @@ GDK_AVAILABLE_IN_ALL void gtk_scale_add_mark (GtkScale *scale, gdouble value, GtkPositionType position, - const gchar *markup); + const char *markup); GDK_AVAILABLE_IN_ALL void gtk_scale_clear_marks (GtkScale *scale); diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 930b026406..1924f7e957 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -119,7 +119,7 @@ typedef struct GtkScrollType autoscroll_step; gboolean autoscrolling; - gchar **icon_list; + char **icon_list; GtkAdjustment *adjustment; /* needed because it must be settable in init() */ } GtkScaleButtonPrivate; @@ -469,7 +469,7 @@ gtk_scale_button_set_property (GObject *object, break; case PROP_ICONS: gtk_scale_button_set_icons (button, - (const gchar **)g_value_get_boxed (value)); + (const char **)g_value_get_boxed (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -550,7 +550,7 @@ GtkWidget * gtk_scale_button_new (gdouble min, gdouble max, gdouble step, - const gchar **icons) + const char **icons) { GtkScaleButton *button; GtkAdjustment *adjustment; @@ -615,15 +615,15 @@ gtk_scale_button_set_value (GtkScaleButton *button, */ void gtk_scale_button_set_icons (GtkScaleButton *button, - const gchar **icons) + const char **icons) { GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); - gchar **tmp; + char **tmp; g_return_if_fail (GTK_IS_SCALE_BUTTON (button)); tmp = priv->icon_list; - priv->icon_list = g_strdupv ((gchar **) icons); + priv->icon_list = g_strdupv ((char **) icons); g_strfreev (tmp); gtk_scale_button_update_icon (button); @@ -865,7 +865,7 @@ gtk_scale_button_update_icon (GtkScaleButton *button) GtkScaleButtonPrivate *priv = gtk_scale_button_get_instance_private (button); GtkAdjustment *adjustment; gdouble value; - const gchar *name; + const char *name; guint num_icons; if (!priv->icon_list || priv->icon_list[0][0] == '\0') diff --git a/gtk/gtkscalebutton.h b/gtk/gtkscalebutton.h index c9dd397594..7226d92ee5 100644 --- a/gtk/gtkscalebutton.h +++ b/gtk/gtkscalebutton.h @@ -76,10 +76,10 @@ GDK_AVAILABLE_IN_ALL GtkWidget * gtk_scale_button_new (gdouble min, gdouble max, gdouble step, - const gchar **icons); + const char **icons); GDK_AVAILABLE_IN_ALL void gtk_scale_button_set_icons (GtkScaleButton *button, - const gchar **icons); + const char **icons); GDK_AVAILABLE_IN_ALL gdouble gtk_scale_button_get_value (GtkScaleButton *button); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 751a76ae5d..acc77cb8fd 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -425,7 +425,7 @@ static void gtk_scrolled_window_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW(buildable), GTK_WIDGET (child)); diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c index f7cb05a17d..d5da8d2c0b 100644 --- a/gtk/gtksearchbar.c +++ b/gtk/gtksearchbar.c @@ -131,7 +131,7 @@ static void gtk_search_bar_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_search_bar_set_child (GTK_SEARCH_BAR (buildable), GTK_WIDGET (child)); diff --git a/gtk/gtksearchengine.c b/gtk/gtksearchengine.c index 941536d076..a974e5e11e 100644 --- a/gtk/gtksearchengine.c +++ b/gtk/gtksearchengine.c @@ -35,11 +35,11 @@ struct _GtkSearchEnginePrivate { GtkSearchEngine *native; gboolean native_running; gboolean got_results; - gchar *native_error; + char *native_error; GtkSearchEngine *model; gboolean model_running; - gchar *model_error; + char *model_error; gboolean running; gboolean recursive; @@ -253,7 +253,7 @@ finished (GtkSearchEngine *engine, static void error (GtkSearchEngine *engine, - const gchar *message, + const char *message, gpointer data) { GtkSearchEngine *composite = GTK_SEARCH_ENGINE (data); @@ -403,7 +403,7 @@ _gtk_search_engine_finished (GtkSearchEngine *engine, void _gtk_search_engine_error (GtkSearchEngine *engine, - const gchar *error_message) + const char *error_message) { g_return_if_fail (GTK_IS_SEARCH_ENGINE (engine)); diff --git a/gtk/gtksearchengine.h b/gtk/gtksearchengine.h index 05602585a6..e23e197c34 100644 --- a/gtk/gtksearchengine.h +++ b/gtk/gtksearchengine.h @@ -70,7 +70,7 @@ struct _GtkSearchEngineClass GList *hits); void (*finished) (GtkSearchEngine *engine); void (*error) (GtkSearchEngine *engine, - const gchar *error_message); + const char *error_message); }; GType _gtk_search_engine_get_type (void); @@ -87,7 +87,7 @@ void _gtk_search_engine_hits_added (GtkSearchEngine *engine, void _gtk_search_engine_finished (GtkSearchEngine *engine, gboolean got_results); void _gtk_search_engine_error (GtkSearchEngine *engine, - const gchar *error_message); + const char *error_message); void _gtk_search_hit_free (GtkSearchHit *hit); GtkSearchHit *_gtk_search_hit_dup (GtkSearchHit *hit); diff --git a/gtk/gtksearchenginemodel.c b/gtk/gtksearchenginemodel.c index 3937e6eef2..0d8f69ae7a 100644 --- a/gtk/gtksearchenginemodel.c +++ b/gtk/gtksearchenginemodel.c @@ -60,7 +60,7 @@ static gboolean info_matches_query (GtkQuery *query, GFileInfo *info) { - const gchar *display_name; + const char *display_name; display_name = g_file_info_get_display_name (info); if (display_name == NULL) diff --git a/gtk/gtksearchenginetracker3.c b/gtk/gtksearchenginetracker3.c index 69139c2731..c230f9d2e3 100644 --- a/gtk/gtksearchenginetracker3.c +++ b/gtk/gtksearchenginetracker3.c @@ -117,7 +117,7 @@ static GFileInfo * create_file_info (TrackerSparqlCursor *cursor) { GFileInfo *info; - const gchar *str; + const char *str; GDateTime *creation; info = g_file_info_new (); @@ -170,7 +170,7 @@ query_callback (TrackerSparqlStatement *statement, while (tracker_sparql_cursor_next (cursor, NULL, NULL)) { - const gchar *url; + const char *url; url = tracker_sparql_cursor_get_string (cursor, 0, NULL); hit = g_slice_new0 (GtkSearchHit); @@ -194,8 +194,8 @@ gtk_search_engine_tracker3_start (GtkSearchEngine *engine) { GtkSearchEngineTracker3 *tracker; TrackerSparqlStatement *statement; - const gchar *search_text; - gchar *match; + const char *search_text; + char *match; GFile *location; gboolean recursive; @@ -220,7 +220,7 @@ gtk_search_engine_tracker3_start (GtkSearchEngine *engine) if (location) { - gchar *location_uri = g_file_get_uri (location); + char *location_uri = g_file_get_uri (location); if (recursive) { diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 7fc6c8343f..65989011b8 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -116,7 +116,7 @@ struct _GtkSettings GtkCssProvider *theme_provider; int font_size; gboolean font_size_absolute; - gchar *font_family; + char *font_family; cairo_font_options_t *font_options; }; @@ -219,7 +219,7 @@ static gboolean settings_update_xsetting (GtkSettings *setting static void settings_update_xsettings (GtkSettings *settings); static void gtk_settings_load_from_key_file (GtkSettings *settings, - const gchar *path, + const char *path, GtkSettingsSource source); static void settings_update_provider (GdkDisplay *display, GtkCssProvider **old, @@ -243,8 +243,8 @@ gtk_settings_init (GtkSettings *settings) { GParamSpec **pspecs, **p; guint i = 0; - gchar *path; - const gchar * const *config_dirs; + char *path; + const char * const *config_dirs; g_datalist_init (&settings->queued_settings); object_list = g_slist_prepend (object_list, settings); @@ -1042,7 +1042,7 @@ settings_init_style (GtkSettings *settings) /* Add provider for user file */ if (G_UNLIKELY (!css_provider)) { - gchar *css_path; + char *css_path; css_provider = gtk_css_provider_new (); css_path = g_build_filename (g_get_user_config_dir (), @@ -1194,7 +1194,7 @@ static void settings_update_font_values (GtkSettings *settings) { PangoFontDescription *desc; - const gchar *font_name; + const char *font_name; font_name = g_value_get_string (&settings->property_values[PROP_FONT_NAME - 1].value); desc = pango_font_description_from_string (font_name); @@ -1324,7 +1324,7 @@ apply_queued_setting (GtkSettings *settings, } else { - gchar *debug = g_strdup_value_contents (&qvalue->public.value); + char *debug = g_strdup_value_contents (&qvalue->public.value); g_message ("%s: failed to retrieve property '%s' of type '%s' from rc file value \"%s\" of type '%s'", qvalue->public.origin ? qvalue->public.origin : "(for origin information, set GTK_DEBUG)", @@ -1413,13 +1413,13 @@ free_value (gpointer data) static void gtk_settings_set_property_value_internal (GtkSettings *settings, - const gchar *prop_name, + const char *prop_name, const GtkSettingsValue *new_value, GtkSettingsSource source) { GtkSettingsValuePrivate *qvalue; GParamSpec *pspec; - gchar *name; + char *name; GQuark name_quark; if (!G_VALUE_HOLDS_LONG (&new_value->value) && @@ -1474,7 +1474,7 @@ settings_update_double_click (GtkSettings *settings) static void settings_update_cursor_theme (GtkSettings *settings) { - gchar *theme = NULL; + char *theme = NULL; int size = 0; g_object_get (settings, @@ -1492,11 +1492,11 @@ static void settings_update_font_options (GtkSettings *settings) { int hinting; - gchar *hint_style_str; + char *hint_style_str; cairo_hint_style_t hint_style; int antialias; cairo_antialias_t antialias_mode; - gchar *rgba_str; + char *rgba_str; cairo_subpixel_order_t subpixel_order; if (settings->font_options) @@ -1637,8 +1637,8 @@ settings_update_provider (GdkDisplay *display, static void get_theme_name (GtkSettings *settings, - gchar **theme_name, - gchar **theme_variant) + char **theme_name, + char **theme_variant) { gboolean prefer_dark; @@ -1681,10 +1681,10 @@ get_theme_name (GtkSettings *settings, static void settings_update_theme (GtkSettings *settings) { - gchar *theme_name; - gchar *theme_variant; - const gchar *theme_dir; - gchar *path; + char *theme_name; + char *theme_variant; + const char *theme_dir; + char *path; get_theme_name (settings, &theme_name, &theme_variant); @@ -1727,12 +1727,12 @@ gvalue_free (gpointer data) static void gtk_settings_load_from_key_file (GtkSettings *settings, - const gchar *path, + const char *path, GtkSettingsSource source) { GError *error; GKeyFile *keyfile; - gchar **keys; + char **keys; gsize n_keys; int i; @@ -1760,7 +1760,7 @@ gtk_settings_load_from_key_file (GtkSettings *settings, for (i = 0; i < n_keys; i++) { - gchar *key; + char *key; GParamSpec *pspec; GType value_type; GtkSettingsValue svalue = { NULL, { 0, }, }; @@ -1815,7 +1815,7 @@ gtk_settings_load_from_key_file (GtkSettings *settings, default: { - gchar *s_val; + char *s_val; g_value_init (&svalue.value, G_TYPE_GSTRING); s_val = g_key_file_get_string (keyfile, "Settings", key, &error); @@ -1844,7 +1844,7 @@ gtk_settings_load_from_key_file (GtkSettings *settings, copy, gvalue_free); if (g_getenv ("GTK_DEBUG")) - svalue.origin = (gchar *)path; + svalue.origin = (char *)path; gtk_settings_set_property_value_internal (settings, key, &svalue, source); g_value_unset (&svalue.value); @@ -1929,7 +1929,7 @@ gtk_settings_get_property (GObject *object, GtkSettingsSource _gtk_settings_get_setting_source (GtkSettings *settings, - const gchar *name) + const char *name) { GParamSpec *pspec; @@ -1952,7 +1952,7 @@ _gtk_settings_get_setting_source (GtkSettings *settings, */ void gtk_settings_reset_property (GtkSettings *settings, - const gchar *name) + const char *name) { GParamSpec *pspec; GValue *value; @@ -2023,7 +2023,7 @@ settings_update_font_name (GtkSettings *settings) } } -const gchar * +const char * gtk_settings_get_font_family (GtkSettings *settings) { settings_update_font_name (settings); diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h index b7b606633e..ba8d0e7eba 100644 --- a/gtk/gtksettings.h +++ b/gtk/gtksettings.h @@ -52,7 +52,7 @@ struct _GtkSettingsValue /* origin should be something like "filename:linenumber" for rc files, * or e.g. "XProperty" for other sources */ - gchar *origin; + char *origin; /* valid types are LONG, DOUBLE and STRING corresponding to the token parsed, * or a GSTRING holding an unparsed statement @@ -71,7 +71,7 @@ GtkSettings* gtk_settings_get_for_display (GdkDisplay *display); GDK_AVAILABLE_IN_ALL void gtk_settings_reset_property (GtkSettings *settings, - const gchar *name); + const char *name); G_END_DECLS diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h index f39963939c..ec41b8fa6b 100644 --- a/gtk/gtksettingsprivate.h +++ b/gtk/gtksettingsprivate.h @@ -41,11 +41,11 @@ typedef enum } GtkSettingsSource; GtkSettingsSource _gtk_settings_get_setting_source (GtkSettings *settings, - const gchar *name); + const char *name); gboolean gtk_settings_get_enable_animations (GtkSettings *settings); int gtk_settings_get_dnd_drag_threshold (GtkSettings *settings); -const gchar *gtk_settings_get_font_family (GtkSettings *settings); +const char *gtk_settings_get_font_family (GtkSettings *settings); int gtk_settings_get_font_size (GtkSettings *settings); gboolean gtk_settings_get_font_size_is_absolute (GtkSettings *settings); diff --git a/gtk/gtkshortcut.c b/gtk/gtkshortcut.c index a32437fed9..bf97d54fec 100644 --- a/gtk/gtkshortcut.c +++ b/gtk/gtkshortcut.c @@ -249,7 +249,7 @@ gtk_shortcut_new (GtkShortcutTrigger *trigger, GtkShortcut * gtk_shortcut_new_with_arguments (GtkShortcutTrigger *trigger, GtkShortcutAction *action, - const gchar *format_string, + const char *format_string, ...) { GtkShortcut *shortcut; diff --git a/gtk/gtkshortcut.h b/gtk/gtkshortcut.h index 77c89754a2..91c019393d 100644 --- a/gtk/gtkshortcut.h +++ b/gtk/gtkshortcut.h @@ -35,7 +35,7 @@ GtkShortcut * gtk_shortcut_new (GtkShortcutTrig GDK_AVAILABLE_IN_ALL GtkShortcut * gtk_shortcut_new_with_arguments (GtkShortcutTrigger *trigger, GtkShortcutAction *action, - const gchar *format_string, + const char *format_string, ...); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkshortcutaction.c b/gtk/gtkshortcutaction.c index b4f36956bc..23cb2d82af 100644 --- a/gtk/gtkshortcutaction.c +++ b/gtk/gtkshortcutaction.c @@ -1040,8 +1040,8 @@ check_parameter_type (GVariant *args, if (!g_variant_is_of_type (args, parameter_type)) { - gchar *typestr = g_variant_type_dup_string (parameter_type); - gchar *targetstr = g_variant_print (args, TRUE); + char *typestr = g_variant_type_dup_string (parameter_type); + char *targetstr = g_variant_print (args, TRUE); g_warning ("Trying to invoke action with target '%s'," " but action expects parameter with type '%s'", targetstr, typestr); g_free (targetstr); @@ -1053,7 +1053,7 @@ check_parameter_type (GVariant *args, { if (parameter_type != NULL) { - gchar *typestr = g_variant_type_dup_string (parameter_type); + char *typestr = g_variant_type_dup_string (parameter_type); g_warning ("Trying to invoke action without arguments," " but action expects parameter with type '%s'", typestr); g_free (typestr); diff --git a/gtk/gtkshortcutcontroller.c b/gtk/gtkshortcutcontroller.c index e427ae5ed8..e30a82ab98 100644 --- a/gtk/gtkshortcutcontroller.c +++ b/gtk/gtkshortcutcontroller.c @@ -147,7 +147,7 @@ static void gtk_shortcut_controller_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (type != NULL) { diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c index db54b35811..39a7aef069 100644 --- a/gtk/gtkshortcutlabel.c +++ b/gtk/gtkshortcutlabel.c @@ -38,8 +38,8 @@ struct _GtkShortcutLabel { GtkWidget parent_instance; - gchar *accelerator; - gchar *disabled_text; + char *accelerator; + char *disabled_text; }; struct _GtkShortcutLabelClass @@ -58,11 +58,11 @@ enum { static GParamSpec *properties[LAST_PROP]; -static gchar * +static char * get_modifier_label (guint key) { - const gchar *subscript; - const gchar *label; + const char *subscript; + const char *label; switch (key) { @@ -123,16 +123,16 @@ get_modifier_label (guint key) return g_strdup_printf ("%s <small><b>%s</b></small>", label, subscript); } -static gchar ** +static char ** get_labels (guint key, GdkModifierType modifier, guint *n_mods) { - const gchar *labels[16]; + const char *labels[16]; GList *freeme = NULL; - gchar key_label[6]; - const gchar *tmp; + char key_label[6]; + const char *tmp; gunichar ch; int i = 0; - gchar **retval; + char **retval; if (modifier & GDK_SHIFT_MASK) labels[i++] = C_("keyboard label", "Shift"); @@ -190,7 +190,7 @@ get_labels (guint key, GdkModifierType modifier, guint *n_mods) case GDK_KEY_Super_L: case GDK_KEY_Super_R: case GDK_KEY_Hyper_L: case GDK_KEY_Hyper_R: freeme = g_list_prepend (freeme, get_modifier_label (key)); - labels[i++] = (const gchar*)freeme->data; + labels[i++] = (const char *)freeme->data; break; case GDK_KEY_Left: labels[i++] = "\xe2\x86\x90"; @@ -236,7 +236,7 @@ get_labels (guint key, GdkModifierType modifier, guint *n_mods) labels[i] = NULL; - retval = g_strdupv ((gchar **)labels); + retval = g_strdupv ((char **)labels); g_list_free_full (freeme, g_free); @@ -244,7 +244,7 @@ get_labels (guint key, GdkModifierType modifier, guint *n_mods) } static GtkWidget * -dim_label (const gchar *text) +dim_label (const char *text) { GtkWidget *label; @@ -259,7 +259,7 @@ display_shortcut (GtkWidget *self, guint key, GdkModifierType modifier) { - gchar **keys = NULL; + char **keys = NULL; int i; guint n_mods; @@ -285,9 +285,9 @@ display_shortcut (GtkWidget *self, static gboolean parse_combination (GtkShortcutLabel *self, - const gchar *str) + const char *str) { - gchar **accels; + char **accels; int k; GdkModifierType modifier = 0; guint key = 0; @@ -313,9 +313,9 @@ parse_combination (GtkShortcutLabel *self, static gboolean parse_sequence (GtkShortcutLabel *self, - const gchar *str) + const char *str) { - gchar **accels; + char **accels; int k; gboolean retval = TRUE; @@ -336,9 +336,9 @@ parse_sequence (GtkShortcutLabel *self, static gboolean parse_range (GtkShortcutLabel *self, - const gchar *str) + const char *str) { - gchar *dots; + char *dots; dots = strstr (str, "..."); if (!dots) @@ -376,7 +376,7 @@ clear_children (GtkShortcutLabel *self) static void gtk_shortcut_label_rebuild (GtkShortcutLabel *self) { - gchar **accels; + char **accels; int k; clear_children (self); @@ -518,7 +518,7 @@ gtk_shortcut_label_init (GtkShortcutLabel *self) * Returns: (transfer full): a newly-allocated #GtkShortcutLabel */ GtkWidget * -gtk_shortcut_label_new (const gchar *accelerator) +gtk_shortcut_label_new (const char *accelerator) { return g_object_new (GTK_TYPE_SHORTCUT_LABEL, "accelerator", accelerator, @@ -533,7 +533,7 @@ gtk_shortcut_label_new (const gchar *accelerator) * * Returns: (transfer none)(nullable): the current accelerator. */ -const gchar * +const char * gtk_shortcut_label_get_accelerator (GtkShortcutLabel *self) { g_return_val_if_fail (GTK_IS_SHORTCUT_LABEL (self), NULL); @@ -550,7 +550,7 @@ gtk_shortcut_label_get_accelerator (GtkShortcutLabel *self) */ void gtk_shortcut_label_set_accelerator (GtkShortcutLabel *self, - const gchar *accelerator) + const char *accelerator) { g_return_if_fail (GTK_IS_SHORTCUT_LABEL (self)); @@ -572,7 +572,7 @@ gtk_shortcut_label_set_accelerator (GtkShortcutLabel *self, * Returns: (transfer none)(nullable): the current text displayed when no * accelerator is set. */ -const gchar * +const char * gtk_shortcut_label_get_disabled_text (GtkShortcutLabel *self) { g_return_val_if_fail (GTK_IS_SHORTCUT_LABEL (self), NULL); @@ -589,7 +589,7 @@ gtk_shortcut_label_get_disabled_text (GtkShortcutLabel *self) */ void gtk_shortcut_label_set_disabled_text (GtkShortcutLabel *self, - const gchar *disabled_text) + const char *disabled_text) { g_return_if_fail (GTK_IS_SHORTCUT_LABEL (self)); diff --git a/gtk/gtkshortcutlabel.h b/gtk/gtkshortcutlabel.h index a8842bcdd1..d2abd1c7ee 100644 --- a/gtk/gtkshortcutlabel.h +++ b/gtk/gtkshortcutlabel.h @@ -35,21 +35,21 @@ GDK_AVAILABLE_IN_ALL GType gtk_shortcut_label_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkWidget *gtk_shortcut_label_new (const gchar *accelerator); +GtkWidget *gtk_shortcut_label_new (const char *accelerator); GDK_AVAILABLE_IN_ALL -const gchar *gtk_shortcut_label_get_accelerator (GtkShortcutLabel *self); +const char *gtk_shortcut_label_get_accelerator (GtkShortcutLabel *self); GDK_AVAILABLE_IN_ALL void gtk_shortcut_label_set_accelerator (GtkShortcutLabel *self, - const gchar *accelerator); + const char *accelerator); GDK_AVAILABLE_IN_ALL -const gchar *gtk_shortcut_label_get_disabled_text (GtkShortcutLabel *self); +const char *gtk_shortcut_label_get_disabled_text (GtkShortcutLabel *self); GDK_AVAILABLE_IN_ALL void gtk_shortcut_label_set_disabled_text (GtkShortcutLabel *self, - const gchar *disabled_text); + const char *disabled_text); G_END_DECLS diff --git a/gtk/gtkshortcutsgroup.c b/gtk/gtkshortcutsgroup.c index e371222972..3cb4c7112e 100644 --- a/gtk/gtkshortcutsgroup.c +++ b/gtk/gtkshortcutsgroup.c @@ -47,7 +47,7 @@ struct _GtkShortcutsGroup GtkBox parent_instance; GtkLabel *title; - gchar *view; + char *view; guint height; GtkSizeGroup *accel_size_group; @@ -148,7 +148,7 @@ static void gtk_shortcuts_group_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_SHORTCUTS_SHORTCUT (child)) { diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c index bc1c06c7bf..462becb974 100644 --- a/gtk/gtkshortcutssection.c +++ b/gtk/gtkshortcutssection.c @@ -59,9 +59,9 @@ struct _GtkShortcutsSection { GtkBox parent_instance; - gchar *name; - gchar *title; - gchar *view_name; + char *name; + char *title; + char *view_name; guint max_height; GtkStack *stack; @@ -106,7 +106,7 @@ static GParamSpec *properties[LAST_PROP]; static guint signals[LAST_SIGNAL]; static void gtk_shortcuts_section_set_view_name (GtkShortcutsSection *self, - const gchar *view_name); + const char *view_name); static void gtk_shortcuts_section_set_max_height (GtkShortcutsSection *self, guint max_height); static void gtk_shortcuts_section_add_group (GtkShortcutsSection *self, @@ -130,7 +130,7 @@ static void gtk_shortcuts_section_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_SHORTCUTS_GROUP (child)) gtk_shortcuts_section_add_group (GTK_SHORTCUTS_SECTION (buildable), GTK_SHORTCUTS_GROUP (child)); @@ -417,7 +417,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self) static void gtk_shortcuts_section_set_view_name (GtkShortcutsSection *self, - const gchar *view_name) + const char *view_name) { if (g_strcmp0 (self->view_name, view_name) == 0) return; @@ -484,7 +484,7 @@ update_group_visibility (GtkWidget *child, gpointer data) if (GTK_IS_SHORTCUTS_GROUP (child)) { - gchar *view; + char *view; gboolean match; g_object_get (child, "view", &view, NULL); diff --git a/gtk/gtkshortcutsshortcut.c b/gtk/gtkshortcutsshortcut.c index a8baa86fe3..3c7d17887b 100644 --- a/gtk/gtkshortcutsshortcut.c +++ b/gtk/gtkshortcutsshortcut.c @@ -58,7 +58,7 @@ struct _GtkShortcutsShortcut gboolean subtitle_set; gboolean icon_set; GtkTextDirection direction; - gchar *action_name; + char *action_name; GtkShortcutType shortcut_type; }; @@ -89,7 +89,7 @@ static GParamSpec *properties[LAST_PROP]; static void gtk_shortcuts_shortcut_set_accelerator (GtkShortcutsShortcut *self, - const gchar *accelerator) + const char *accelerator) { gtk_shortcut_label_set_accelerator (self->accelerator, accelerator); } @@ -128,7 +128,7 @@ gtk_shortcuts_shortcut_set_title_size_group (GtkShortcutsShortcut *self, static void update_subtitle_from_type (GtkShortcutsShortcut *self) { - const gchar *subtitle; + const char *subtitle; if (self->subtitle_set) return; @@ -196,7 +196,7 @@ gtk_shortcuts_shortcut_set_subtitle_set (GtkShortcutsShortcut *self, static void gtk_shortcuts_shortcut_set_subtitle (GtkShortcutsShortcut *self, - const gchar *subtitle) + const char *subtitle) { gtk_label_set_label (self->subtitle, subtitle); gtk_widget_set_visible (GTK_WIDGET (self->subtitle), subtitle && subtitle[0]); @@ -341,7 +341,7 @@ gtk_shortcuts_shortcut_set_type (GtkShortcutsShortcut *self, static void gtk_shortcuts_shortcut_set_action_name (GtkShortcutsShortcut *self, - const gchar *action_name) + const char *action_name) { g_free (self->action_name); self->action_name = g_strdup (action_name); @@ -478,8 +478,8 @@ gtk_shortcuts_shortcut_update_accel (GtkShortcutsShortcut *self, GtkWindow *window) { GtkApplication *app; - gchar **accels; - gchar *str; + char **accels; + char *str; if (self->action_name == NULL) return; diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c index 1593be6cfd..2fede662eb 100644 --- a/gtk/gtkshortcutswindow.c +++ b/gtk/gtkshortcutswindow.c @@ -102,9 +102,9 @@ struct _GtkShortcutsWindowClass typedef struct { GHashTable *keywords; - gchar *initial_section; - gchar *last_section_name; - gchar *view_name; + char *initial_section; + char *last_section_name; + char *view_name; GtkSizeGroup *search_text_group; GtkSizeGroup *search_image_group; GHashTable *search_items_hash; @@ -130,7 +130,7 @@ typedef struct GtkShortcutsWindow *self; GtkBuilder *builder; GQueue *stack; - gchar *property_name; + char *property_name; guint translatable : 1; } ViewsParserData; @@ -213,18 +213,18 @@ gtk_shortcuts_window_add_search_item (GtkWidget *child, gpointer data) GtkShortcutsWindow *self = data; GtkShortcutsWindowPrivate *priv = gtk_shortcuts_window_get_instance_private (self); GtkWidget *item; - gchar *accelerator = NULL; - gchar *title = NULL; - gchar *hash_key = NULL; + char *accelerator = NULL; + char *title = NULL; + char *hash_key = NULL; GIcon *icon = NULL; gboolean icon_set = FALSE; gboolean subtitle_set = FALSE; GtkTextDirection direction; GtkShortcutType shortcut_type; - gchar *action_name = NULL; - gchar *subtitle; - gchar *str; - gchar *keywords; + char *action_name = NULL; + char *subtitle; + char *str; + char *keywords; if (GTK_IS_SHORTCUTS_SHORTCUT (child)) { @@ -314,7 +314,7 @@ section_notify_cb (GObject *section, if (strcmp (pspec->name, "section-name") == 0) { - gchar *name; + char *name; g_object_get (section, "section-name", &name, NULL); g_object_set (gtk_stack_get_page (priv->stack, GTK_WIDGET (section)), "name", name, NULL); @@ -322,7 +322,7 @@ section_notify_cb (GObject *section, } else if (strcmp (pspec->name, "title") == 0) { - gchar *title; + char *title; GtkWidget *label; label = g_object_get_data (section, "gtk-shortcuts-title"); @@ -338,9 +338,9 @@ gtk_shortcuts_window_add_section (GtkShortcutsWindow *self, { GtkShortcutsWindowPrivate *priv = gtk_shortcuts_window_get_instance_private (self); GtkListBoxRow *row; - gchar *title; - gchar *name; - const gchar *visible_section; + char *title; + char *name; + const char *visible_section; GtkWidget *label; GtkWidget *child; @@ -393,7 +393,7 @@ static void gtk_shortcuts_window_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_SHORTCUTS_SECTION (child)) gtk_shortcuts_window_add_section (GTK_SHORTCUTS_WINDOW (buildable), @@ -412,7 +412,7 @@ gtk_shortcuts_window_buildable_iface_init (GtkBuildableIface *iface) static void gtk_shortcuts_window_set_view_name (GtkShortcutsWindow *self, - const gchar *view_name) + const char *view_name) { GtkShortcutsWindowPrivate *priv = gtk_shortcuts_window_get_instance_private (self); GtkWidget *section; @@ -431,7 +431,7 @@ gtk_shortcuts_window_set_view_name (GtkShortcutsWindow *self, static void gtk_shortcuts_window_set_section_name (GtkShortcutsWindow *self, - const gchar *section_name) + const char *section_name) { GtkShortcutsWindowPrivate *priv = gtk_shortcuts_window_get_instance_private (self); GtkWidget *section = NULL; @@ -544,10 +544,10 @@ gtk_shortcuts_window__entry__changed (GtkShortcutsWindow *self, GtkSearchEntry *search_entry) { GtkShortcutsWindowPrivate *priv = gtk_shortcuts_window_get_instance_private (self); - gchar *downcase = NULL; + char *downcase = NULL; GHashTableIter iter; - const gchar *text; - const gchar *last_section_name; + const char *text; + const char *last_section_name; gpointer key; gpointer value; gboolean has_result; @@ -581,7 +581,7 @@ gtk_shortcuts_window__entry__changed (GtkShortcutsWindow *self, while (g_hash_table_iter_next (&iter, &key, &value)) { GtkWidget *widget = key; - const gchar *keywords = value; + const char *keywords = value; gboolean match; if (hidden_by_direction (widget)) @@ -692,7 +692,7 @@ gtk_shortcuts_window_get_property (GObject *object, if (child != NULL) { - gchar *name = NULL; + char *name = NULL; g_object_get (gtk_stack_get_page (priv->stack, child), "name", &name, diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c index 1177722c85..c1bf962c2b 100644 --- a/gtk/gtksidebarrow.c +++ b/gtk/gtksidebarrow.c @@ -40,15 +40,15 @@ struct _GtkSidebarRow GIcon *end_icon; GtkWidget *start_icon_widget; GtkWidget *end_icon_widget; - gchar *label; - gchar *tooltip; + char *label; + char *tooltip; GtkWidget *label_widget; gboolean ejectable; GtkWidget *eject_button; int order_index; GtkPlacesSidebarSectionType section_type; GtkPlacesSidebarPlaceType place_type; - gchar *uri; + char *uri; GDrive *drive; GVolume *volume; GMount *mount; diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 51c7627024..ab18416da0 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -135,13 +135,13 @@ static void gtk_size_group_buildable_init (GtkBuildableIface *i static gboolean gtk_size_group_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_size_group_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); G_STATIC_ASSERT (GTK_SIZE_GROUP_HORIZONTAL == (1 << GTK_ORIENTATION_HORIZONTAL)); @@ -440,7 +440,7 @@ gtk_size_group_get_widgets (GtkSizeGroup *size_group) } typedef struct { - gchar *name; + char *name; int line; int col; } ItemData; @@ -462,9 +462,9 @@ typedef struct { static void size_group_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -472,7 +472,7 @@ size_group_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "widget") == 0) { - const gchar *name; + const char *name; ItemData *item_data; if (!_gtk_builder_check_parent (data->builder, context, "widgets", error)) @@ -518,7 +518,7 @@ static gboolean gtk_size_group_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -547,7 +547,7 @@ static void gtk_size_group_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { GSList *l; diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index 2bada1e6fd..512fbdd3c8 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -288,7 +288,7 @@ static void gtk_spin_button_set_orientation (GtkSpinButton *spin_button, static void gtk_spin_button_snap (GtkSpinButton *spin_button, gdouble val); static void gtk_spin_button_insert_text (GtkEditable *editable, - const gchar *new_text, + const char *new_text, int new_text_length, int *position); static void gtk_spin_button_real_spin (GtkSpinButton *spin_button, @@ -457,7 +457,7 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) * gpointer data) * { * GtkAdjustment *adjustment; - * gchar *text; + * char *text; * int value; * * adjustment = gtk_spin_button_get_adjustment (spin); @@ -1131,13 +1131,13 @@ gtk_spin_button_set_orientation (GtkSpinButton *spin, g_object_notify (G_OBJECT (spin), "orientation"); } -static gchar * -weed_out_neg_zero (gchar *str, +static char * +weed_out_neg_zero (char *str, int digits) { if (str[0] == '-') { - gchar neg_zero[8]; + char neg_zero[8]; g_snprintf (neg_zero, 8, "%0.*f", digits, -0.0); if (strcmp (neg_zero, str) == 0) memmove (str, str + 1, strlen (str)); @@ -1145,11 +1145,11 @@ weed_out_neg_zero (gchar *str, return str; } -static gchar * +static char * gtk_spin_button_format_for_value (GtkSpinButton *spin_button, gdouble value) { - gchar *buf = g_strdup_printf ("%0.*f", spin_button->digits, value); + char *buf = g_strdup_printf ("%0.*f", spin_button->digits, value); return weed_out_neg_zero (buf, spin_button->digits); } @@ -1390,7 +1390,7 @@ gtk_spin_button_activate (GtkText *entry, static void gtk_spin_button_insert_text (GtkEditable *editable, - const gchar *new_text, + const char *new_text, int new_text_length, int *position) { @@ -1405,7 +1405,7 @@ gtk_spin_button_insert_text (GtkEditable *editable, guint32 pos_sign; guint32 neg_sign; int entry_length; - const gchar *entry_text; + const char *entry_text; entry_text = gtk_editable_get_text (GTK_EDITABLE (spin->entry)); entry_length = g_utf8_strlen (entry_text, -1); @@ -1543,7 +1543,7 @@ static int gtk_spin_button_default_input (GtkSpinButton *spin_button, gdouble *new_val) { - gchar *err = NULL; + char *err = NULL; const char *text = gtk_editable_get_text (GTK_EDITABLE (spin_button->entry)); *new_val = g_strtod (text, &err); @@ -1556,7 +1556,7 @@ gtk_spin_button_default_input (GtkSpinButton *spin_button, static void gtk_spin_button_default_output (GtkSpinButton *spin_button) { - gchar *buf = gtk_spin_button_format_for_value (spin_button, + char *buf = gtk_spin_button_format_for_value (spin_button, gtk_adjustment_get_value (spin_button->adjustment)); if (strcmp (buf, gtk_editable_get_text (GTK_EDITABLE (spin_button->entry)))) diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index 8b5545ed26..a789be258c 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -1291,8 +1291,8 @@ stack_child_visibility_notify_cb (GObject *obj, GtkStackPage * gtk_stack_add_titled (GtkStack *stack, GtkWidget *child, - const gchar *name, - const gchar *title) + const char *name, + const char *title) { g_return_val_if_fail (GTK_IS_STACK (stack), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); @@ -1314,7 +1314,7 @@ gtk_stack_add_titled (GtkStack *stack, GtkStackPage * gtk_stack_add_named (GtkStack *stack, GtkWidget *child, - const gchar *name) + const char *name) { g_return_val_if_fail (GTK_IS_STACK (stack), NULL); g_return_val_if_fail (GTK_IS_WIDGET (child), NULL); @@ -1491,7 +1491,7 @@ gtk_stack_get_page (GtkStack *stack, */ GtkWidget * gtk_stack_get_child_by_name (GtkStack *stack, - const gchar *name) + const char *name) { GtkStackPrivate *priv = gtk_stack_get_instance_private (stack); GtkStackPage *info; @@ -1810,7 +1810,7 @@ gtk_stack_get_visible_child (GtkStack *stack) * * Returns: (transfer none) (nullable): the name of the visible child of the #GtkStack */ -const gchar * +const char * gtk_stack_get_visible_child_name (GtkStack *stack) { GtkStackPrivate *priv = gtk_stack_get_instance_private (stack); @@ -1881,7 +1881,7 @@ gtk_stack_set_visible_child (GtkStack *stack, */ void gtk_stack_set_visible_child_name (GtkStack *stack, - const gchar *name) + const char *name) { GtkStackPrivate *priv = gtk_stack_get_instance_private (stack); @@ -1904,7 +1904,7 @@ gtk_stack_set_visible_child_name (GtkStack *stack, */ void gtk_stack_set_visible_child_full (GtkStack *stack, - const gchar *name, + const char *name, GtkStackTransitionType transition) { GtkStackPrivate *priv = gtk_stack_get_instance_private (stack); diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h index efe9168fc7..6253890aa5 100644 --- a/gtk/gtkstack.h +++ b/gtk/gtkstack.h @@ -115,12 +115,12 @@ GtkWidget * gtk_stack_new (void); GDK_AVAILABLE_IN_ALL GtkStackPage * gtk_stack_add_named (GtkStack *stack, GtkWidget *child, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL GtkStackPage * gtk_stack_add_titled (GtkStack *stack, GtkWidget *child, - const gchar *name, - const gchar *title); + const char *name, + const char *title); GDK_AVAILABLE_IN_ALL void gtk_stack_remove (GtkStack *stack, GtkWidget *child); @@ -130,7 +130,7 @@ GtkStackPage * gtk_stack_get_page (GtkStack GtkWidget *child); GDK_AVAILABLE_IN_ALL GtkWidget * gtk_stack_get_child_by_name (GtkStack *stack, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL void gtk_stack_set_visible_child (GtkStack *stack, GtkWidget *child); @@ -138,12 +138,12 @@ GDK_AVAILABLE_IN_ALL GtkWidget * gtk_stack_get_visible_child (GtkStack *stack); GDK_AVAILABLE_IN_ALL void gtk_stack_set_visible_child_name (GtkStack *stack, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL -const gchar * gtk_stack_get_visible_child_name (GtkStack *stack); +const char * gtk_stack_get_visible_child_name (GtkStack *stack); GDK_AVAILABLE_IN_ALL void gtk_stack_set_visible_child_full (GtkStack *stack, - const gchar *name, + const char *name, GtkStackTransitionType transition); GDK_AVAILABLE_IN_ALL void gtk_stack_set_hhomogeneous (GtkStack *stack, diff --git a/gtk/gtkstacksidebar.c b/gtk/gtkstacksidebar.c index 781ddb934d..81ac989425 100644 --- a/gtk/gtkstacksidebar.c +++ b/gtk/gtkstacksidebar.c @@ -184,7 +184,7 @@ update_row (GtkStackSidebar *self, GtkWidget *row) { GtkWidget *item; - gchar *title; + char *title; gboolean needs_attention; gboolean visible; diff --git a/gtk/gtkstackswitcher.c b/gtk/gtkstackswitcher.c index 29f962b063..67e0c37f6d 100644 --- a/gtk/gtkstackswitcher.c +++ b/gtk/gtkstackswitcher.c @@ -122,8 +122,8 @@ on_button_toggled (GtkWidget *button, static void rebuild_child (GtkWidget *self, - const gchar *icon_name, - const gchar *title, + const char *icon_name, + const char *title, gboolean use_underline) { GtkWidget *button_child; @@ -162,8 +162,8 @@ update_button (GtkStackSwitcher *self, GtkStackPage *page, GtkWidget *button) { - gchar *title; - gchar *icon_name; + char *title; + char *icon_name; gboolean needs_attention; gboolean visible; gboolean use_underline; diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index c2c973f7e1..b836c80942 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -102,15 +102,15 @@ struct _GtkStatusbarClass void (*text_pushed) (GtkStatusbar *statusbar, guint context_id, - const gchar *text); + const char *text); void (*text_popped) (GtkStatusbar *statusbar, guint context_id, - const gchar *text); + const char *text); }; struct _GtkStatusbarMsg { - gchar *text; + char *text; guint context_id; guint message_id; }; @@ -124,7 +124,7 @@ enum static void gtk_statusbar_update (GtkStatusbar *statusbar, guint context_id, - const gchar *text); + const char *text); static void gtk_statusbar_msg_free (GtkStatusbarMsg *msg); @@ -235,7 +235,7 @@ gtk_statusbar_new (void) static void gtk_statusbar_update (GtkStatusbar *statusbar, guint context_id, - const gchar *text) + const char *text) { g_return_if_fail (GTK_IS_STATUSBAR (statusbar)); @@ -259,9 +259,9 @@ gtk_statusbar_update (GtkStatusbar *statusbar, */ guint gtk_statusbar_get_context_id (GtkStatusbar *statusbar, - const gchar *context_description) + const char *context_description) { - gchar *string; + char *string; guint id; g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0); @@ -286,7 +286,7 @@ gtk_statusbar_get_context_id (GtkStatusbar *statusbar, static GtkStatusbarMsg * gtk_statusbar_msg_create (GtkStatusbar *statusbar, guint context_id, - const gchar *text) + const char *text) { GtkStatusbarMsg *msg; @@ -320,7 +320,7 @@ gtk_statusbar_msg_free (GtkStatusbarMsg *msg) guint gtk_statusbar_push (GtkStatusbar *statusbar, guint context_id, - const gchar *text) + const char *text) { GtkStatusbarMsg *msg; diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h index 530f82e75f..13c4695e80 100644 --- a/gtk/gtkstatusbar.h +++ b/gtk/gtkstatusbar.h @@ -46,11 +46,11 @@ GDK_AVAILABLE_IN_ALL GtkWidget* gtk_statusbar_new (void); GDK_AVAILABLE_IN_ALL guint gtk_statusbar_get_context_id (GtkStatusbar *statusbar, - const gchar *context_description); + const char *context_description); GDK_AVAILABLE_IN_ALL guint gtk_statusbar_push (GtkStatusbar *statusbar, guint context_id, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL void gtk_statusbar_pop (GtkStatusbar *statusbar, guint context_id); diff --git a/gtk/gtkstringlist.c b/gtk/gtkstringlist.c index 3b62479e0d..daf1731372 100644 --- a/gtk/gtkstringlist.c +++ b/gtk/gtkstringlist.c @@ -246,8 +246,8 @@ typedef struct GtkBuilder *builder; GtkStringList *list; GString *string; - const gchar *domain; - gchar *context; + const char *domain; + char *context; guint translatable : 1; guint is_text : 1; @@ -255,9 +255,9 @@ typedef struct static void item_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -276,7 +276,7 @@ item_start_element (GtkBuildableParseContext *context, else if (strcmp (element_name, "item") == 0) { gboolean translatable = FALSE; - const gchar *msg_context = NULL; + const char *msg_context = NULL; if (!_gtk_builder_check_parent (data->builder, context, "items", error)) return; @@ -305,7 +305,7 @@ item_start_element (GtkBuildableParseContext *context, static void item_text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -318,7 +318,7 @@ item_text (GtkBuildableParseContext *context, static void item_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -357,7 +357,7 @@ static gboolean gtk_string_list_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -384,7 +384,7 @@ static void gtk_string_list_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { if (strcmp (tagname, "items") == 0) diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 620411e873..b11a5b8028 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -672,7 +672,7 @@ gtk_style_context_restore (GtkStyleContext *context) **/ void gtk_style_context_add_class (GtkStyleContext *context, - const gchar *class_name) + const char *class_name) { GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context); GQuark class_quark; @@ -694,7 +694,7 @@ gtk_style_context_add_class (GtkStyleContext *context, **/ void gtk_style_context_remove_class (GtkStyleContext *context, - const gchar *class_name) + const char *class_name) { GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context); GQuark class_quark; @@ -721,7 +721,7 @@ gtk_style_context_remove_class (GtkStyleContext *context, **/ gboolean gtk_style_context_has_class (GtkStyleContext *context, - const gchar *class_name) + const char *class_name) { GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context); GQuark class_quark; @@ -843,7 +843,7 @@ gtk_style_context_resolve_color (GtkStyleContext *context, **/ gboolean gtk_style_context_lookup_color (GtkStyleContext *context, - const gchar *color_name, + const char *color_name, GdkRGBA *color) { GtkStyleContextPrivate *priv = gtk_style_context_get_instance_private (context); @@ -1324,7 +1324,7 @@ gtk_snapshot_render_insertion_cursor (GtkSnapshot *snapshot, static AtkAttributeSet * add_attribute (AtkAttributeSet *attributes, AtkTextAttribute attr, - const gchar *value) + const char *value) { AtkAttribute *at; @@ -1354,7 +1354,7 @@ _gtk_style_context_get_attributes (AtkAttributeSet *attributes, GtkStyleContext *context) { const GdkRGBA *color; - gchar *value; + char *value; color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR)); value = g_strdup_printf ("%u,%u,%u", diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index 87cc285c2f..688f6fd1e0 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -867,13 +867,13 @@ int gtk_style_context_get_scale (GtkStyleContext *context); GDK_AVAILABLE_IN_ALL void gtk_style_context_add_class (GtkStyleContext *context, - const gchar *class_name); + const char *class_name); GDK_AVAILABLE_IN_ALL void gtk_style_context_remove_class (GtkStyleContext *context, - const gchar *class_name); + const char *class_name); GDK_AVAILABLE_IN_ALL gboolean gtk_style_context_has_class (GtkStyleContext *context, - const gchar *class_name); + const char *class_name); GDK_AVAILABLE_IN_ALL void gtk_style_context_set_display (GtkStyleContext *context, @@ -883,7 +883,7 @@ GdkDisplay *gtk_style_context_get_display (GtkStyleContext *context); GDK_AVAILABLE_IN_ALL gboolean gtk_style_context_lookup_color (GtkStyleContext *context, - const gchar *color_name, + const char *color_name, GdkRGBA *color); /* Some helper functions to retrieve most common properties */ diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c index 6740d9eeed..a6e8d88d93 100644 --- a/gtk/gtkswitch.c +++ b/gtk/gtkswitch.c @@ -364,7 +364,7 @@ gtk_switch_allocate (GtkWidget *widget, static void gtk_switch_set_action_name (GtkActionable *actionable, - const gchar *action_name) + const char *action_name) { GtkSwitch *self = GTK_SWITCH (actionable); @@ -386,7 +386,7 @@ gtk_switch_set_action_target_value (GtkActionable *actionable, gtk_action_helper_set_action_target_value (self->action_helper, action_target); } -static const gchar * +static const char * gtk_switch_get_action_name (GtkActionable *actionable) { GtkSwitch *self = GTK_SWITCH (actionable); diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h index bb756d44ea..d087fed77b 100644 --- a/gtk/gtktextattributes.h +++ b/gtk/gtktextattributes.h @@ -181,7 +181,7 @@ struct _GtkTextAttributes int letter_spacing; - gchar *font_features; + char *font_features; }; GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 37ab1fe77b..662acb3c5e 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -1092,7 +1092,7 @@ _gtk_text_btree_delete (GtkTextIter *start, void _gtk_text_btree_insert (GtkTextIter *iter, - const gchar *text, + const char *text, int len) { GtkTextLineSegment *prev_seg; /* The segment just before the first @@ -2406,7 +2406,7 @@ copy_segment (GString *string, } } -gchar* +char * _gtk_text_btree_get_text (const GtkTextIter *start_orig, const GtkTextIter *end_orig, gboolean include_hidden, @@ -2415,7 +2415,7 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig, GtkTextLineSegment *seg; GtkTextLineSegment *end_seg; GString *retval; - gchar *str; + char *str; GtkTextIter iter; GtkTextIter start; GtkTextIter end; @@ -2717,7 +2717,7 @@ ensure_not_off_end (GtkTextBTree *tree, static GtkTextLineSegment* real_set_mark (GtkTextBTree *tree, GtkTextMark *existing_mark, - const gchar *name, + const char *name, gboolean left_gravity, const GtkTextIter *where, gboolean should_exist, @@ -2846,7 +2846,7 @@ real_set_mark (GtkTextBTree *tree, GtkTextMark* _gtk_text_btree_set_mark (GtkTextBTree *tree, GtkTextMark *existing_mark, - const gchar *name, + const char *name, gboolean left_gravity, const GtkTextIter *iter, gboolean should_exist) @@ -2936,7 +2936,7 @@ _gtk_text_btree_select_range (GtkTextBTree *tree, void _gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree, - const gchar *name) + const char *name) { GtkTextMark *mark; @@ -3017,7 +3017,7 @@ _gtk_text_btree_get_selection_bound (GtkTextBTree *tree) GtkTextMark* _gtk_text_btree_get_mark_by_name (GtkTextBTree *tree, - const gchar *name) + const char *name) { GtkTextLineSegment *seg; @@ -7168,7 +7168,7 @@ _gtk_text_btree_spew (GtkTextBTree *tree) void _gtk_text_btree_spew_line_short (GtkTextLine *line, int indent) { - gchar * spaces; + char * spaces; GtkTextLineSegment *seg; spaces = g_strnfill (indent, ' '); @@ -7183,8 +7183,8 @@ _gtk_text_btree_spew_line_short (GtkTextLine *line, int indent) { if (seg->type == >k_text_char_type) { - gchar* str = g_strndup (seg->body.chars, MIN (seg->byte_count, 10)); - gchar* s; + char * str = g_strndup (seg->body.chars, MIN (seg->byte_count, 10)); + char * s; s = str; while (*s) { @@ -7226,7 +7226,7 @@ _gtk_text_btree_spew_line_short (GtkTextLine *line, int indent) void _gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent) { - gchar * spaces; + char * spaces; GtkTextBTreeNode *iter; Summary *s; @@ -7293,7 +7293,7 @@ _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg) if (seg->type == >k_text_char_type) { - gchar* str = g_strndup (seg->body.chars, seg->byte_count); + char * str = g_strndup (seg->body.chars, seg->byte_count); printf (" '%s'\n", str); g_free (str); } diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h index d144637d31..40d864e074 100644 --- a/gtk/gtktextbtree.h +++ b/gtk/gtktextbtree.h @@ -66,7 +66,7 @@ gboolean _gtk_text_btree_is_end (GtkTextBTree *tree, void _gtk_text_btree_delete (GtkTextIter *start, GtkTextIter *end); void _gtk_text_btree_insert (GtkTextIter *iter, - const gchar *text, + const char *text, int len); void _gtk_text_btree_insert_paintable (GtkTextIter *iter, GdkPaintable *texture); @@ -130,7 +130,7 @@ GtkTextLine * _gtk_text_btree_get_line_at_char (GtkTextBTree *tree, int *real_char_index); GtkTextTag** _gtk_text_btree_get_tags (const GtkTextIter *iter, int *num_tags); -gchar *_gtk_text_btree_get_text (const GtkTextIter *start, +char *_gtk_text_btree_get_text (const GtkTextIter *start, const GtkTextIter *end, gboolean include_hidden, gboolean include_nonchars); @@ -154,10 +154,10 @@ void _gtk_text_btree_get_iter_at_line_byte (GtkTextBTree *tree, int byte_index); gboolean _gtk_text_btree_get_iter_from_string (GtkTextBTree *tree, GtkTextIter *iter, - const gchar *string); + const char *string); gboolean _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree, GtkTextIter *iter, - const gchar *mark_name); + const char *mark_name); void _gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree, GtkTextIter *iter, GtkTextMark *mark); @@ -186,12 +186,12 @@ void _gtk_text_btree_get_iter_at_child_anchor (GtkTextBTree *tree, /* Manipulate marks */ GtkTextMark *_gtk_text_btree_set_mark (GtkTextBTree *tree, GtkTextMark *existing_mark, - const gchar *name, + const char *name, gboolean left_gravity, const GtkTextIter *index, gboolean should_exist); void _gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree, - const gchar *name); + const char *name); void _gtk_text_btree_remove_mark (GtkTextBTree *tree, GtkTextMark *segment); gboolean _gtk_text_btree_get_selection_bounds (GtkTextBTree *tree, @@ -209,7 +209,7 @@ gboolean _gtk_text_btree_mark_is_selection_bound (GtkTextBTree GtkTextMark *_gtk_text_btree_get_insert (GtkTextBTree *tree); GtkTextMark *_gtk_text_btree_get_selection_bound (GtkTextBTree *tree); GtkTextMark *_gtk_text_btree_get_mark_by_name (GtkTextBTree *tree, - const gchar *name); + const char *name); GtkTextLine * _gtk_text_btree_first_could_contain_tag (GtkTextBTree *tree, GtkTextTag *tag); GtkTextLine * _gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree, diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index c4f59efc4e..7626d29671 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -126,7 +126,7 @@ static void gtk_text_buffer_finalize (GObject *object); static void gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len); static void gtk_text_buffer_real_insert_paintable (GtkTextBuffer *buffer, GtkTextIter *iter, @@ -1175,7 +1175,7 @@ gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer) **/ void gtk_text_buffer_set_text (GtkTextBuffer *buffer, - const gchar *text, + const char *text, int len) { GtkTextIter start, end; @@ -1210,7 +1210,7 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer, static void gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len) { g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); @@ -1230,7 +1230,7 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer, static void gtk_text_buffer_emit_insert (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len) { g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); @@ -1267,7 +1267,7 @@ gtk_text_buffer_emit_insert (GtkTextBuffer *buffer, void gtk_text_buffer_insert (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len) { g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); @@ -1289,7 +1289,7 @@ gtk_text_buffer_insert (GtkTextBuffer *buffer, **/ void gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer, - const gchar *text, + const char *text, int len) { GtkTextIter iter; @@ -1325,7 +1325,7 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer, gboolean gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len, gboolean default_editable) { @@ -1362,7 +1362,7 @@ gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer, **/ gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer, - const gchar *text, + const char *text, int len, gboolean default_editable) { @@ -1392,7 +1392,7 @@ insert_text_range (GtkTextBuffer *buffer, const GtkTextIter *orig_end, gboolean interactive) { - gchar *text; + char *text; text = gtk_text_iter_get_text (orig_start, orig_end); @@ -1820,7 +1820,7 @@ gtk_text_buffer_insert_range_interactive (GtkTextBuffer *buffer, void gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len, GtkTextTag *first_tag, ...) @@ -1871,15 +1871,15 @@ gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer, void gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len, - const gchar *first_tag_name, + const char *first_tag_name, ...) { int start_offset; GtkTextIter start; va_list args; - const gchar *tag_name; + const char *tag_name; g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (iter != NULL); @@ -1913,7 +1913,7 @@ gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer, gtk_text_buffer_apply_tag (buffer, tag, &start, iter); - tag_name = va_arg (args, const gchar*); + tag_name = va_arg (args, const char *); } va_end (args); @@ -1938,7 +1938,7 @@ gtk_text_buffer_real_delete_range (GtkTextBuffer *buffer, if (gtk_text_history_get_enabled (buffer->priv->history)) { GtkTextIter sel_begin, sel_end; - gchar *text; + char *text; if (gtk_text_buffer_get_selection_bounds (buffer, &sel_begin, &sel_end)) gtk_text_history_selection_changed (buffer->priv->history, @@ -2182,7 +2182,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer, * * Returns: (transfer full): an allocated UTF-8 string **/ -gchar* +char * gtk_text_buffer_get_text (GtkTextBuffer *buffer, const GtkTextIter *start, const GtkTextIter *end, @@ -2220,7 +2220,7 @@ gtk_text_buffer_get_text (GtkTextBuffer *buffer, * * Returns: (transfer full): an allocated UTF-8 string **/ -gchar* +char * gtk_text_buffer_get_slice (GtkTextBuffer *buffer, const GtkTextIter *start, const GtkTextIter *end, @@ -2408,7 +2408,7 @@ gtk_text_buffer_mark_set (GtkTextBuffer *buffer, static GtkTextMark* gtk_text_buffer_set_mark (GtkTextBuffer *buffer, GtkTextMark *existing_mark, - const gchar *mark_name, + const char *mark_name, const GtkTextIter *iter, gboolean left_gravity, gboolean should_exist) @@ -2463,7 +2463,7 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer, **/ GtkTextMark* gtk_text_buffer_create_mark (GtkTextBuffer *buffer, - const gchar *mark_name, + const char *mark_name, const GtkTextIter *where, gboolean left_gravity) { @@ -2491,7 +2491,7 @@ gtk_text_buffer_add_mark (GtkTextBuffer *buffer, GtkTextMark *mark, const GtkTextIter *where) { - const gchar *name; + const char *name; g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer)); g_return_if_fail (GTK_IS_TEXT_MARK (mark)); @@ -2602,7 +2602,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer, **/ GtkTextMark* gtk_text_buffer_get_mark (GtkTextBuffer *buffer, - const gchar *name) + const char *name) { GtkTextMark *mark; @@ -2625,7 +2625,7 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer, **/ void gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer, - const gchar *name, + const char *name, const GtkTextIter *where) { GtkTextMark *mark; @@ -2654,7 +2654,7 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer, **/ void gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer, - const gchar *name) + const char *name) { GtkTextMark *mark; @@ -2822,8 +2822,8 @@ gtk_text_buffer_select_range (GtkTextBuffer *buffer, */ GtkTextTag* gtk_text_buffer_create_tag (GtkTextBuffer *buffer, - const gchar *tag_name, - const gchar *first_property_name, + const char *tag_name, + const char *first_property_name, ...) { GtkTextTag *tag; @@ -3012,7 +3012,7 @@ gtk_text_buffer_remove_tag (GtkTextBuffer *buffer, **/ void gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer, - const gchar *name, + const char *name, const GtkTextIter *start, const GtkTextIter *end) { @@ -3049,7 +3049,7 @@ gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer, **/ void gtk_text_buffer_remove_tag_by_name (GtkTextBuffer *buffer, - const gchar *name, + const char *name, const GtkTextIter *start, const GtkTextIter *end) { @@ -3964,7 +3964,7 @@ gtk_text_buffer_backspace (GtkTextBuffer *buffer, gboolean interactive, gboolean default_editable) { - gchar *cluster_text; + char *cluster_text; GtkTextIter start; GtkTextIter end; gboolean retval = FALSE; @@ -3998,7 +3998,7 @@ gtk_text_buffer_backspace (GtkTextBuffer *buffer, /* special case \r\n, since we never want to reinsert \r */ if (backspace_deletes_character && strcmp ("\r\n", cluster_text)) { - gchar *normalized_text = g_utf8_normalize (cluster_text, + char *normalized_text = g_utf8_normalize (cluster_text, strlen (cluster_text), G_NORMALIZE_NFD); glong len = g_utf8_strlen (normalized_text, -1); @@ -4257,7 +4257,7 @@ compute_log_attrs (const GtkTextIter *iter, { GtkTextIter start; GtkTextIter end; - gchar *paragraph; + char *paragraph; int char_len, byte_len; PangoLogAttr *attrs = NULL; @@ -4846,7 +4846,7 @@ get_tag_for_attributes (PangoAttrIterator *iter) static void gtk_text_buffer_insert_with_attributes (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, PangoAttrList *attributes) { GtkTextMark *mark; @@ -4905,11 +4905,11 @@ gtk_text_buffer_insert_with_attributes (GtkTextBuffer *buffer, void gtk_text_buffer_insert_markup (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *markup, + const char *markup, int len) { PangoAttrList *attributes; - gchar *text; + char *text; GError *error = NULL; if (!pango_parse_markup (markup, len, 0, &attributes, &text, NULL, &error)) diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index bd7f272ece..1c382bb7c5 100644 --- a/gtk/gtktextbuffer.h +++ b/gtk/gtktextbuffer.h @@ -104,7 +104,7 @@ struct _GtkTextBufferClass void (* insert_text) (GtkTextBuffer *buffer, GtkTextIter *pos, - const gchar *new_text, + const char *new_text, int new_text_length); void (* insert_paintable) (GtkTextBuffer *buffer, @@ -178,29 +178,29 @@ GtkTextTagTable* gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer); /* Delete whole buffer, then insert */ GDK_AVAILABLE_IN_ALL void gtk_text_buffer_set_text (GtkTextBuffer *buffer, - const gchar *text, + const char *text, int len); /* Insert into the buffer */ GDK_AVAILABLE_IN_ALL void gtk_text_buffer_insert (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len); GDK_AVAILABLE_IN_ALL void gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer, - const gchar *text, + const char *text, int len); GDK_AVAILABLE_IN_ALL gboolean gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len, gboolean default_editable); GDK_AVAILABLE_IN_ALL gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer, - const gchar *text, + const char *text, int len, gboolean default_editable); @@ -219,7 +219,7 @@ gboolean gtk_text_buffer_insert_range_interactive (GtkTextBuffer *buffer, GDK_AVAILABLE_IN_ALL void gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len, GtkTextTag *first_tag, ...) G_GNUC_NULL_TERMINATED; @@ -227,15 +227,15 @@ void gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer, GDK_AVAILABLE_IN_ALL void gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *text, + const char *text, int len, - const gchar *first_tag_name, + const char *first_tag_name, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL void gtk_text_buffer_insert_markup (GtkTextBuffer *buffer, GtkTextIter *iter, - const gchar *markup, + const char *markup, int len); /* Delete from the buffer */ @@ -256,13 +256,13 @@ gboolean gtk_text_buffer_backspace (GtkTextBuffer *buffer, /* Obtain strings from the buffer */ GDK_AVAILABLE_IN_ALL -gchar *gtk_text_buffer_get_text (GtkTextBuffer *buffer, +char *gtk_text_buffer_get_text (GtkTextBuffer *buffer, const GtkTextIter *start, const GtkTextIter *end, gboolean include_hidden_chars); GDK_AVAILABLE_IN_ALL -gchar *gtk_text_buffer_get_slice (GtkTextBuffer *buffer, +char *gtk_text_buffer_get_slice (GtkTextBuffer *buffer, const GtkTextIter *start, const GtkTextIter *end, gboolean include_hidden_chars); @@ -291,7 +291,7 @@ void gtk_text_buffer_add_mark (GtkTextBuffer *buffer, const GtkTextIter *where); GDK_AVAILABLE_IN_ALL GtkTextMark *gtk_text_buffer_create_mark (GtkTextBuffer *buffer, - const gchar *mark_name, + const char *mark_name, const GtkTextIter *where, gboolean left_gravity); GDK_AVAILABLE_IN_ALL @@ -303,15 +303,15 @@ void gtk_text_buffer_delete_mark (GtkTextBuffer *buffer, GtkTextMark *mark); GDK_AVAILABLE_IN_ALL GtkTextMark* gtk_text_buffer_get_mark (GtkTextBuffer *buffer, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL void gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer, - const gchar *name, + const char *name, const GtkTextIter *where); GDK_AVAILABLE_IN_ALL void gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL GtkTextMark* gtk_text_buffer_get_insert (GtkTextBuffer *buffer); @@ -342,12 +342,12 @@ void gtk_text_buffer_remove_tag (GtkTextBuffer *buffer, const GtkTextIter *end); GDK_AVAILABLE_IN_ALL void gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer, - const gchar *name, + const char *name, const GtkTextIter *start, const GtkTextIter *end); GDK_AVAILABLE_IN_ALL void gtk_text_buffer_remove_tag_by_name (GtkTextBuffer *buffer, - const gchar *name, + const char *name, const GtkTextIter *start, const GtkTextIter *end); GDK_AVAILABLE_IN_ALL @@ -361,8 +361,8 @@ void gtk_text_buffer_remove_all_tags (GtkTextBuffer *buffer, */ GDK_AVAILABLE_IN_ALL GtkTextTag *gtk_text_buffer_create_tag (GtkTextBuffer *buffer, - const gchar *tag_name, - const gchar *first_property_name, + const char *tag_name, + const char *first_property_name, ...); /* Obtain iterators pointed at various places, then you can move the diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index bd87f34bcf..6fdf42d138 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -903,7 +903,7 @@ gtk_text_iter_get_char (const GtkTextIter *iter) * * Returns: (transfer full): slice of text from the buffer **/ -gchar* +char * gtk_text_iter_get_slice (const GtkTextIter *start, const GtkTextIter *end) { @@ -929,7 +929,7 @@ gtk_text_iter_get_slice (const GtkTextIter *start, * * Returns: (transfer full): array of characters from the buffer **/ -gchar* +char * gtk_text_iter_get_text (const GtkTextIter *start, const GtkTextIter *end) { @@ -953,7 +953,7 @@ gtk_text_iter_get_text (const GtkTextIter *start, * * Returns: (transfer full): slice of text from the buffer **/ -gchar* +char * gtk_text_iter_get_visible_slice (const GtkTextIter *start, const GtkTextIter *end) { @@ -978,7 +978,7 @@ gtk_text_iter_get_visible_slice (const GtkTextIter *start, * Returns: (transfer full): string containing visible text in the * range **/ -gchar* +char * gtk_text_iter_get_visible_text (const GtkTextIter *start, const GtkTextIter *end) { @@ -4433,9 +4433,9 @@ forward_chars_with_skipping (GtkTextIter *iter, offsets coming from canonical decompositions of UTF8 characters (e.g. accented characters) which g_utf8_normalize() performs */ - gchar *normal; - gchar *casefold; - gchar buffer[6]; + char *normal; + char *casefold; + char buffer[6]; int buffer_len; buffer_len = g_unichar_to_utf8 (gtk_text_iter_get_char (iter), buffer); @@ -4453,12 +4453,12 @@ forward_chars_with_skipping (GtkTextIter *iter, } } -static const gchar * -pointer_from_offset_skipping_decomp (const gchar *str, +static const char * +pointer_from_offset_skipping_decomp (const char *str, int offset) { - gchar *casefold, *normal; - const gchar *p, *q; + char *casefold, *normal; + const char *p, *q; p = str; @@ -4477,8 +4477,8 @@ pointer_from_offset_skipping_decomp (const gchar *str, } static gboolean -exact_prefix_cmp (const gchar *string, - const gchar *prefix, +exact_prefix_cmp (const char *string, + const char *prefix, guint prefix_len) { GUnicodeType type; @@ -4498,16 +4498,16 @@ exact_prefix_cmp (const gchar *string, type != G_UNICODE_NON_SPACING_MARK; } -static const gchar * -utf8_strcasestr (const gchar *haystack, - const gchar *needle) +static const char * +utf8_strcasestr (const char *haystack, + const char *needle) { gsize needle_len; gsize haystack_len; - const gchar *ret = NULL; - gchar *p; - gchar *casefold; - gchar *caseless_haystack; + const char *ret = NULL; + char *p; + char *casefold; + char *caseless_haystack; int i; g_return_val_if_fail (haystack != NULL, NULL); @@ -4522,7 +4522,7 @@ utf8_strcasestr (const gchar *haystack, if (needle_len == 0) { - ret = (gchar *)haystack; + ret = (char *)haystack; goto finally; } @@ -4532,7 +4532,7 @@ utf8_strcasestr (const gchar *haystack, goto finally; } - p = (gchar *)caseless_haystack; + p = (char *)caseless_haystack; needle_len = strlen (needle); i = 0; @@ -4554,16 +4554,16 @@ finally: return ret; } -static const gchar * -utf8_strrcasestr (const gchar *haystack, - const gchar *needle) +static const char * +utf8_strrcasestr (const char *haystack, + const char *needle) { gsize needle_len; gsize haystack_len; - const gchar *ret = NULL; - gchar *p; - gchar *casefold; - gchar *caseless_haystack; + const char *ret = NULL; + char *p; + char *casefold; + char *caseless_haystack; int i; g_return_val_if_fail (haystack != NULL, NULL); @@ -4578,7 +4578,7 @@ utf8_strrcasestr (const gchar *haystack, if (needle_len == 0) { - ret = (gchar *)haystack; + ret = (char *)haystack; goto finally; } @@ -4616,14 +4616,14 @@ finally: /* normalizes caseless strings and returns true if @s2 matches the start of @s1 */ static gboolean -utf8_caselessnmatch (const gchar *s1, - const gchar *s2, +utf8_caselessnmatch (const char *s1, + const char *s2, gssize n1, gssize n2) { - gchar *casefold; - gchar *normalized_s1; - gchar *normalized_s2; + char *casefold; + char *normalized_s1; + char *normalized_s2; int len_s1; int len_s2; gboolean ret = FALSE; @@ -4655,7 +4655,7 @@ utf8_caselessnmatch (const gchar *s1, static gboolean lines_match (const GtkTextIter *start, - const gchar **lines, + const char **lines, gboolean visible_only, gboolean slice, gboolean case_insensitive, @@ -4663,8 +4663,8 @@ lines_match (const GtkTextIter *start, GtkTextIter *match_end) { GtkTextIter next; - gchar *line_text; - const gchar *found; + char *line_text; + const char *found; int offset; if (*lines == NULL || **lines == '\0') @@ -4762,7 +4762,7 @@ lines_match (const GtkTextIter *start, } /* strsplit() that retains the delimiter as part of the string. */ -static gchar ** +static char ** strbreakup (const char *string, const char *delimiter, int max_tokens, @@ -4770,8 +4770,8 @@ strbreakup (const char *string, gboolean case_insensitive) { GSList *string_list = NULL, *slist; - gchar **str_array, *s; - gchar *casefold, *new_string; + char **str_array, *s; + char *casefold, *new_string; guint i, n = 1; g_return_val_if_fail (string != NULL, NULL); @@ -4790,7 +4790,7 @@ strbreakup (const char *string, guint len; len = s - string + delimiter_len; - new_string = g_new (gchar, len + 1); + new_string = g_new (char, len + 1); strncpy (new_string, string, len); new_string[len] = 0; @@ -4825,7 +4825,7 @@ strbreakup (const char *string, string_list = g_slist_prepend (string_list, new_string); } - str_array = g_new (gchar*, n); + str_array = g_new (char *, n); i = n - 1; @@ -4864,13 +4864,13 @@ strbreakup (const char *string, **/ gboolean gtk_text_iter_forward_search (const GtkTextIter *iter, - const gchar *str, + const char *str, GtkTextSearchFlags flags, GtkTextIter *match_start, GtkTextIter *match_end, const GtkTextIter *limit) { - gchar **lines = NULL; + char **lines = NULL; GtkTextIter match; gboolean retval = FALSE; GtkTextIter search; @@ -4928,7 +4928,7 @@ gtk_text_iter_forward_search (const GtkTextIter *iter, gtk_text_iter_compare (&search, limit) >= 0) break; - if (lines_match (&search, (const gchar**)lines, + if (lines_match (&search, (const char **)lines, visible_only, slice, case_insensitive, &match, &end)) { if (limit == NULL || @@ -4949,19 +4949,19 @@ gtk_text_iter_forward_search (const GtkTextIter *iter, } while (gtk_text_iter_forward_line (&search)); - g_strfreev ((gchar**)lines); + g_strfreev ((char **)lines); return retval; } static gboolean -vectors_equal_ignoring_trailing (gchar **vec1, - gchar **vec2, +vectors_equal_ignoring_trailing (char **vec1, + char **vec2, gboolean case_insensitive) { /* Ignores trailing chars in vec2's last line */ - gchar **i1, **i2; + char **i1, **i2; i1 = vec1; i2 = vec2; @@ -5038,7 +5038,7 @@ typedef struct _LinesWindow LinesWindow; struct _LinesWindow { int n_lines; - gchar **lines; + char **lines; GtkTextIter first_line_start; GtkTextIter first_line_end; @@ -5062,7 +5062,7 @@ lines_window_init (LinesWindow *win, gtk_text_iter_get_line (start) + 1 < win->n_lines) { /* Already at the end, or not enough lines to match */ - win->lines = g_new0 (gchar*, 1); + win->lines = g_new0 (char *, 1); *win->lines = NULL; return; } @@ -5082,12 +5082,12 @@ lines_window_init (LinesWindow *win, win->first_line_start = line_start; win->first_line_end = line_end; - win->lines = g_new0 (gchar*, win->n_lines + 1); + win->lines = g_new0 (char *, win->n_lines + 1); i = win->n_lines - 1; while (i >= 0) { - gchar *line_text; + char *line_text; if (win->slice) { @@ -5119,7 +5119,7 @@ static gboolean lines_window_back (LinesWindow *win) { GtkTextIter new_start; - gchar *line_text; + char *line_text; new_start = win->first_line_start; @@ -5153,7 +5153,7 @@ lines_window_back (LinesWindow *win) } /* Move lines to make room for first line. */ - memmove (win->lines + 1, win->lines, win->n_lines * sizeof (gchar*)); + memmove (win->lines + 1, win->lines, win->n_lines * sizeof (char *)); *win->lines = line_text; @@ -5188,14 +5188,14 @@ lines_window_free (LinesWindow *win) **/ gboolean gtk_text_iter_backward_search (const GtkTextIter *iter, - const gchar *str, + const char *str, GtkTextSearchFlags flags, GtkTextIter *match_start, GtkTextIter *match_end, const GtkTextIter *limit) { - gchar **lines = NULL; - gchar **l; + char **lines = NULL; + char **l; int n_lines; LinesWindow win; gboolean retval = FALSE; @@ -5249,7 +5249,7 @@ gtk_text_iter_backward_search (const GtkTextIter *iter, do { - const gchar *first_line_match; + const char *first_line_match; if (limit && gtk_text_iter_compare (limit, &win.first_line_end) > 0) @@ -5649,7 +5649,7 @@ _gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree, gboolean _gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree, GtkTextIter *iter, - const gchar *mark_name) + const char *mark_name) { GtkTextMark *mark; @@ -5812,7 +5812,7 @@ _gtk_text_iter_check (const GtkTextIter *iter) if (byte_segment->type == >k_text_char_type) { - const gchar *p; + const char *p; p = byte_segment->body.chars + seg_byte_offset; if (!gtk_text_byte_begins_utf8_char (p)) @@ -5843,7 +5843,7 @@ _gtk_text_iter_check (const GtkTextIter *iter) if (char_segment->type == >k_text_char_type) { - const gchar *p; + const char *p; p = g_utf8_offset_to_pointer (char_segment->body.chars, seg_char_offset); diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h index 31bf5ea61b..d47f0cfba2 100644 --- a/gtk/gtktextiter.h +++ b/gtk/gtktextiter.h @@ -139,19 +139,19 @@ gunichar gtk_text_iter_get_char (const GtkTextIter *iter); * into the returned string map properly into buffer char offsets */ GDK_AVAILABLE_IN_ALL -gchar *gtk_text_iter_get_slice (const GtkTextIter *start, +char *gtk_text_iter_get_slice (const GtkTextIter *start, const GtkTextIter *end); /* includes only text, no 0xFFFC */ GDK_AVAILABLE_IN_ALL -gchar *gtk_text_iter_get_text (const GtkTextIter *start, +char *gtk_text_iter_get_text (const GtkTextIter *start, const GtkTextIter *end); /* exclude invisible chars */ GDK_AVAILABLE_IN_ALL -gchar *gtk_text_iter_get_visible_slice (const GtkTextIter *start, +char *gtk_text_iter_get_visible_slice (const GtkTextIter *start, const GtkTextIter *end); GDK_AVAILABLE_IN_ALL -gchar *gtk_text_iter_get_visible_text (const GtkTextIter *start, +char *gtk_text_iter_get_visible_text (const GtkTextIter *start, const GtkTextIter *end); GDK_AVAILABLE_IN_ALL @@ -370,7 +370,7 @@ gboolean gtk_text_iter_backward_find_char (GtkTextIter *iter, GDK_AVAILABLE_IN_ALL gboolean gtk_text_iter_forward_search (const GtkTextIter *iter, - const gchar *str, + const char *str, GtkTextSearchFlags flags, GtkTextIter *match_start, GtkTextIter *match_end, @@ -378,7 +378,7 @@ gboolean gtk_text_iter_forward_search (const GtkTextIter *iter, GDK_AVAILABLE_IN_ALL gboolean gtk_text_iter_backward_search (const GtkTextIter *iter, - const gchar *str, + const char *str, GtkTextSearchFlags flags, GtkTextIter *match_start, GtkTextIter *match_end, diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 7ced6f31a7..78439277bf 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -133,7 +133,7 @@ static void gtk_text_layout_after_mark_set_handler (GtkTextBuffer *buffe gpointer data); static void gtk_text_layout_after_buffer_insert_text (GtkTextBuffer *textbuffer, GtkTextIter *iter, - gchar *str, + char *str, int len, gpointer data); static void gtk_text_layout_after_buffer_delete_range (GtkTextBuffer *textbuffer, @@ -146,7 +146,7 @@ static void gtk_text_layout_before_mark_set_handler (GtkTextBuffer *buffe gpointer data); static void gtk_text_layout_before_buffer_insert_text (GtkTextBuffer *textbuffer, GtkTextIter *iter, - gchar *str, + char *str, int len, gpointer data); static void gtk_text_layout_before_buffer_delete_range (GtkTextBuffer *textbuffer, @@ -587,7 +587,7 @@ gtk_text_layout_get_cursor_visible (GtkTextLayout *layout) */ void gtk_text_layout_set_preedit_string (GtkTextLayout *layout, - const gchar *preedit_string, + const char *preedit_string, PangoAttrList *preedit_attrs, int cursor_pos) { @@ -2318,7 +2318,7 @@ gtk_text_layout_create_display (GtkTextLayout *layout, GtkTextLineSegment *seg; GtkTextIter iter; GtkTextAttributes *style; - gchar *text; + char *text; int text_pixel_width; PangoAttrList *attrs; int text_allocated, layout_byte_offset, buffer_byte_offset; @@ -3849,7 +3849,7 @@ gtk_text_layout_after_mark_set_handler (GtkTextBuffer *buffer, static void gtk_text_layout_before_buffer_insert_text (GtkTextBuffer *textbuffer, GtkTextIter *iter, - gchar *str, + char *str, int len, gpointer data) { @@ -3863,7 +3863,7 @@ gtk_text_layout_before_buffer_insert_text (GtkTextBuffer *textbuffer, static void gtk_text_layout_after_buffer_insert_text (GtkTextBuffer *textbuffer, GtkTextIter *iter, - gchar *str, + char *str, int len, gpointer data) { diff --git a/gtk/gtktextlayoutprivate.h b/gtk/gtktextlayoutprivate.h index e9c56f01e6..2ffab44fdd 100644 --- a/gtk/gtktextlayoutprivate.h +++ b/gtk/gtktextlayoutprivate.h @@ -156,7 +156,7 @@ struct _GtkTextLayout /* The preedit string and attributes, if any */ - gchar *preedit_string; + char *preedit_string; PangoAttrList *preedit_attrs; int preedit_len; int preedit_cursor; @@ -249,7 +249,7 @@ void gtk_text_layout_default_style_changed (GtkTextLayout *lay void gtk_text_layout_set_screen_width (GtkTextLayout *layout, int width); void gtk_text_layout_set_preedit_string (GtkTextLayout *layout, - const gchar *preedit_string, + const char *preedit_string, PangoAttrList *preedit_attrs, int cursor_pos); diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c index 12c6e2d846..ebfa6242bc 100644 --- a/gtk/gtktextmark.c +++ b/gtk/gtktextmark.c @@ -192,7 +192,7 @@ gtk_text_mark_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - gchar *tmp; + char *tmp; GtkTextMark *mark = GTK_TEXT_MARK (object); GtkTextLineSegment *seg = mark->segment; @@ -257,7 +257,7 @@ gtk_text_mark_get_property (GObject *object, * Returns: new #GtkTextMark **/ GtkTextMark * -gtk_text_mark_new (const gchar *name, +gtk_text_mark_new (const char *name, gboolean left_gravity) { return g_object_new (GTK_TYPE_TEXT_MARK, diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h index c4d5fd4172..1f8a5b088b 100644 --- a/gtk/gtktextmark.h +++ b/gtk/gtktextmark.h @@ -87,7 +87,7 @@ GDK_AVAILABLE_IN_ALL GType gtk_text_mark_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkTextMark *gtk_text_mark_new (const gchar *name, +GtkTextMark *gtk_text_mark_new (const char *name, gboolean left_gravity); GDK_AVAILABLE_IN_ALL void gtk_text_mark_set_visible (GtkTextMark *mark, @@ -96,7 +96,7 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_text_mark_get_visible (GtkTextMark *mark); GDK_AVAILABLE_IN_ALL -const gchar * gtk_text_mark_get_name (GtkTextMark *mark); +const char * gtk_text_mark_get_name (GtkTextMark *mark); GDK_AVAILABLE_IN_ALL gboolean gtk_text_mark_get_deleted (GtkTextMark *mark); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtktextmarkprivate.h b/gtk/gtktextmarkprivate.h index 3c0ede5d18..ca09d46149 100644 --- a/gtk/gtktextmarkprivate.h +++ b/gtk/gtktextmarkprivate.h @@ -40,7 +40,7 @@ G_BEGIN_DECLS struct _GtkTextMarkBody { GtkTextMark *obj; - gchar *name; + char *name; GtkTextBTree *tree; GtkTextLine *line; guint visible : 1; diff --git a/gtk/gtktextprivate.h b/gtk/gtktextprivate.h index a328a420bb..0fde7d8fe4 100644 --- a/gtk/gtktextprivate.h +++ b/gtk/gtktextprivate.h @@ -75,7 +75,7 @@ struct _GtkTextClass int count, gboolean extend); void (* insert_at_cursor) (GtkText *self, - const gchar *str); + const char *str); void (* delete_from_cursor) (GtkText *self, GtkDeleteType type, int count); diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c index 96e8ee2fbb..a202ab603c 100644 --- a/gtk/gtktextsegment.c +++ b/gtk/gtktextsegment.c @@ -187,7 +187,7 @@ char_segment_self_check (GtkTextLineSegment *seg) } GtkTextLineSegment* -_gtk_char_segment_new (const gchar *text, guint len) +_gtk_char_segment_new (const char *text, guint len) { GtkTextLineSegment *seg; @@ -209,10 +209,10 @@ _gtk_char_segment_new (const gchar *text, guint len) } GtkTextLineSegment* -_gtk_char_segment_new_from_two_strings (const gchar *text1, +_gtk_char_segment_new_from_two_strings (const char *text1, guint len1, guint chars1, - const gchar *text2, + const char *text2, guint len2, guint chars2) { diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h index 119f4b8169..ce093d4301 100644 --- a/gtk/gtktextsegment.h +++ b/gtk/gtktextsegment.h @@ -152,12 +152,12 @@ struct _GtkTextLineSegment { GtkTextLineSegment *gtk_text_line_segment_split (const GtkTextIter *iter); -GtkTextLineSegment *_gtk_char_segment_new (const gchar *text, +GtkTextLineSegment *_gtk_char_segment_new (const char *text, guint len); -GtkTextLineSegment *_gtk_char_segment_new_from_two_strings (const gchar *text1, +GtkTextLineSegment *_gtk_char_segment_new_from_two_strings (const char *text1, guint len1, guint chars1, - const gchar *text2, + const char *text2, guint len2, guint chars2); GtkTextLineSegment *_gtk_toggle_segment_new (GtkTextTagInfo *info, diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 03e22e31ab..9a970e6dc3 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -862,7 +862,7 @@ gtk_text_tag_init (GtkTextTag *text_tag) * Returns: a new #GtkTextTag **/ GtkTextTag* -gtk_text_tag_new (const gchar *name) +gtk_text_tag_new (const char *name) { GtkTextTag *tag; @@ -1291,7 +1291,7 @@ gtk_text_tag_set_property (GObject *object, case PROP_FONT: { PangoFontDescription *font_desc = NULL; - const gchar *name; + const char *name; name = g_value_get_string (value); @@ -1788,7 +1788,7 @@ gtk_text_tag_get_property (GObject *object, case PROP_FONT: { - gchar *str; + char *str; gtk_text_tag_ensure_font (tag); diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h index 067aa14a99..942671a0aa 100644 --- a/gtk/gtktexttag.h +++ b/gtk/gtktexttag.h @@ -94,7 +94,7 @@ struct _GtkTextTagClass GDK_AVAILABLE_IN_ALL GType gtk_text_tag_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -GtkTextTag *gtk_text_tag_new (const gchar *name); +GtkTextTag *gtk_text_tag_new (const char *name); GDK_AVAILABLE_IN_ALL int gtk_text_tag_get_priority (GtkTextTag *tag); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index d3fd18d780..70980e3d8f 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -105,7 +105,7 @@ static void gtk_text_tag_table_buildable_interface_init (GtkBuildableIface *if static void gtk_text_tag_table_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); static guint signals[LAST_SIGNAL] = { 0 }; @@ -260,7 +260,7 @@ static void gtk_text_tag_table_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (type && strcmp (type, "tag") == 0) gtk_text_tag_table_add (GTK_TEXT_TAG_TABLE (buildable), @@ -337,7 +337,7 @@ gtk_text_tag_table_add (GtkTextTagTable *table, **/ GtkTextTag* gtk_text_tag_table_lookup (GtkTextTagTable *table, - const gchar *name) + const char *name) { GtkTextTagTablePrivate *priv; diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h index e4e142c147..3602f17cf0 100644 --- a/gtk/gtktexttagtable.h +++ b/gtk/gtktexttagtable.h @@ -57,7 +57,7 @@ void gtk_text_tag_table_remove (GtkTextTagTable *table, GtkTextTag *tag); GDK_AVAILABLE_IN_ALL GtkTextTag *gtk_text_tag_table_lookup (GtkTextTagTable *table, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL void gtk_text_tag_table_foreach (GtkTextTagTable *table, GtkTextTagTableForeach func, diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c index 230ee7c0b7..f9646ac9b8 100644 --- a/gtk/gtktexttypes.c +++ b/gtk/gtktexttypes.c @@ -28,17 +28,17 @@ /* These are used to represent embedded non-character objects * if you return a string representation of a text buffer */ -const gchar _gtk_text_unknown_char_utf8[] = { '\xEF', '\xBF', '\xBC', '\0' }; +const char _gtk_text_unknown_char_utf8[] = { '\xEF', '\xBF', '\xBC', '\0' }; /* This is to be used only by libgtk test programs */ -const gchar * +const char * gtk_text_unknown_char_utf8_gtk_tests_only (void) { return _gtk_text_unknown_char_utf8; } gboolean -gtk_text_byte_begins_utf8_char (const gchar *byte) +gtk_text_byte_begins_utf8_char (const char *byte) { return ((*byte & 0xC0) != 0x80); } diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h index 02520eab3a..fdb7f710f7 100644 --- a/gtk/gtktexttypes.h +++ b/gtk/gtktexttypes.h @@ -60,11 +60,11 @@ extern G_GNUC_INTERNAL const GtkTextLineSegmentClass gtk_text_child_type; #define GTK_TEXT_UNKNOWN_CHAR 0xFFFC #define GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN 3 GDK_AVAILABLE_IN_ALL -const gchar *gtk_text_unknown_char_utf8_gtk_tests_only (void); -extern const gchar _gtk_text_unknown_char_utf8[GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN+1]; +const char *gtk_text_unknown_char_utf8_gtk_tests_only (void); +extern const char _gtk_text_unknown_char_utf8[GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN+1]; GDK_AVAILABLE_IN_ALL -gboolean gtk_text_byte_begins_utf8_char (const gchar *byte); +gboolean gtk_text_byte_begins_utf8_char (const char *byte); G_END_DECLS diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c index 56e43d5a39..6110046084 100644 --- a/gtk/gtktextutil.c +++ b/gtk/gtktextutil.c @@ -44,7 +44,7 @@ #define ELLIPSIS_CHARACTER "\xe2\x80\xa6" static void -append_n_lines (GString *str, const gchar *text, GSList *lines, int n_lines) +append_n_lines (GString *str, const char *text, GSList *lines, int n_lines) { PangoLayoutLine *line; int i; @@ -60,7 +60,7 @@ append_n_lines (GString *str, const gchar *text, GSList *lines, int n_lines) static void limit_layout_lines (PangoLayout *layout) { - const gchar *text; + const char *text; GString *str; GSList *lines, *elem; int n_lines; @@ -93,7 +93,7 @@ limit_layout_lines (PangoLayout *layout) /** * gtk_text_util_create_drag_icon: * @widget: #GtkWidget to extract the pango context - * @text: a #gchar to render the icon + * @text: a #char to render the icon * @len: length of @text, or -1 for NUL-terminated text * * Creates a drag and drop icon from @text. @@ -102,7 +102,7 @@ limit_layout_lines (PangoLayout *layout) */ GdkPaintable * gtk_text_util_create_drag_icon (GtkWidget *widget, - gchar *text, + char *text, gssize len) { GtkCssStyle *style; @@ -301,7 +301,7 @@ _gtk_text_util_get_block_cursor_location (PangoLayout *layout, PangoLayoutLine *layout_line; gboolean rtl; int line_no; - const gchar *text; + const char *text; g_return_val_if_fail (layout != NULL, FALSE); g_return_val_if_fail (index >= 0, FALSE); @@ -365,7 +365,7 @@ _gtk_text_util_get_block_cursor_location (PangoLayout *layout, PangoRectangle line_rect; int i; int left, right; - const gchar *p; + const char *p; p = g_utf8_prev_char (text + index); diff --git a/gtk/gtktextutil.h b/gtk/gtktextutil.h index 7e95af3a3f..512532c4d0 100644 --- a/gtk/gtktextutil.h +++ b/gtk/gtktextutil.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS */ GdkPaintable * gtk_text_util_create_drag_icon (GtkWidget *widget, - gchar *text, + char *text, gssize len); GdkPaintable * gtk_text_util_create_rich_drag_icon (GtkWidget *widget, GtkTextBuffer *buffer, diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 4e1e1955bd..645ffe5bef 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -161,7 +161,7 @@ struct _GtkTextViewPrivate guint blink_time; /* time in msec the cursor has blinked since last user event */ guint im_spot_idle; - gchar *im_module; + char *im_module; int dnd_x; int dnd_y; @@ -458,7 +458,7 @@ static gboolean gtk_text_view_scroll_hpages(GtkTextView *text_view, int count, gboolean extend_selection); static void gtk_text_view_insert_at_cursor (GtkTextView *text_view, - const gchar *str); + const char *str); static void gtk_text_view_delete_from_cursor (GtkTextView *text_view, GtkDeleteType type, int count); @@ -498,10 +498,10 @@ static void gtk_text_view_reset_blink_time (GtkTextView *text_v static void gtk_text_view_value_changed (GtkAdjustment *adjustment, GtkTextView *view); static void gtk_text_view_commit_handler (GtkIMContext *context, - const gchar *str, + const char *str, GtkTextView *text_view); static void gtk_text_view_commit_text (GtkTextView *text_view, - const gchar *text); + const char *text); static void gtk_text_view_preedit_changed_handler (GtkIMContext *context, GtkTextView *text_view); static gboolean gtk_text_view_retrieve_surrounding_handler (GtkIMContext *context, @@ -611,10 +611,10 @@ static void gtk_text_view_activate_misc_insert_emoji (GtkWidget *widget, GVariant *parameter); static void gtk_text_view_real_undo (GtkWidget *widget, - const gchar *action_name, + const char *action_name, GVariant *parameter); static void gtk_text_view_real_redo (GtkWidget *widget, - const gchar *action_name, + const char *action_name, GVariant *parameter); @@ -6619,7 +6619,7 @@ find_whitepace_region (const GtkTextIter *center, static void gtk_text_view_insert_at_cursor (GtkTextView *text_view, - const gchar *str) + const char *str) { if (!gtk_text_buffer_insert_interactive_at_cursor (get_buffer (text_view), str, -1, text_view->priv->editable)) @@ -6992,7 +6992,7 @@ gtk_text_view_unselect (GtkTextView *text_view) static void move_mark_to_pointer_and_scroll (GtkTextView *text_view, - const gchar *mark_name) + const char *mark_name) { GtkTextIter newplace; GtkTextBuffer *buffer; @@ -7897,7 +7897,7 @@ gtk_text_view_drag_drop (GtkDropTarget *dest, gtk_text_buffer_begin_user_action (buffer); if (!gtk_text_buffer_insert_interactive (buffer, - &drop_point, (gchar *) g_value_get_string (value), -1, + &drop_point, (char *) g_value_get_string (value), -1, text_view->priv->editable)) gtk_widget_error_bell (GTK_WIDGET (text_view)); @@ -8137,7 +8137,7 @@ gtk_text_view_value_changed (GtkAdjustment *adjustment, static void gtk_text_view_commit_handler (GtkIMContext *context, - const gchar *str, + const char *str, GtkTextView *text_view) { gtk_text_view_commit_text (text_view, str); @@ -8147,7 +8147,7 @@ gtk_text_view_commit_handler (GtkIMContext *context, static void gtk_text_view_commit_text (GtkTextView *text_view, - const gchar *str) + const char *str) { GtkTextViewPrivate *priv; gboolean had_selection; @@ -8204,7 +8204,7 @@ gtk_text_view_preedit_changed_handler (GtkIMContext *context, GtkTextView *text_view) { GtkTextViewPrivate *priv; - gchar *str; + char *str; PangoAttrList *attrs; int cursor_pos; GtkTextIter iter; @@ -8247,7 +8247,7 @@ gtk_text_view_retrieve_surrounding_handler (GtkIMContext *context, GtkTextIter start; GtkTextIter end; int pos; - gchar *text; + char *text; gtk_text_buffer_get_iter_at_mark (text_view->priv->buffer, &start, gtk_text_buffer_get_insert (text_view->priv->buffer)); @@ -9678,7 +9678,7 @@ gtk_text_view_get_extra_menu (GtkTextView *text_view) static void gtk_text_view_real_undo (GtkWidget *widget, - const gchar *action_name, + const char *action_name, GVariant *parameters) { GtkTextView *text_view = GTK_TEXT_VIEW (widget); @@ -9689,7 +9689,7 @@ gtk_text_view_real_undo (GtkWidget *widget, static void gtk_text_view_real_redo (GtkWidget *widget, - const gchar *action_name, + const char *action_name, GVariant *parameters) { GtkTextView *text_view = GTK_TEXT_VIEW (widget); diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index c1b282a4ae..d16f17f2b5 100644 --- a/gtk/gtktextview.h +++ b/gtk/gtktextview.h @@ -160,7 +160,7 @@ struct _GtkTextViewClass gboolean extend_selection); void (* set_anchor) (GtkTextView *text_view); void (* insert_at_cursor) (GtkTextView *text_view, - const gchar *str); + const char *str); void (* delete_from_cursor) (GtkTextView *text_view, GtkDeleteType type, int count); diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c index 34b2879e63..07b16454d6 100644 --- a/gtk/gtktogglebutton.c +++ b/gtk/gtktogglebutton.c @@ -218,7 +218,7 @@ gtk_toggle_button_new (void) * Returns: a new toggle button. */ GtkWidget* -gtk_toggle_button_new_with_label (const gchar *label) +gtk_toggle_button_new_with_label (const char *label) { return g_object_new (GTK_TYPE_TOGGLE_BUTTON, "label", label, NULL); } @@ -235,7 +235,7 @@ gtk_toggle_button_new_with_label (const gchar *label) * Returns: a new #GtkToggleButton */ GtkWidget* -gtk_toggle_button_new_with_mnemonic (const gchar *label) +gtk_toggle_button_new_with_mnemonic (const char *label) { return g_object_new (GTK_TYPE_TOGGLE_BUTTON, "label", label, diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index 3879efcd6f..8f5923d9b2 100644 --- a/gtk/gtktogglebutton.h +++ b/gtk/gtktogglebutton.h @@ -69,9 +69,9 @@ GType gtk_toggle_button_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GtkWidget* gtk_toggle_button_new (void); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_toggle_button_new_with_label (const gchar *label); +GtkWidget* gtk_toggle_button_new_with_label (const char *label); GDK_AVAILABLE_IN_ALL -GtkWidget* gtk_toggle_button_new_with_mnemonic (const gchar *label); +GtkWidget* gtk_toggle_button_new_with_mnemonic (const char *label); GDK_AVAILABLE_IN_ALL void gtk_toggle_button_set_active (GtkToggleButton *toggle_button, gboolean is_active); diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index d8196d4592..f7e851c6c7 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -222,7 +222,7 @@ gtk_tooltip_dispose (GObject *object) */ void gtk_tooltip_set_markup (GtkTooltip *tooltip, - const gchar *markup) + const char *markup) { g_return_if_fail (GTK_IS_TOOLTIP (tooltip)); @@ -239,7 +239,7 @@ gtk_tooltip_set_markup (GtkTooltip *tooltip, */ void gtk_tooltip_set_text (GtkTooltip *tooltip, - const gchar *text) + const char *text) { g_return_if_fail (GTK_IS_TOOLTIP (tooltip)); @@ -275,7 +275,7 @@ gtk_tooltip_set_icon (GtkTooltip *tooltip, */ void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip, - const gchar *icon_name) + const char *icon_name) { g_return_if_fail (GTK_IS_TOOLTIP (tooltip)); diff --git a/gtk/gtktooltip.h b/gtk/gtktooltip.h index d5812d5428..f0587a9885 100644 --- a/gtk/gtktooltip.h +++ b/gtk/gtktooltip.h @@ -37,16 +37,16 @@ GType gtk_tooltip_get_type (void); GDK_AVAILABLE_IN_ALL void gtk_tooltip_set_markup (GtkTooltip *tooltip, - const gchar *markup); + const char *markup); GDK_AVAILABLE_IN_ALL void gtk_tooltip_set_text (GtkTooltip *tooltip, - const gchar *text); + const char *text); GDK_AVAILABLE_IN_ALL void gtk_tooltip_set_icon (GtkTooltip *tooltip, GdkPaintable *paintable); GDK_AVAILABLE_IN_ALL void gtk_tooltip_set_icon_from_icon_name (GtkTooltip *tooltip, - const gchar *icon_name); + const char *icon_name); GDK_AVAILABLE_IN_ALL void gtk_tooltip_set_icon_from_gicon (GtkTooltip *tooltip, GIcon *gicon); diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c index 101698db55..4d42ba1859 100644 --- a/gtk/gtktreedatalist.c +++ b/gtk/gtktreedatalist.c @@ -47,7 +47,7 @@ _gtk_tree_data_list_free (GtkTreeDataList *list, { next = tmp->next; if (g_type_is_a (column_headers [i], G_TYPE_STRING)) - g_free ((gchar *) tmp->data.v_pointer); + g_free ((char *) tmp->data.v_pointer); else if (g_type_is_a (column_headers [i], G_TYPE_OBJECT) && tmp->data.v_pointer != NULL) g_object_unref (tmp->data.v_pointer); else if (g_type_is_a (column_headers [i], G_TYPE_BOXED) && tmp->data.v_pointer != NULL) @@ -129,7 +129,7 @@ _gtk_tree_data_list_node_to_value (GtkTreeDataList *list, g_value_set_boolean (value, (gboolean) list->data.v_int); break; case G_TYPE_CHAR: - g_value_set_schar (value, (gchar) list->data.v_char); + g_value_set_schar (value, (char) list->data.v_char); break; case G_TYPE_UCHAR: g_value_set_uchar (value, (guchar) list->data.v_uchar); @@ -165,7 +165,7 @@ _gtk_tree_data_list_node_to_value (GtkTreeDataList *list, g_value_set_double (value, (gdouble) list->data.v_double); break; case G_TYPE_STRING: - g_value_set_string (value, (gchar *) list->data.v_pointer); + g_value_set_string (value, (char *) list->data.v_pointer); break; case G_TYPE_POINTER: g_value_set_pointer (value, (gpointer) list->data.v_pointer); @@ -327,7 +327,7 @@ _gtk_tree_data_list_compare_func (GtkTreeModel *model, GValue a_value = G_VALUE_INIT; GValue b_value = G_VALUE_INIT; int retval; - const gchar *stra, *strb; + const char *stra, *strb; gtk_tree_model_get_value (model, a, column, &a_value); gtk_tree_model_get_value (model, b, column, &b_value); diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c index d98c1af6eb..127bc36433 100644 --- a/gtk/gtktreednd.c +++ b/gtk/gtktreednd.c @@ -239,7 +239,7 @@ typedef struct _GtkTreeRowData GtkTreeRowData; struct _GtkTreeRowData { GtkTreeModel *model; - gchar path[4]; + char path[4]; }; static GtkTreeRowData * @@ -268,7 +268,7 @@ gtk_tree_create_row_drag_content (GtkTreeModel *tree_model, { GdkContentProvider *content; GtkTreeRowData *trd; - gchar *path_str; + char *path_str; int len; int struct_size; diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 347ef323d1..23495b44f3 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -180,7 +180,7 @@ * &iter); * while (valid) * { - * gchar *str_data; + * char *str_data; * int int_data; * * // Make sure you terminate calls to gtk_tree_model_get() with a “-1” value @@ -626,11 +626,11 @@ gtk_tree_path_new (void) * Returns: A newly-created #GtkTreePath-struct, or %NULL */ GtkTreePath * -gtk_tree_path_new_from_string (const gchar *path) +gtk_tree_path_new_from_string (const char *path) { GtkTreePath *retval; - const gchar *orig_path = path; - gchar *ptr; + const char *orig_path = path; + char *ptr; int i; g_return_val_if_fail (path != NULL, NULL); @@ -736,10 +736,10 @@ gtk_tree_path_new_from_indicesv (int *indices, * Returns: A newly-allocated string. * Must be freed with g_free(). */ -gchar * +char * gtk_tree_path_to_string (GtkTreePath *path) { - gchar *retval, *ptr, *end; + char *retval, *ptr, *end; int i, n; g_return_val_if_fail (path != NULL, NULL); @@ -748,7 +748,7 @@ gtk_tree_path_to_string (GtkTreePath *path) return NULL; n = path->depth * 12; - ptr = retval = g_new0 (gchar, n); + ptr = retval = g_new0 (char, n); end = ptr + n; g_snprintf (retval, end - ptr, "%d", path->indices[0]); while (*ptr != '\000') @@ -1286,7 +1286,7 @@ gtk_tree_model_get_iter (GtkTreeModel *tree_model, gboolean gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model, GtkTreeIter *iter, - const gchar *path_string) + const char *path_string) { gboolean retval; GtkTreePath *path; @@ -1319,12 +1319,12 @@ gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model, * Returns: a newly-allocated string. * Must be freed with g_free(). */ -gchar * +char * gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model, GtkTreeIter *iter) { GtkTreePath *path; - gchar *ret; + char *ret; g_return_val_if_fail (GTK_IS_TREE_MODEL (tree_model), NULL); g_return_val_if_fail (iter != NULL, NULL); @@ -1785,7 +1785,7 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model, while (column != -1) { GValue value = G_VALUE_INIT; - gchar *error = NULL; + char *error = NULL; if (column >= gtk_tree_model_get_n_columns (tree_model)) { diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h index d9e1066cd6..18c78dfb8a 100644 --- a/gtk/gtktreemodel.h +++ b/gtk/gtktreemodel.h @@ -195,7 +195,7 @@ struct _GtkTreeModelIface GDK_AVAILABLE_IN_ALL GtkTreePath *gtk_tree_path_new (void); GDK_AVAILABLE_IN_ALL -GtkTreePath *gtk_tree_path_new_from_string (const gchar *path); +GtkTreePath *gtk_tree_path_new_from_string (const char *path); GDK_AVAILABLE_IN_ALL GtkTreePath *gtk_tree_path_new_from_indices (int first_index, ...); @@ -203,7 +203,7 @@ GDK_AVAILABLE_IN_ALL GtkTreePath *gtk_tree_path_new_from_indicesv (int *indices, gsize length); GDK_AVAILABLE_IN_ALL -gchar *gtk_tree_path_to_string (GtkTreePath *path); +char *gtk_tree_path_to_string (GtkTreePath *path); GDK_AVAILABLE_IN_ALL GtkTreePath *gtk_tree_path_new_first (void); GDK_AVAILABLE_IN_ALL @@ -314,9 +314,9 @@ gboolean gtk_tree_model_get_iter (GtkTreeModel *tree_model, GDK_AVAILABLE_IN_ALL gboolean gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model, GtkTreeIter *iter, - const gchar *path_string); + const char *path_string); GDK_AVAILABLE_IN_ALL -gchar * gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model, +char * gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model, GtkTreeIter *iter); GDK_AVAILABLE_IN_ALL gboolean gtk_tree_model_get_iter_first (GtkTreeModel *tree_model, diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 12b412d016..09c574c3b9 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -3820,7 +3820,7 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter) * gpointer data) * { * // Visible if row is non-empty and first column is “HI” - * gchar *str; + * char *str; * gboolean visible = FALSE; * * gtk_tree_model_get (model, iter, 0, &str, -1); diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 0b6d83aef3..9d853f458d 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -2542,7 +2542,7 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort, if (parent_level) { GtkTreePath *level; - gchar *str; + char *str; level = gtk_tree_model_sort_elt_get_path (parent_level, parent_elt); diff --git a/gtk/gtktreepopover.c b/gtk/gtktreepopover.c index c67357dd64..802c54f72c 100644 --- a/gtk/gtktreepopover.c +++ b/gtk/gtktreepopover.c @@ -572,7 +572,7 @@ item_activated_cb (GtkGesture *gesture, GtkWidget *item; GtkCellView *view; GtkTreePath *path; - gchar *path_str; + char *path_str; gboolean is_header = FALSE; gboolean has_submenu = FALSE; diff --git a/gtk/gtktreerbtree.c b/gtk/gtktreerbtree.c index 51fea70707..36d7534133 100644 --- a/gtk/gtktreerbtree.c +++ b/gtk/gtktreerbtree.c @@ -36,7 +36,7 @@ static inline void fixup_validation (GtkTreeRBTree *tree, static inline void fixup_total_count (GtkTreeRBTree *tree, GtkTreeRBNode *node); #ifdef G_ENABLE_DEBUG -static void gtk_tree_rbtree_test (const gchar *where, +static void gtk_tree_rbtree_test (const char *where, GtkTreeRBTree *tree); static void gtk_tree_rbtree_debug_spew (GtkTreeRBTree *tree, GString *s); @@ -1670,7 +1670,7 @@ gtk_tree_rbtree_test_structure (GtkTreeRBTree *tree) } static void -gtk_tree_rbtree_test (const gchar *where, +gtk_tree_rbtree_test (const char *where, GtkTreeRBTree *tree) { GtkTreeRBTree *tmp_tree; diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 1c90e518f3..347fd68346 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -175,13 +175,13 @@ static gboolean gtk_tree_store_has_default_sort_func (GtkTreeSortable * static gboolean gtk_tree_store_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_tree_store_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data); static void gtk_tree_store_move (GtkTreeStore *tree_store, @@ -1039,7 +1039,7 @@ gtk_tree_store_set_valist_internal (GtkTreeStore *tree_store, while (column != -1) { GValue value = G_VALUE_INIT; - gchar *error = NULL; + char *error = NULL; if (column < 0 || column >= priv->n_columns) { @@ -3317,9 +3317,9 @@ typedef struct { static void tree_model_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -3338,7 +3338,7 @@ tree_model_start_element (GtkBuildableParseContext *context, } else if (strcmp (element_name, "column") == 0) { - const gchar *type; + const char *type; if (!_gtk_builder_check_parent (data->builder, context, "columns", error)) return; @@ -3363,7 +3363,7 @@ tree_model_start_element (GtkBuildableParseContext *context, static void tree_model_end_element (GtkBuildableParseContext *context, - const gchar *element_name, + const char *element_name, gpointer user_data, GError **error) { @@ -3388,7 +3388,7 @@ tree_model_end_element (GtkBuildableParseContext *context, if (type == G_TYPE_INVALID) { g_warning ("Unknown type %s specified in treemodel %s", - (const gchar*)l->data, + (const char *)l->data, gtk_buildable_get_name (GTK_BUILDABLE (data->object))); continue; } @@ -3414,7 +3414,7 @@ static gboolean gtk_tree_store_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -3443,7 +3443,7 @@ static void gtk_tree_store_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { GSListSubParserData *data; diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 7906fc9063..2479829305 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -831,13 +831,13 @@ static gboolean gtk_tree_view_search_move (GtkWidget *windo gboolean up); static gboolean gtk_tree_view_search_equal_func (GtkTreeModel *model, int column, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer search_data); static gboolean gtk_tree_view_search_iter (GtkTreeModel *model, GtkTreeSelection *selection, GtkTreeIter *iter, - const gchar *text, + const char *text, int *count, int n); static void gtk_tree_view_search_init (GtkWidget *entry, @@ -863,10 +863,10 @@ static GtkTreeViewColumn *gtk_tree_view_get_drop_column (GtkTreeView *tree static void gtk_tree_view_buildable_add_child (GtkBuildable *tree_view, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); static GObject *gtk_tree_view_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); static void gtk_tree_view_buildable_init (GtkBuildableIface *iface); /* GtkScrollable */ @@ -1975,7 +1975,7 @@ static void gtk_tree_view_buildable_add_child (GtkBuildable *tree_view, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_TREE_VIEW_COLUMN (child)) gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), GTK_TREE_VIEW_COLUMN (child)); @@ -1986,7 +1986,7 @@ gtk_tree_view_buildable_add_child (GtkBuildable *tree_view, static GObject * gtk_tree_view_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname) + const char *childname) { GtkTreeView *tree_view = GTK_TREE_VIEW (buildable); GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); @@ -6761,7 +6761,7 @@ remove_scroll_timeout (GtkTreeView *tree_view) static gboolean check_model_dnd (GtkTreeModel *model, GType required_iface, - const gchar *signal) + const char *signal) { if (model == NULL || !G_TYPE_CHECK_INSTANCE_TYPE ((model), required_iface)) { @@ -10863,13 +10863,13 @@ gtk_tree_view_insert_column (GtkTreeView *tree_view, int gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view, int position, - const gchar *title, + const char *title, GtkCellRenderer *cell, ...) { GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); GtkTreeViewColumn *column; - gchar *attribute; + char *attribute; va_list args; int column_id; @@ -10884,13 +10884,13 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view, va_start (args, cell); - attribute = va_arg (args, gchar *); + attribute = va_arg (args, char *); while (attribute != NULL) { column_id = va_arg (args, int); gtk_tree_view_column_add_attribute (column, cell, attribute, column_id); - attribute = va_arg (args, gchar *); + attribute = va_arg (args, char *); } va_end (args); @@ -10920,7 +10920,7 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view, int gtk_tree_view_insert_column_with_data_func (GtkTreeView *tree_view, int position, - const gchar *title, + const char *title, GtkCellRenderer *cell, GtkTreeCellDataFunc func, gpointer data, @@ -13840,7 +13840,7 @@ gtk_tree_view_search_move (GtkWidget *popover, gboolean ret; int len; int count = 0; - const gchar *text; + const char *text; GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *selection; @@ -13889,16 +13889,16 @@ gtk_tree_view_search_move (GtkWidget *popover, static gboolean gtk_tree_view_search_equal_func (GtkTreeModel *model, int column, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer search_data) { gboolean retval = TRUE; - const gchar *str; - gchar *normalized_string; - gchar *normalized_key; - gchar *case_normalized_string = NULL; - gchar *case_normalized_key = NULL; + const char *str; + char *normalized_string; + char *normalized_key; + char *case_normalized_string = NULL; + char *case_normalized_key = NULL; GValue value = G_VALUE_INIT; GValue transformed = G_VALUE_INIT; @@ -13946,7 +13946,7 @@ static gboolean gtk_tree_view_search_iter (GtkTreeModel *model, GtkTreeSelection *selection, GtkTreeIter *iter, - const gchar *text, + const char *text, int *count, int n) { @@ -14055,7 +14055,7 @@ gtk_tree_view_search_init (GtkWidget *entry, GtkTreeViewPrivate *priv = gtk_tree_view_get_instance_private (tree_view); int ret; int count = 0; - const gchar *text; + const char *text; GtkTreeIter iter; GtkTreeModel *model; GtkTreeSelection *selection; diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index cd378de86a..e5ed5c72db 100644 --- a/gtk/gtktreeview.h +++ b/gtk/gtktreeview.h @@ -116,7 +116,7 @@ typedef void (* GtkTreeViewMappingFunc) (GtkTreeView *tree_vi */ typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel *model, int column, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer search_data); @@ -236,13 +236,13 @@ int gtk_tree_view_insert_column (GtkTreeView GDK_AVAILABLE_IN_ALL int gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view, int position, - const gchar *title, + const char *title, GtkCellRenderer *cell, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL int gtk_tree_view_insert_column_with_data_func (GtkTreeView *tree_view, int position, - const gchar *title, + const char *title, GtkCellRenderer *cell, GtkTreeCellDataFunc func, gpointer data, diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index f9dc51f799..2fbbe738c2 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -117,7 +117,7 @@ static void gtk_tree_view_column_add_editable_callback (GtkCellArea GtkCellRenderer *renderer, GtkCellEditable *edit_widget, GdkRectangle *cell_area, - const gchar *path_string, + const char *path_string, gpointer user_data); static void gtk_tree_view_column_remove_editable_callback (GtkCellArea *area, GtkCellRenderer *renderer, @@ -177,7 +177,7 @@ struct _GtkTreeViewColumnPrivate int drag_x; int drag_y; - gchar *title; + char *title; /* Sorting */ gulong sort_clicked_signal; @@ -432,7 +432,7 @@ static void gtk_tree_view_column_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { /* Just ignore the boolean return from here */ @@ -909,7 +909,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column) GtkWidget *frame; GtkWidget *arrow; GtkWidget *current_child; - const gchar *icon_name = "missing-image"; + const char *icon_name = "missing-image"; GtkTreeModel *model; if (priv->tree_view) @@ -1251,7 +1251,7 @@ gtk_tree_view_column_add_editable_callback (GtkCellArea *area, GtkCellRenderer *renderer, GtkCellEditable *edit_widget, GdkRectangle *cell_area, - const gchar *path_string, + const char *path_string, gpointer user_data) { GtkTreeViewColumn *column = user_data; @@ -1552,7 +1552,7 @@ gtk_tree_view_column_new_with_area (GtkCellArea *area) * Returns: A newly created #GtkTreeViewColumn. **/ GtkTreeViewColumn * -gtk_tree_view_column_new_with_attributes (const gchar *title, +gtk_tree_view_column_new_with_attributes (const char *title, GtkCellRenderer *cell, ...) { @@ -1636,7 +1636,7 @@ gtk_tree_view_column_clear (GtkTreeViewColumn *tree_column) void gtk_tree_view_column_add_attribute (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell_renderer, - const gchar *attribute, + const char *attribute, int column) { gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (tree_column), @@ -1649,10 +1649,10 @@ gtk_tree_view_column_set_attributesv (GtkTreeViewColumn *tree_column, va_list args) { GtkTreeViewColumnPrivate *priv = tree_column->priv; - gchar *attribute; + char *attribute; int column; - attribute = va_arg (args, gchar *); + attribute = va_arg (args, char *); gtk_cell_layout_clear_attributes (GTK_CELL_LAYOUT (priv->cell_area), cell_renderer); @@ -1662,7 +1662,7 @@ gtk_tree_view_column_set_attributesv (GtkTreeViewColumn *tree_column, column = va_arg (args, int); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (priv->cell_area), cell_renderer, attribute, column); - attribute = va_arg (args, gchar *); + attribute = va_arg (args, char *); } } @@ -2267,10 +2267,10 @@ gtk_tree_view_column_clicked (GtkTreeViewColumn *tree_column) **/ void gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column, - const gchar *title) + const char *title) { GtkTreeViewColumnPrivate *priv; - gchar *new_title; + char *new_title; g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column)); @@ -2293,7 +2293,7 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column, * Returns: the title of the column. This string should not be * modified or freed. **/ -const gchar * +const char * gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column) { g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column), NULL); diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index 67b025aedb..24610307a0 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -83,7 +83,7 @@ GtkTreeViewColumn *gtk_tree_view_column_new (void); GDK_AVAILABLE_IN_ALL GtkTreeViewColumn *gtk_tree_view_column_new_with_area (GtkCellArea *area); GDK_AVAILABLE_IN_ALL -GtkTreeViewColumn *gtk_tree_view_column_new_with_attributes (const gchar *title, +GtkTreeViewColumn *gtk_tree_view_column_new_with_attributes (const char *title, GtkCellRenderer *cell, ...) G_GNUC_NULL_TERMINATED; GDK_AVAILABLE_IN_ALL @@ -99,7 +99,7 @@ void gtk_tree_view_column_clear (GtkTreeViewCol GDK_AVAILABLE_IN_ALL void gtk_tree_view_column_add_attribute (GtkTreeViewColumn *tree_column, GtkCellRenderer *cell_renderer, - const gchar *attribute, + const char *attribute, int column); GDK_AVAILABLE_IN_ALL void gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column, @@ -162,9 +162,9 @@ void gtk_tree_view_column_clicked (GtkTreeViewCol */ GDK_AVAILABLE_IN_ALL void gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column, - const gchar *title); + const char *title); GDK_AVAILABLE_IN_ALL -const gchar * gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column); +const char * gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column); GDK_AVAILABLE_IN_ALL void gtk_tree_view_column_set_expand (GtkTreeViewColumn *tree_column, gboolean expand); diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 7e4aefc573..890a24f373 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -139,7 +139,7 @@ static void gtk_viewport_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_viewport_set_child (GTK_VIEWPORT (buildable), GTK_WIDGET (child)); diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c index badbba2f55..431a1d2820 100644 --- a/gtk/gtkvolumebutton.c +++ b/gtk/gtkvolumebutton.c @@ -54,7 +54,7 @@ struct _GtkVolumeButtonClass #define EPSILON (1e-10) -static const gchar * const icons[] = +static const char * const icons[] = { "audio-volume-muted", "audio-volume-high", @@ -63,7 +63,7 @@ static const gchar * const icons[] = NULL }; -static const gchar * const icons_symbolic[] = +static const char * const icons_symbolic[] = { "audio-volume-muted-symbolic", "audio-volume-high-symbolic", @@ -93,7 +93,7 @@ G_DEFINE_TYPE (GtkVolumeButton, gtk_volume_button, GTK_TYPE_SCALE_BUTTON) static gboolean get_symbolic (GtkScaleButton *button) { - gchar **icon_list; + char **icon_list; gboolean ret; g_object_get (button, "icons", &icon_list, NULL); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index df02699f07..70158b101b 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -473,13 +473,13 @@ GTK_STATE_FLAG_ACTIVE) typedef struct { - gchar *name; /* Name of the template automatic child */ + char *name; /* Name of the template automatic child */ gboolean internal_child; /* Whether the automatic widget should be exported as an <internal-child> */ gssize offset; /* Instance private data offset where to set the automatic child (or 0) */ } AutomaticChildClass; typedef struct { - gchar *callback_name; + char *callback_name; GCallback callback_symbol; } CallbackSymbol; @@ -629,26 +629,26 @@ static AtkObject* gtk_widget_ref_accessible (AtkImplementor *implementor); static void gtk_widget_buildable_interface_init (GtkBuildableIface *iface); static void gtk_widget_buildable_set_name (GtkBuildable *buildable, - const gchar *name); -static const gchar * gtk_widget_buildable_get_name (GtkBuildable *buildable); + const char *name); +static const char * gtk_widget_buildable_get_name (GtkBuildable *buildable); static GObject * gtk_widget_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); static gboolean gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_widget_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); static void gtk_widget_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); static void gtk_widget_buildable_parser_finished (GtkBuildable *buildable, GtkBuilder *builder); @@ -2334,7 +2334,7 @@ gtk_widget_init (GTypeInstance *instance, gpointer g_class) **/ GtkWidget* gtk_widget_new (GType type, - const gchar *first_property_name, + const char *first_property_name, ...) { GtkWidget *widget; @@ -4122,7 +4122,7 @@ gtk_widget_class_add_binding (GtkWidgetClass *widget_class, guint keyval, GdkModifierType mods, GtkShortcutFunc func, - const gchar *format_string, + const char *format_string, ...) { GtkShortcut *shortcut; @@ -4168,8 +4168,8 @@ void gtk_widget_class_add_binding_signal (GtkWidgetClass *widget_class, guint keyval, GdkModifierType mods, - const gchar *signal, - const gchar *format_string, + const char *signal, + const char *format_string, ...) { GtkShortcut *shortcut; @@ -4217,8 +4217,8 @@ void gtk_widget_class_add_binding_action (GtkWidgetClass *widget_class, guint keyval, GdkModifierType mods, - const gchar *action_name, - const gchar *format_string, + const char *action_name, + const char *format_string, ...) { GtkShortcut *shortcut; @@ -5243,7 +5243,7 @@ _gtk_widget_set_has_grab (GtkWidget *widget, */ void gtk_widget_set_name (GtkWidget *widget, - const gchar *name) + const char *name) { GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); @@ -5267,7 +5267,7 @@ gtk_widget_set_name (GtkWidget *widget, * Returns: name of the widget. This string is owned by GTK+ and * should not be modified or freed **/ -const gchar* +const char * gtk_widget_get_name (GtkWidget *widget) { GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget); @@ -6327,7 +6327,7 @@ gtk_widget_create_pango_context (GtkWidget *widget) **/ PangoLayout * gtk_widget_create_pango_layout (GtkWidget *widget, - const gchar *text) + const char *text) { PangoLayout *layout; PangoContext *context; @@ -8287,7 +8287,7 @@ static void gtk_widget_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (type != NULL) { @@ -8326,13 +8326,13 @@ gtk_widget_buildable_interface_init (GtkBuildableIface *iface) static void gtk_widget_buildable_set_name (GtkBuildable *buildable, - const gchar *name) + const char *name) { g_object_set_qdata_full (G_OBJECT (buildable), quark_builder_set_name, g_strdup (name), g_free); } -static const gchar * +static const char * gtk_widget_buildable_get_name (GtkBuildable *buildable) { return g_object_get_qdata (G_OBJECT (buildable), quark_builder_set_name); @@ -8341,7 +8341,7 @@ gtk_widget_buildable_get_name (GtkBuildable *buildable) static GObject * gtk_widget_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname) + const char *childname) { GtkWidgetClass *class; GSList *l; @@ -8383,15 +8383,15 @@ gtk_widget_buildable_get_internal_child (GtkBuildable *buildable, typedef struct { - gchar *action_name; + char *action_name; GString *description; - gchar *context; + char *context; gboolean translatable; } AtkActionData; typedef struct { - gchar *target; + char *target; AtkRelationType type; int line; int col; @@ -8461,9 +8461,9 @@ typedef struct static void accessibility_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -8471,8 +8471,8 @@ accessibility_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "relation") == 0) { - gchar *target = NULL; - gchar *type = NULL; + char *target = NULL; + char *type = NULL; AtkRelationData *relation; AtkRelationType relation_type; @@ -8507,9 +8507,9 @@ accessibility_start_element (GtkBuildableParseContext *context, } else if (strcmp (element_name, "action") == 0) { - const gchar *action_name; - const gchar *description = NULL; - const gchar *msg_context = NULL; + const char *action_name; + const char *description = NULL; + const char *msg_context = NULL; gboolean translatable = FALSE; AtkActionData *action; @@ -8538,7 +8538,7 @@ accessibility_start_element (GtkBuildableParseContext *context, } else if (strcmp (element_name, "role") == 0) { - const gchar *type; + const char *type; AtkRole role; if (!_gtk_builder_check_parent (data->builder, context, "accessibility", error)) @@ -8595,7 +8595,7 @@ accessibility_start_element (GtkBuildableParseContext *context, static void accessibility_text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -8625,9 +8625,9 @@ typedef struct static void style_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -8635,7 +8635,7 @@ style_start_element (GtkBuildableParseContext *context, if (strcmp (element_name, "class") == 0) { - const gchar *name; + const char *name; if (!_gtk_builder_check_parent (data->builder, context, "style", error)) return; @@ -8708,9 +8708,9 @@ layout_property_info_free (gpointer data) static void layout_start_element (GtkBuildableParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, + const char *element_name, + const char **names, + const char **values, gpointer user_data, GError **error) { @@ -8764,7 +8764,7 @@ layout_start_element (GtkBuildableParseContext *context, static void layout_text (GtkBuildableParseContext *context, - const gchar *text, + const char *text, gsize text_len, gpointer user_data, GError **error) @@ -8816,7 +8816,7 @@ static gboolean gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *parser_data) { @@ -8867,7 +8867,7 @@ static void gtk_widget_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { } @@ -8942,7 +8942,7 @@ static void gtk_widget_buildable_custom_finished (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer user_data) { if (strcmp (tagname, "accessibility") == 0) @@ -8976,7 +8976,7 @@ gtk_widget_buildable_custom_finished (GtkBuildable *buildable, if (i < n_actions) { - const gchar *description; + const char *description; if (action_data->translatable && action_data->description->len) description = _gtk_builder_parser_translate (gtk_builder_get_translation_domain (builder), @@ -10580,7 +10580,7 @@ _gtk_widget_get_action_muxer (GtkWidget *widget, */ void gtk_widget_insert_action_group (GtkWidget *widget, - const gchar *name, + const char *name, GActionGroup *group) { GtkActionMuxer *muxer; @@ -10600,7 +10600,7 @@ gtk_widget_insert_action_group (GtkWidget *widget, * GtkBuilder automated templates * ****************************************************************/ static AutomaticChildClass * -template_child_class_new (const gchar *name, +template_child_class_new (const char *name, gboolean internal_child, gssize offset) { @@ -10766,7 +10766,7 @@ gtk_widget_init_template (GtkWidget *widget) * there is no infinite recursion. */ if (!gtk_builder_extend_with_template (builder, G_OBJECT (widget), class_type, - (const gchar *)g_bytes_get_data (template->data, NULL), + (const char *)g_bytes_get_data (template->data, NULL), g_bytes_get_size (template->data), &error)) { @@ -10862,7 +10862,7 @@ gtk_widget_class_set_template (GtkWidgetClass *widget_class, */ void gtk_widget_class_set_template_from_resource (GtkWidgetClass *widget_class, - const gchar *resource_name) + const char *resource_name) { GError *error = NULL; GBytes *bytes = NULL; @@ -10907,7 +10907,7 @@ gtk_widget_class_set_template_from_resource (GtkWidgetClass *widget_class, */ void gtk_widget_class_bind_template_callback_full (GtkWidgetClass *widget_class, - const gchar *callback_name, + const char *callback_name, GCallback callback_symbol) { GtkWidgetTemplate *template; @@ -10990,7 +10990,7 @@ gtk_widget_class_set_template_scope (GtkWidgetClass *widget_class, */ void gtk_widget_class_bind_template_child_full (GtkWidgetClass *widget_class, - const gchar *name, + const char *name, gboolean internal_child, gssize struct_offset) { @@ -11028,7 +11028,7 @@ gtk_widget_class_bind_template_child_full (GtkWidgetClass *widget_class, GObject * gtk_widget_get_template_child (GtkWidget *widget, GType widget_type, - const gchar *name) + const char *name) { GHashTable *auto_child_hash; GObject *ret = NULL; diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index afebe81037..ead4b6b429 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -290,7 +290,7 @@ GDK_AVAILABLE_IN_ALL GType gtk_widget_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GtkWidget* gtk_widget_new (GType type, - const gchar *first_property_name, + const char *first_property_name, ...); GDK_AVAILABLE_IN_ALL void gtk_widget_unparent (GtkWidget *widget); @@ -360,23 +360,23 @@ void gtk_widget_class_add_binding (GtkWidgetClass *widget_class, guint keyval, GdkModifierType mods, GtkShortcutFunc callback, - const gchar *format_string, + const char *format_string, ...); GDK_AVAILABLE_IN_ALL void gtk_widget_class_add_binding_signal (GtkWidgetClass *widget_class, guint keyval, GdkModifierType mods, - const gchar *signal, - const gchar *format_string, + const char *signal, + const char *format_string, ...); GDK_AVAILABLE_IN_ALL void gtk_widget_class_add_binding_action (GtkWidgetClass *widget_class, guint keyval, GdkModifierType mods, - const gchar *action_name, - const gchar *format_string, + const char *action_name, + const char *format_string, ...); GDK_AVAILABLE_IN_ALL void gtk_widget_class_add_shortcut (GtkWidgetClass *widget_class, @@ -430,9 +430,9 @@ gboolean gtk_widget_get_receives_default (GtkWidget *widget); GDK_AVAILABLE_IN_ALL void gtk_widget_set_name (GtkWidget *widget, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL -const gchar * gtk_widget_get_name (GtkWidget *widget); +const char * gtk_widget_get_name (GtkWidget *widget); GDK_AVAILABLE_IN_ALL @@ -670,7 +670,7 @@ GDK_AVAILABLE_IN_ALL const cairo_font_options_t *gtk_widget_get_font_options (GtkWidget *widget); GDK_AVAILABLE_IN_ALL PangoLayout *gtk_widget_create_pango_layout (GtkWidget *widget, - const gchar *text); + const char *text); /* Functions for setting directionality for widgets */ @@ -859,29 +859,29 @@ void gtk_widget_init_template (GtkWidget * GDK_AVAILABLE_IN_ALL GObject *gtk_widget_get_template_child (GtkWidget *widget, GType widget_type, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL void gtk_widget_class_set_template (GtkWidgetClass *widget_class, GBytes *template_bytes); GDK_AVAILABLE_IN_ALL void gtk_widget_class_set_template_from_resource (GtkWidgetClass *widget_class, - const gchar *resource_name); + const char *resource_name); GDK_AVAILABLE_IN_ALL void gtk_widget_class_bind_template_callback_full (GtkWidgetClass *widget_class, - const gchar *callback_name, + const char *callback_name, GCallback callback_symbol); GDK_AVAILABLE_IN_ALL void gtk_widget_class_set_template_scope (GtkWidgetClass *widget_class, GtkBuilderScope *scope); GDK_AVAILABLE_IN_ALL void gtk_widget_class_bind_template_child_full (GtkWidgetClass *widget_class, - const gchar *name, + const char *name, gboolean internal_child, gssize struct_offset); GDK_AVAILABLE_IN_ALL void gtk_widget_insert_action_group (GtkWidget *widget, - const gchar *name, + const char *name, GActionGroup *group); GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h index 47b3a531d7..99a19afd98 100644 --- a/gtk/gtkwidgetprivate.h +++ b/gtk/gtkwidgetprivate.h @@ -131,7 +131,7 @@ struct _GtkWidgetPrivate * Among other things, the widget name is used to determine * the style to use for a widget. */ - gchar *name; + char *name; /* The root this widget belongs to or %NULL if widget is not * rooted or is a #GtkRoot itself. diff --git a/gtk/gtkwin32.c b/gtk/gtkwin32.c index 8923e3f8e2..a4f61030dd 100644 --- a/gtk/gtkwin32.c +++ b/gtk/gtkwin32.c @@ -101,7 +101,7 @@ find_first_manifest (HMODULE module_handle, * g_once_init_enter (leaking once is OK, Windows will clean up after us). */ void -_gtk_load_dll_with_libgtk3_manifest (const gchar *dll_name) +_gtk_load_dll_with_libgtk3_manifest (const char *dll_name) { HANDLE activation_ctx_handle; ACTCTXA activation_ctx_descriptor; @@ -151,14 +151,14 @@ _gtk_load_dll_with_libgtk3_manifest (const gchar *dll_name) g_free (resource_name); } -const gchar * +const char * _gtk_get_libdir (void) { static char *gtk_libdir = NULL; if (gtk_libdir == NULL) { - gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll); - gchar *slash = strrchr (root, '\\'); + char *root = g_win32_get_package_installation_directory_of_module (gtk_dll); + char *slash = strrchr (root, '\\'); if (slash != NULL && g_ascii_strcasecmp (slash + 1, ".libs") == 0) gtk_libdir = g_strdup (GTK_LIBDIR); @@ -170,14 +170,14 @@ _gtk_get_libdir (void) return gtk_libdir; } -const gchar * +const char * _gtk_get_localedir (void) { static char *gtk_localedir = NULL; if (gtk_localedir == NULL) { - const gchar *p; - gchar *root, *temp; + const char *p; + char *root, *temp; /* GTK_LOCALEDIR ends in either /lib/locale or * /share/locale. Scan for that slash. @@ -201,13 +201,13 @@ _gtk_get_localedir (void) return gtk_localedir; } -const gchar * +const char * _gtk_get_datadir (void) { static char *gtk_datadir = NULL; if (gtk_datadir == NULL) { - gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll); + char *root = g_win32_get_package_installation_directory_of_module (gtk_dll); gtk_datadir = g_build_filename (root, "share", NULL); g_free (root); } @@ -215,13 +215,13 @@ _gtk_get_datadir (void) return gtk_datadir; } -const gchar * +const char * _gtk_get_sysconfdir (void) { static char *gtk_sysconfdir = NULL; if (gtk_sysconfdir == NULL) { - gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll); + char *root = g_win32_get_package_installation_directory_of_module (gtk_dll); gtk_sysconfdir = g_build_filename (root, "etc", NULL); g_free (root); } @@ -229,7 +229,7 @@ _gtk_get_sysconfdir (void) return gtk_sysconfdir; } -const gchar * +const char * _gtk_get_data_prefix (void) { static char *gtk_data_prefix = NULL; diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 84042052eb..41f06bbcc0 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -183,8 +183,8 @@ typedef struct GdkDisplay *display; GtkApplication *application; - gchar *startup_id; - gchar *title; + char *startup_id; + char *title; guint keys_changed_handler; @@ -319,7 +319,7 @@ typedef enum typedef struct { - gchar *icon_name; + char *icon_name; guint realized : 1; guint using_default_icon : 1; guint using_themed_icon : 1; @@ -440,7 +440,7 @@ static void gtk_window_set_default_size_internal (GtkWindow *window, static void update_themed_icon (GtkWindow *window); static GList *icon_list_from_theme (GtkWindow *window, - const gchar *name); + const char *name); static void gtk_window_realize_icon (GtkWindow *window); static void gtk_window_unrealize_icon (GtkWindow *window); static void update_window_actions (GtkWindow *window); @@ -484,7 +484,7 @@ static void gtk_window_release_application (GtkWindow *window); static GListStore *toplevel_list = NULL; static guint window_signals[LAST_SIGNAL] = { 0 }; -static gchar *default_icon_name = NULL; +static char *default_icon_name = NULL; static gboolean disable_startup_notification = FALSE; static GQuark quark_gtk_window_icon_info = 0; @@ -505,10 +505,10 @@ static void gtk_window_buildable_interface_init (GtkBuildableIface static void gtk_window_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); static void gtk_window_buildable_set_buildable_property (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name, + const char *name, const GValue *value); static void gtk_window_shortcut_manager_interface_init (GtkShortcutManagerInterface *iface); @@ -575,14 +575,14 @@ add_arrow_bindings (GtkWidgetClass *widget_class, } static guint32 -extract_time_from_startup_id (const gchar* startup_id) +extract_time_from_startup_id (const char * startup_id) { - gchar *timestr = g_strrstr (startup_id, "_TIME"); + char *timestr = g_strrstr (startup_id, "_TIME"); guint32 retval = GDK_CURRENT_TIME; if (timestr) { - gchar *end; + char *end; guint32 timestamp; /* Skip past the "_TIME" part */ @@ -599,7 +599,7 @@ extract_time_from_startup_id (const gchar* startup_id) } static gboolean -startup_id_is_fake (const gchar* startup_id) +startup_id_is_fake (const char * startup_id) { return strncmp (startup_id, "_TIME", 5) == 0; } @@ -1757,7 +1757,7 @@ static void gtk_window_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (type && strcmp (type, "titlebar") == 0) gtk_window_set_titlebar (GTK_WINDOW (buildable), GTK_WIDGET (child)); @@ -1770,7 +1770,7 @@ gtk_window_buildable_add_child (GtkBuildable *buildable, static void gtk_window_buildable_set_buildable_property (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *name, + const char *name, const GValue *value) { GtkWindow *window = GTK_WINDOW (buildable); @@ -1969,7 +1969,7 @@ gtk_window_new (void) **/ void gtk_window_set_title (GtkWindow *window, - const gchar *title) + const char *title) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); char *new_title; @@ -1996,7 +1996,7 @@ gtk_window_set_title (GtkWindow *window, * been set explicitly. The returned string is owned by the widget * and must not be modified or freed. **/ -const gchar * +const char * gtk_window_get_title (GtkWindow *window) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); @@ -2024,7 +2024,7 @@ gtk_window_get_title (GtkWindow *window) **/ void gtk_window_set_startup_id (GtkWindow *window, - const gchar *startup_id) + const char *startup_id) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GtkWidget *widget; @@ -3056,7 +3056,7 @@ render_paintable_to_texture (GdkPaintable *paintable) static GList * icon_list_from_theme (GtkWindow *window, - const gchar *name) + const char *name) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); GList *list; @@ -3208,10 +3208,10 @@ update_themed_icon (GtkWindow *window) */ void gtk_window_set_icon_name (GtkWindow *window, - const gchar *name) + const char *name) { GtkWindowIconInfo *info; - gchar *tmp; + char *tmp; g_return_if_fail (GTK_IS_WINDOW (window)); @@ -3239,7 +3239,7 @@ gtk_window_set_icon_name (GtkWindow *window, * Returns: (nullable): the icon name or %NULL if the window has * no themed icon */ -const gchar * +const char * gtk_window_get_icon_name (GtkWindow *window) { GtkWindowIconInfo *info; @@ -3260,7 +3260,7 @@ gtk_window_get_icon_name (GtkWindow *window) * themed icon, see gtk_window_set_icon_name(). **/ void -gtk_window_set_default_icon_name (const gchar *name) +gtk_window_set_default_icon_name (const char *name) { GList *tmp_list; GList *toplevels; @@ -3300,7 +3300,7 @@ gtk_window_set_default_icon_name (const gchar *name) * * Returns: the fallback icon name for windows */ -const gchar * +const char * gtk_window_get_default_icon_name (void) { return default_icon_name; @@ -3773,7 +3773,7 @@ static gboolean gtk_window_should_use_csd (GtkWindow *window) { GtkWindowPrivate *priv = gtk_window_get_instance_private (window); - const gchar *csd_env; + const char *csd_env; if (priv->csd_requested) return TRUE; diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index ba9db9d501..3a5638d1d3 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -90,12 +90,12 @@ GDK_AVAILABLE_IN_ALL GtkWidget* gtk_window_new (void); GDK_AVAILABLE_IN_ALL void gtk_window_set_title (GtkWindow *window, - const gchar *title); + const char *title); GDK_AVAILABLE_IN_ALL -const gchar * gtk_window_get_title (GtkWindow *window); +const char * gtk_window_get_title (GtkWindow *window); GDK_AVAILABLE_IN_ALL void gtk_window_set_startup_id (GtkWindow *window, - const gchar *startup_id); + const char *startup_id); GDK_AVAILABLE_IN_ALL void gtk_window_set_focus (GtkWindow *window, GtkWidget *focus); @@ -159,13 +159,13 @@ gboolean gtk_window_get_deletable (GtkWindow *window); GDK_AVAILABLE_IN_ALL void gtk_window_set_icon_name (GtkWindow *window, - const gchar *name); + const char *name); GDK_AVAILABLE_IN_ALL -const gchar * gtk_window_get_icon_name (GtkWindow *window); +const char * gtk_window_get_icon_name (GtkWindow *window); GDK_AVAILABLE_IN_ALL -void gtk_window_set_default_icon_name (const gchar *name); +void gtk_window_set_default_icon_name (const char *name); GDK_AVAILABLE_IN_ALL -const gchar * gtk_window_get_default_icon_name (void); +const char * gtk_window_get_default_icon_name (void); GDK_AVAILABLE_IN_ALL void gtk_window_set_auto_startup_notification (gboolean setting); diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c index 691fdc8a51..4818f78bc6 100644 --- a/gtk/gtkwindowhandle.c +++ b/gtk/gtkwindowhandle.c @@ -268,7 +268,7 @@ perform_titlebar_action (GtkWindowHandle *self, int n_press) { GtkSettings *settings; - gchar *action = NULL; + char *action = NULL; gboolean retval = TRUE; settings = gtk_widget_get_settings (GTK_WIDGET (self)); @@ -576,7 +576,7 @@ static void gtk_window_handle_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_WIDGET (child)) gtk_window_handle_set_child (GTK_WINDOW_HANDLE (buildable), GTK_WIDGET (child)); diff --git a/gtk/inspector/action-editor.c b/gtk/inspector/action-editor.c index 6e01cf1b12..b4c04fdd0e 100644 --- a/gtk/inspector/action-editor.c +++ b/gtk/inspector/action-editor.c @@ -34,7 +34,7 @@ struct _GtkInspectorActionEditor GtkWidget parent; GObject *owner; - gchar *name; + char *name; gboolean enabled; const GVariantType *parameter_type; GVariantType *state_type; @@ -158,7 +158,7 @@ variant_editor_set_value (GtkWidget *editor, else { GtkWidget *entry; - gchar *text; + char *text; entry = gtk_widget_get_first_child (editor); @@ -190,7 +190,7 @@ variant_editor_get_value (GtkWidget *editor) else { GtkWidget *entry; - const gchar *text; + const char *text; entry = gtk_widget_get_first_child (editor); text = gtk_editable_get_text (GTK_EDITABLE (entry)); @@ -261,7 +261,7 @@ update_enabled (GtkInspectorActionEditor *r, static void action_enabled_changed_cb (GActionGroup *group, - const gchar *action_name, + const char *action_name, gboolean enabled, GtkInspectorActionEditor *r) { @@ -279,7 +279,7 @@ update_state (GtkInspectorActionEditor *r, static void action_state_changed_cb (GActionGroup *group, - const gchar *action_name, + const char *action_name, GVariant *state, GtkInspectorActionEditor *r) { @@ -454,7 +454,7 @@ gtk_inspector_action_editor_class_init (GtkInspectorActionEditorClass *klass) GtkWidget * gtk_inspector_action_editor_new (GObject *owner, - const gchar *name, + const char *name, GtkSizeGroup *activate) { return g_object_new (GTK_TYPE_INSPECTOR_ACTION_EDITOR, diff --git a/gtk/inspector/action-editor.h b/gtk/inspector/action-editor.h index 5940008a56..db13c6c447 100644 --- a/gtk/inspector/action-editor.h +++ b/gtk/inspector/action-editor.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS GType gtk_inspector_action_editor_get_type (void); GtkWidget *gtk_inspector_action_editor_new (GObject *owner, - const gchar *name, + const char *name, GtkSizeGroup *activate); void gtk_inspector_action_editor_update (GtkInspectorActionEditor *r, gboolean enabled, diff --git a/gtk/inspector/actions.c b/gtk/inspector/actions.c index 4402fbfa24..4965bb6349 100644 --- a/gtk/inspector/actions.c +++ b/gtk/inspector/actions.c @@ -75,7 +75,7 @@ gtk_inspector_actions_init (GtkInspectorActions *sl) static void action_added (GObject *owner, - const gchar *action_name, + const char *action_name, GtkInspectorActions *sl) { ActionHolder *holder = action_holder_new (owner, action_name); @@ -170,7 +170,7 @@ bind_parameter_cb (GtkSignalListItemFactory *factory, owner = action_holder_get_owner (ACTION_HOLDER (item)); name = action_holder_get_name (ACTION_HOLDER (item)); if (G_IS_ACTION_GROUP (owner)) - parameter = (const gchar *)g_action_group_get_action_parameter_type (G_ACTION_GROUP (owner), name); + parameter = (const char *)g_action_group_get_action_parameter_type (G_ACTION_GROUP (owner), name); else if (GTK_IS_ACTION_MUXER (owner)) gtk_action_muxer_query_action (GTK_ACTION_MUXER (owner), name, NULL, (const GVariantType **)¶meter, NULL, NULL, NULL); @@ -259,7 +259,7 @@ add_group (GtkInspectorActions *sl, GActionGroup *group) { int i; - gchar **names; + char **names; names = g_action_group_list_actions (group); for (i = 0; names[i]; i++) @@ -272,7 +272,7 @@ add_muxer (GtkInspectorActions *sl, GtkActionMuxer *muxer) { int i; - gchar **names; + char **names; names = gtk_action_muxer_list_actions (muxer); for (i = 0; names[i]; i++) diff --git a/gtk/inspector/css-editor.c b/gtk/inspector/css-editor.c index 2a45b73168..de79175ed2 100644 --- a/gtk/inspector/css-editor.c +++ b/gtk/inspector/css-editor.c @@ -171,7 +171,7 @@ disable_toggled (GtkToggleButton *button, GTK_STYLE_PROVIDER_PRIORITY_USER); } -static gchar * +static char * get_current_text (GtkTextBuffer *buffer) { GtkTextIter start, end; @@ -258,7 +258,7 @@ save_clicked (GtkButton *button, static void update_style (GtkInspectorCssEditor *ce) { - gchar *text; + char *text; g_list_free_full (ce->priv->errors, css_error_free); ce->priv->errors = NULL; diff --git a/gtk/inspector/css-node-tree.c b/gtk/inspector/css-node-tree.c index 31dccb43b4..46f507f6f8 100644 --- a/gtk/inspector/css-node-tree.c +++ b/gtk/inspector/css-node-tree.c @@ -91,7 +91,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorCssNodeTree, gtk_inspector_css_node_tree typedef struct { GtkCssNode *node; - const gchar *prop_name; + const char *prop_name; GdkRectangle rect; GtkInspectorCssNodeTree *cnt; } NodePropEditor; @@ -276,7 +276,7 @@ strv_sort (char **strv) NULL); } -static gchar * +static char * format_state_flags (GtkStateFlags state) { if (state) @@ -375,7 +375,7 @@ gtk_inspector_css_node_tree_init (GtkInspectorCssNodeTree *cnt) { GtkCssStyleProperty *prop; GtkTreeIter iter; - const gchar *name; + const char *name; prop = _gtk_css_style_property_lookup_by_id (i); name = _gtk_style_property_get_name (GTK_STYLE_PROPERTY (prop)); @@ -438,11 +438,11 @@ gtk_inspector_css_node_tree_update_style (GtkInspectorCssNodeTree *cnt, for (i = 0; i < _gtk_css_style_property_get_n_properties (); i++) { GtkCssStyleProperty *prop; - const gchar *name; + const char *name; GtkTreeIter *iter; GtkCssSection *section; - gchar *location; - gchar *value; + char *location; + char *value; prop = _gtk_css_style_property_lookup_by_id (i); name = _gtk_style_property_get_name (GTK_STYLE_PROPERTY (prop)); @@ -522,7 +522,7 @@ gtk_inspector_css_node_tree_set_display (GtkInspectorCssNodeTree *cnt, GdkDisplay *display) { GtkSettings *settings; - gchar *theme_name; + char *theme_name; settings = gtk_settings_get_for_display (display); g_object_get (settings, "gtk-theme-name", &theme_name, NULL); diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 243e6d9369..739cab7d29 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -164,7 +164,7 @@ init_version (GtkInspectorGeneral *gen) static G_GNUC_UNUSED void add_check_row (GtkInspectorGeneral *gen, GtkListBox *list, - const gchar *name, + const char *name, gboolean value, int indent) { @@ -248,7 +248,7 @@ add_label_row (GtkInspectorGeneral *gen, static void append_glx_extension_row (GtkInspectorGeneral *gen, Display *dpy, - const gchar *ext) + const char *ext) { add_check_row (gen, GTK_LIST_BOX (gen->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0); } @@ -258,7 +258,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, static void append_egl_extension_row (GtkInspectorGeneral *gen, EGLDisplay dpy, - const gchar *ext) + const char *ext) { add_check_row (gen, GTK_LIST_BOX (gen->gl_box), ext, epoxy_has_egl_extension (dpy, ext), 0); } @@ -307,7 +307,7 @@ init_gl (GtkInspectorGeneral *gen) { Display *dpy = GDK_DISPLAY_XDISPLAY (gen->display); int error_base, event_base; - gchar *version; + char *version; if (!glXQueryExtension (dpy, &error_base, &event_base)) return; @@ -332,7 +332,7 @@ init_gl (GtkInspectorGeneral *gen) { EGLDisplay dpy; EGLint major, minor; - gchar *version; + char *version; dpy = wayland_get_display (gdk_wayland_display_get_wl_display (gen->display)); @@ -474,9 +474,9 @@ set_monospace_font (GtkWidget *w) static void set_path_label (GtkWidget *w, - const gchar *var) + const char *var) { - const gchar *v; + const char *v; v = g_getenv (var); if (v != NULL) @@ -563,8 +563,8 @@ populate_monitor (gpointer item, { GtkListBox *list; GdkMonitor *monitor = item; - gchar *name; - gchar *value; + char *name; + char *value; GdkRectangle rect; int scale; char *scale_str = NULL; @@ -678,11 +678,11 @@ static void add_device (GtkInspectorGeneral *gen, GdkDevice *device) { - const gchar *name, *value; + const char *name, *value; GString *str; int i; guint n_touches; - gchar *text; + char *text; GdkAxisFlags axes; const char *axis_name[] = { "Ignore", diff --git a/gtk/inspector/init.c b/gtk/inspector/init.c index fad5f9b5b7..2e092aafd0 100644 --- a/gtk/inspector/init.c +++ b/gtk/inspector/init.c @@ -86,7 +86,7 @@ gtk_inspector_init (void) if (extension_point == NULL) { GIOModuleScope *scope; - gchar **paths; + char **paths; int i; extension_point = g_io_extension_point_register ("gtk-inspector-page"); diff --git a/gtk/inspector/menu.c b/gtk/inspector/menu.c index fb7a78d318..ec7e6901e3 100644 --- a/gtk/inspector/menu.c +++ b/gtk/inspector/menu.c @@ -63,10 +63,10 @@ add_item (GtkInspectorMenu *sl, { GtkTreeIter iter; GVariant *value; - gchar *label = NULL; - gchar *action = NULL; - gchar *target = NULL; - gchar *icon = NULL; + char *label = NULL; + char *action = NULL; + char *target = NULL; + char *icon = NULL; GMenuModel *model; g_menu_model_get_item_attribute (menu, idx, G_MENU_ATTRIBUTE_LABEL, "s", &label); diff --git a/gtk/inspector/misc-info.c b/gtk/inspector/misc-info.c index 72621786f1..ffab43a93b 100644 --- a/gtk/inspector/misc-info.c +++ b/gtk/inspector/misc-info.c @@ -98,7 +98,7 @@ typedef struct _GtkInspectorMiscInfoClass G_DEFINE_TYPE (GtkInspectorMiscInfo, gtk_inspector_misc_info, GTK_TYPE_WIDGET) -static gchar * +static char * format_state_flags (GtkStateFlags state) { GFlagsClass *fclass; @@ -130,7 +130,7 @@ format_state_flags (GtkStateFlags state) static void state_flags_changed (GtkWidget *w, GtkStateFlags old_flags, GtkInspectorMiscInfo *sl) { - gchar *s; + char *s; s = format_state_flags (gtk_widget_get_state_flags (w)); gtk_label_set_label (GTK_LABEL (sl->state), s); @@ -142,7 +142,7 @@ update_allocation (GtkWidget *w, GtkInspectorMiscInfo *sl) { GtkAllocation alloc; - gchar *size_label; + char *size_label; GEnumClass *class; GEnumValue *value; @@ -284,7 +284,7 @@ update_frame_clock (GtkInspectorMiscInfo *sl) clock = (GObject *)gtk_widget_get_frame_clock (GTK_WIDGET (sl->object)); if (clock) { - gchar *tmp; + char *tmp; tmp = g_strdup_printf ("%p", clock); gtk_label_set_label (GTK_LABEL (sl->frame_clock), tmp); g_free (tmp); @@ -306,7 +306,7 @@ static gboolean update_info (gpointer data) { GtkInspectorMiscInfo *sl = data; - gchar *tmp; + char *tmp; GType gtype; tmp = g_strdup_printf ("%p", sl->object); diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c index d4ce6daed0..3c41bfd432 100644 --- a/gtk/inspector/object-tree.c +++ b/gtk/inspector/object-tree.c @@ -652,7 +652,7 @@ gtk_inspector_get_object_name (GObject *object) { if (GTK_IS_WIDGET (object)) { - const gchar *id; + const char *id; id = gtk_widget_get_name (GTK_WIDGET (object)); if (id != NULL && g_strcmp0 (id, G_OBJECT_TYPE_NAME (object)) != 0) @@ -661,7 +661,7 @@ gtk_inspector_get_object_name (GObject *object) if (GTK_IS_BUILDABLE (object)) { - const gchar *id; + const char *id; id = gtk_buildable_get_name (GTK_BUILDABLE (object)); if (id != NULL && !g_str_has_prefix (id, "___object_")) @@ -837,10 +837,10 @@ unmap (GtkWidget *widget) } static gboolean -match_string (const gchar *string, - const gchar *text) +match_string (const char *string, + const char *text) { - gchar *lower; + char *lower; gboolean match = FALSE; if (string) diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c index 8dcc463b67..fa586317b8 100644 --- a/gtk/inspector/prop-editor.c +++ b/gtk/inspector/prop-editor.c @@ -52,7 +52,7 @@ struct _GtkInspectorPropEditor GtkBox parent_instance; GObject *object; - gchar *name; + char *name; GtkWidget *self; GtkSizeGroup *size_group; }; @@ -114,7 +114,7 @@ g_object_connect_property (GObject *object, GObject *alive_object) { GClosure *closure; - gchar *with_detail; + char *with_detail; DisconnectData *dd; with_detail = g_strconcat ("notify::", spec->name, NULL); @@ -166,7 +166,7 @@ free_object_property (ObjectProperty *p) static void connect_controller (GObject *controller, - const gchar *signal, + const char *signal, GObject *model, GParamSpec *spec, GCallback func) @@ -351,7 +351,7 @@ string_modified (GtkEntry *entry, ObjectProperty *p) static void intern_string_modified (GtkEntry *entry, ObjectProperty *p) { - const gchar *s; + const char *s; s = gtk_editable_get_text (GTK_EDITABLE (entry)); if (g_str_equal (p->spec->name, "id")) @@ -365,8 +365,8 @@ string_changed (GObject *object, GParamSpec *pspec, gpointer data) { GtkEntry *entry = GTK_ENTRY (data); GValue val = G_VALUE_INIT; - const gchar *str; - const gchar *text; + const char *str; + const char *text; g_value_init (&val, G_TYPE_STRING); get_property_value (object, pspec, &val); @@ -389,7 +389,7 @@ static void strv_modified (GtkInspectorStrvEditor *self, ObjectProperty *p) { GValue val = G_VALUE_INIT; - gchar **strv; + char **strv; g_value_init (&val, G_TYPE_STRV); strv = gtk_inspector_strv_editor_get_strv (self); @@ -405,7 +405,7 @@ strv_changed (GObject *object, GParamSpec *pspec, gpointer data) { GtkInspectorStrvEditor *self = data; GValue val = G_VALUE_INIT; - gchar **strv; + char **strv; g_value_init (&val, G_TYPE_STRV); get_property_value (object, pspec, &val); @@ -595,7 +595,7 @@ flags_changed (GObject *object, GParamSpec *pspec, gpointer data) static gunichar unichar_get_value (GtkEntry *entry) { - const gchar *text = gtk_editable_get_text (GTK_EDITABLE (entry)); + const char *text = gtk_editable_get_text (GTK_EDITABLE (entry)); if (text[0]) return g_utf8_get_char (text); @@ -621,7 +621,7 @@ unichar_changed (GObject *object, GParamSpec *pspec, gpointer data) gunichar new_val; gunichar old_val = unichar_get_value (entry); GValue val = G_VALUE_INIT; - gchar buf[7]; + char buf[7]; int len; g_value_init (&val, pspec->value_type); @@ -648,7 +648,7 @@ static void pointer_changed (GObject *object, GParamSpec *pspec, gpointer data) { GtkLabel *label = GTK_LABEL (data); - gchar *str; + char *str; gpointer ptr; g_object_get (object, pspec->name, &ptr, NULL); @@ -658,7 +658,7 @@ pointer_changed (GObject *object, GParamSpec *pspec, gpointer data) g_free (str); } -static gchar * +static char * object_label (GObject *obj, GParamSpec *pspec) { return g_strdup_printf ("%p", obj); @@ -668,7 +668,7 @@ static void object_changed (GObject *object, GParamSpec *pspec, gpointer data) { GtkWidget *label, *button; - gchar *str; + char *str; GObject *obj; label = gtk_widget_get_first_child (GTK_WIDGET (data)); @@ -836,7 +836,7 @@ property_editor (GObject *object, { GtkWidget *prop_edit; GtkAdjustment *adj; - gchar *msg; + char *msg; GType type = G_PARAM_SPEC_TYPE (spec); if (type == G_TYPE_PARAM_INT) @@ -1336,7 +1336,7 @@ static GObject * find_action_owner (GtkActionable *actionable) { GtkWidget *widget = GTK_WIDGET (actionable); - const gchar *full_name; + const char *full_name; GtkWidget *win; full_name = gtk_actionable_get_action_name (actionable); @@ -1386,7 +1386,7 @@ action_editor (GObject *object, GtkWidget *box; GtkWidget *button; GObject *owner; - gchar *text; + char *text; owner = find_action_owner (GTK_ACTIONABLE (object)); @@ -1414,7 +1414,7 @@ action_editor (GObject *object, struct _GSettingsSchemaKey { GSettingsSchema *schema; - const gchar *name; + const char *name; guint is_flags : 1; guint is_enum : 1; @@ -1422,8 +1422,8 @@ struct _GSettingsSchemaKey const guint32 *strinfo; gsize strinfo_length; - const gchar *unparsed; - gchar lc_char; + const char *unparsed; + char lc_char; const GVariantType *type; GVariant *minimum, *maximum; @@ -1473,15 +1473,15 @@ add_actionable_info (GtkInspectorPropEditor *self) static void add_settings_info (GtkInspectorPropEditor *self) { - gchar *key; + char *key; GSettingsBinding *binding; GObject *object; - const gchar *name; - const gchar *direction; - const gchar *tip; + const char *name; + const char *direction; + const char *tip; GtkWidget *row; GtkWidget *label; - gchar *str; + char *str; object = self->object; name = self->name; @@ -1542,9 +1542,9 @@ static void add_gtk_settings_info (GtkInspectorPropEditor *self) { GObject *object; - const gchar *name; + const char *name; GtkWidget *row; - const gchar *source; + const char *source; GtkWidget *button; object = self->object; @@ -1591,8 +1591,8 @@ readonly_changed (GObject *object, gpointer data) { GValue gvalue = {0}; - gchar *value; - gchar *type; + char *value; + char *type; g_value_init (&gvalue, spec->value_type); g_object_get_property (object, spec->name, &gvalue); @@ -1774,7 +1774,7 @@ gtk_inspector_prop_editor_class_init (GtkInspectorPropEditorClass *klass) GtkWidget * gtk_inspector_prop_editor_new (GObject *object, - const gchar *name, + const char *name, GtkSizeGroup *values) { return g_object_new (GTK_TYPE_INSPECTOR_PROP_EDITOR, diff --git a/gtk/inspector/prop-editor.h b/gtk/inspector/prop-editor.h index 6b0f720b74..32a669b5f9 100644 --- a/gtk/inspector/prop-editor.h +++ b/gtk/inspector/prop-editor.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS G_DECLARE_FINAL_TYPE (GtkInspectorPropEditor, gtk_inspector_prop_editor, GTK, INSPECTOR_PROP_EDITOR, GtkBox) GtkWidget *gtk_inspector_prop_editor_new (GObject *object, - const gchar *name, + const char *name, GtkSizeGroup *values); gboolean gtk_inspector_prop_editor_should_expand (GtkInspectorPropEditor *editor); diff --git a/gtk/inspector/prop-list.c b/gtk/inspector/prop-list.c index b30fe7a740..dab74e6a00 100644 --- a/gtk/inspector/prop-list.c +++ b/gtk/inspector/prop-list.c @@ -187,8 +187,8 @@ set_property (GObject *object, static void show_object (GtkInspectorPropEditor *editor, GObject *object, - const gchar *name, - const gchar *tab, + const char *name, + const char *tab, GtkInspectorPropList *pl) { GtkInspectorWindow *iw; @@ -465,10 +465,10 @@ gtk_inspector_prop_list_class_init (GtkInspectorPropListClass *klass) /* Like g_strdup_value_contents, but keeps the type name separate */ void strdup_value_contents (const GValue *value, - gchar **contents, - gchar **type) + char **contents, + char **type) { - const gchar *src; + const char *src; if (G_VALUE_HOLDS_STRING (value)) { @@ -482,7 +482,7 @@ strdup_value_contents (const GValue *value, } else { - gchar *s = g_strescape (src, NULL); + char *s = g_strescape (src, NULL); *contents = g_strdup_printf ("\"%s\"", s); g_free (s); } @@ -528,7 +528,7 @@ strdup_value_contents (const GValue *value, while (*strv != NULL) { - gchar *escaped = g_strescape (*strv, NULL); + char *escaped = g_strescape (*strv, NULL); g_string_append_printf (tmp, "\"%s\"", escaped); g_free (escaped); diff --git a/gtk/inspector/prop-list.h b/gtk/inspector/prop-list.h index ef7896e550..cefd4d8c9c 100644 --- a/gtk/inspector/prop-list.h +++ b/gtk/inspector/prop-list.h @@ -57,8 +57,8 @@ void gtk_inspector_prop_list_set_layout_child (GtkInspectorPropList *pl, GObject *object); void strdup_value_contents (const GValue *value, - gchar **contents, - gchar **type); + char **contents, + char **type); diff --git a/gtk/inspector/resource-list.c b/gtk/inspector/resource-list.c index 386935aed9..57be9a049f 100644 --- a/gtk/inspector/resource-list.c +++ b/gtk/inspector/resource-list.c @@ -83,7 +83,7 @@ load_resources_recurse (const char *path, int *count_out, gsize *size_out) { - gchar **names; + char **names; int i; GListStore *result; @@ -93,7 +93,7 @@ load_resources_recurse (const char *path, for (i = 0; names[i]; i++) { int len; - gchar *p; + char *p; gboolean has_slash; int count; gsize size; @@ -149,11 +149,11 @@ populate_details (GtkInspectorResourceList *rl, const char *path; const char *name; GBytes *bytes; - gchar *type; + char *type; gconstpointer data; gsize size; GError *error = NULL; - gchar *markup; + char *markup; path = resource_holder_get_path (holder); name = resource_holder_get_name (holder); @@ -175,10 +175,10 @@ populate_details (GtkInspectorResourceList *rl, } else { - gchar *text; - gchar *content_image; - gchar *content_text; - gchar *content_video; + char *text; + char *content_image; + char *content_text; + char *content_video; content_image = g_content_type_from_mime_type ("image/*"); content_text = g_content_type_from_mime_type ("text/*"); @@ -412,10 +412,10 @@ unroot (GtkWidget *widget) } static gboolean -match_string (const gchar *string, - const gchar *text) +match_string (const char *string, + const char *text) { - gchar *lower; + char *lower; gboolean match = FALSE; if (string) diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c index 36a26da7ad..83033ba21a 100644 --- a/gtk/inspector/size-groups.c +++ b/gtk/inspector/size-groups.c @@ -196,7 +196,7 @@ add_widget (GtkInspectorSizeGroups *sl, { GtkWidget *row; GtkWidget *label; - gchar *text; + char *text; row = g_object_new (size_group_row_get_type (), "widget", widget, NULL); text = g_strdup_printf ("%p (%s)", widget, g_type_name_from_instance ((GTypeInstance*)widget)); diff --git a/gtk/inspector/statistics.c b/gtk/inspector/statistics.c index e299fceb3b..b094fc2e93 100644 --- a/gtk/inspector/statistics.c +++ b/gtk/inspector/statistics.c @@ -177,7 +177,7 @@ has_instance_counts (void) static gboolean instance_counts_enabled (void) { - const gchar *string; + const char *string; guint flags = 0; string = g_getenv ("GOBJECT_DEBUG"); @@ -204,7 +204,7 @@ cell_data_data (GtkCellLayout *layout, { int column; int count; - gchar *text; + char *text; column = GPOINTER_TO_INT (data); @@ -225,7 +225,7 @@ cell_data_delta (GtkCellLayout *layout, int column; int count1; int count2; - gchar *text; + char *text; column = GPOINTER_TO_INT (data); @@ -286,10 +286,10 @@ key_pressed (GtkEventController *controller, } static gboolean -match_string (const gchar *string, - const gchar *text) +match_string (const char *string, + const char *text) { - gchar *lower; + char *lower; gboolean match = FALSE; if (string) @@ -305,11 +305,11 @@ match_string (const gchar *string, static gboolean match_row (GtkTreeModel *model, int column, - const gchar *key, + const char *key, GtkTreeIter *iter, gpointer data) { - gchar *type; + char *type; gboolean match; gtk_tree_model_get (model, iter, column, &type, -1); diff --git a/gtk/inspector/strv-editor.c b/gtk/inspector/strv-editor.c index 4b0f87fdce..478b62809c 100644 --- a/gtk/inspector/strv-editor.c +++ b/gtk/inspector/strv-editor.c @@ -58,7 +58,7 @@ remove_string (GtkButton *button, static void add_string (GtkInspectorStrvEditor *editor, - const gchar *str) + const char *str) { GtkWidget *box; GtkWidget *entry; @@ -129,7 +129,7 @@ gtk_inspector_strv_editor_class_init (GtkInspectorStrvEditorClass *class) void gtk_inspector_strv_editor_set_strv (GtkInspectorStrvEditor *editor, - gchar **strv) + char **strv) { GtkWidget *child; int i; @@ -150,7 +150,7 @@ gtk_inspector_strv_editor_set_strv (GtkInspectorStrvEditor *editor, emit_changed (editor); } -gchar ** +char ** gtk_inspector_strv_editor_get_strv (GtkInspectorStrvEditor *editor) { GtkWidget *child; @@ -170,5 +170,5 @@ gtk_inspector_strv_editor_get_strv (GtkInspectorStrvEditor *editor) g_ptr_array_add (p, NULL); - return (gchar **)g_ptr_array_free (p, FALSE); + return (char **)g_ptr_array_free (p, FALSE); } diff --git a/gtk/inspector/strv-editor.h b/gtk/inspector/strv-editor.h index 10efc368a5..bfe7b06f2e 100644 --- a/gtk/inspector/strv-editor.h +++ b/gtk/inspector/strv-editor.h @@ -55,9 +55,9 @@ G_BEGIN_DECLS GType gtk_inspector_strv_editor_get_type (void); void gtk_inspector_strv_editor_set_strv (GtkInspectorStrvEditor *editor, - gchar **strv); + char **strv); -gchar **gtk_inspector_strv_editor_get_strv (GtkInspectorStrvEditor *editor); +char **gtk_inspector_strv_editor_get_strv (GtkInspectorStrvEditor *editor); G_END_DECLS diff --git a/gtk/inspector/tree-data.c b/gtk/inspector/tree-data.c index 402cff68a3..08ca475b77 100644 --- a/gtk/inspector/tree-data.c +++ b/gtk/inspector/tree-data.c @@ -69,7 +69,7 @@ cell_data_func (GtkTreeViewColumn *col, { int num; GValue gvalue = { 0, }; - gchar *value; + char *value; num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (col), "num")); gtk_tree_model_get_value (model, iter, num, &gvalue); @@ -85,7 +85,7 @@ add_columns (GtkInspectorTreeData *sl) int n_columns; GtkCellRenderer *cell; GType type; - gchar *title; + char *title; GtkTreeViewColumn *col; int i; @@ -132,7 +132,7 @@ gtk_inspector_tree_data_set_object (GtkInspectorTreeData *sl, { GtkWidget *stack; GtkStackPage *page; - gchar *title; + char *title; stack = gtk_widget_get_parent (GTK_WIDGET (sl)); page = gtk_stack_get_page (GTK_STACK (stack), GTK_WIDGET (sl)); diff --git a/gtk/inspector/type-info.c b/gtk/inspector/type-info.c index a2c72d9a50..4b417cc2f8 100644 --- a/gtk/inspector/type-info.c +++ b/gtk/inspector/type-info.c @@ -79,7 +79,7 @@ gtk_inspector_type_popover_set_gtype (GtkInspectorTypePopover *self, GtkInspectorTypePopoverPrivate *priv; GHashTable *implements; GHashTableIter iter; - const gchar *name; + const char *name; GType *interfaces; GType tmp; int i; @@ -110,7 +110,7 @@ gtk_inspector_type_popover_set_gtype (GtkInspectorTypePopover *self, interfaces = g_type_interfaces (tmp, NULL); for (i = 0; interfaces[i]; i++) - g_hash_table_add (implements, (gchar *) g_type_name (interfaces[i])); + g_hash_table_add (implements, (char *) g_type_name (interfaces[i])); g_free (interfaces); } diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c index 28798507cd..b0f54280fb 100644 --- a/gtk/inspector/visual.c +++ b/gtk/inspector/visual.c @@ -217,7 +217,7 @@ update_font_scale (GtkInspectorVisual *vis, if (update_entry) { - gchar *str = g_strdup_printf ("%0.2f", factor); + char *str = g_strdup_printf ("%0.2f", factor); gtk_editable_set_text (GTK_EDITABLE (vis->font_scale_entry), str); g_free (str); @@ -239,7 +239,7 @@ font_scale_entry_activated (GtkEntry *entry, GtkInspectorVisual *vis) { gdouble factor; - gchar *err = NULL; + char *err = NULL; factor = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err); if (err != NULL) @@ -459,10 +459,10 @@ focus_activate (GtkSwitch *sw, } static void -fill_gtk (const gchar *path, +fill_gtk (const char *path, GHashTable *t) { - const gchar *dir_entry; + const char *dir_entry; GDir *dir = g_dir_open (path, 0, NULL); if (!dir) @@ -470,7 +470,7 @@ fill_gtk (const gchar *path, while ((dir_entry = g_dir_read_name (dir))) { - gchar *filename = g_build_filename (path, dir_entry, "gtk-4.0", "gtk.css", NULL); + char *filename = g_build_filename (path, dir_entry, "gtk-4.0", "gtk.css", NULL); if (g_file_test (filename, G_FILE_TEST_IS_REGULAR) && !g_hash_table_contains (t, dir_entry)) @@ -482,10 +482,10 @@ fill_gtk (const gchar *path, g_dir_close (dir); } -static gchar* -get_data_path (const gchar *subdir) +static char * +get_data_path (const char *subdir) { - gchar *base_datadir, *full_datadir; + char *base_datadir, *full_datadir; #if defined (GDK_WINDOWING_WIN32) || defined (GDK_WINDOWING_QUARTZ) base_datadir = g_strdup (_gtk_get_datadir ()); #else @@ -534,11 +534,11 @@ init_theme (GtkInspectorVisual *vis) { GHashTable *t; GHashTableIter iter; - gchar *theme, *path; - gchar **builtin_themes; + char *theme, *path; + char **builtin_themes; GList *list, *l; guint i; - const gchar * const *dirs; + const char * const *dirs; char **names; t = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); @@ -622,10 +622,10 @@ init_dark (GtkInspectorVisual *vis) } static void -fill_icons (const gchar *path, +fill_icons (const char *path, GHashTable *t) { - const gchar *dir_entry; + const char *dir_entry; GDir *dir; dir = g_dir_open (path, 0, NULL); @@ -634,7 +634,7 @@ fill_icons (const gchar *path, while ((dir_entry = g_dir_read_name (dir))) { - gchar *filename = g_build_filename (path, dir_entry, "index.theme", NULL); + char *filename = g_build_filename (path, dir_entry, "index.theme", NULL); if (g_file_test (filename, G_FILE_TEST_IS_REGULAR) && g_strcmp0 (dir_entry, "hicolor") != 0 && @@ -652,7 +652,7 @@ init_icons (GtkInspectorVisual *vis) { GHashTable *t; GHashTableIter iter; - gchar *theme, *path; + char *theme, *path; GList *list, *l; char **names; int i; @@ -689,10 +689,10 @@ init_icons (GtkInspectorVisual *vis) } static void -fill_cursors (const gchar *path, +fill_cursors (const char *path, GHashTable *t) { - const gchar *dir_entry; + const char *dir_entry; GDir *dir; dir = g_dir_open (path, 0, NULL); @@ -701,7 +701,7 @@ fill_cursors (const gchar *path, while ((dir_entry = g_dir_read_name (dir))) { - gchar *filename = g_build_filename (path, dir_entry, "cursors", NULL); + char *filename = g_build_filename (path, dir_entry, "cursors", NULL); if (g_file_test (filename, G_FILE_TEST_IS_DIR) && !g_hash_table_contains (t, dir_entry)) @@ -718,7 +718,7 @@ init_cursors (GtkInspectorVisual *vis) { GHashTable *t; GHashTableIter iter; - gchar *theme, *path; + char *theme, *path; GList *list, *l; char **names; int i; @@ -857,7 +857,7 @@ update_slowdown (GtkInspectorVisual *vis, if (update_entry) { - gchar *str = g_strdup_printf ("%0.*f", 2, slowdown); + char *str = g_strdup_printf ("%0.*f", 2, slowdown); gtk_editable_set_text (GTK_EDITABLE (vis->slowdown_entry), str); g_free (str); @@ -882,7 +882,7 @@ slowdown_entry_activated (GtkEntry *entry, GtkInspectorVisual *vis) { gdouble slowdown; - gchar *err = NULL; + char *err = NULL; slowdown = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err); if (err != NULL) diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c index ff865a3b79..c1ef5ca5d0 100644 --- a/gtk/inspector/window.c +++ b/gtk/inspector/window.c @@ -670,7 +670,7 @@ get_inspector_display (void) if (display == NULL) { - const gchar *name; + const char *name; name = g_getenv ("GTK_INSPECTOR_DISPLAY"); display = gdk_display_open (name); @@ -693,7 +693,7 @@ get_inspector_display (void) if (display) { - const gchar *name; + const char *name; name = g_getenv ("GTK_INSPECTOR_RENDERER"); diff --git a/gtk/paper_names.c b/gtk/paper_names.c index 038726888e..e5c9d0b839 100644 --- a/gtk/paper_names.c +++ b/gtk/paper_names.c @@ -9,10 +9,10 @@ */ typedef struct { - const gchar *name; - const gchar *size; - const gchar *display_name; - const gchar *ppd_name; + const char *name; + const char *size; + const char *display_name; + const char *ppd_name; } PaperInfo; static const PaperInfo standard_names[] = { diff --git a/gtk/tools/encodesymbolic.c b/gtk/tools/encodesymbolic.c index 7f94f30e50..3bca80100d 100644 --- a/gtk/tools/encodesymbolic.c +++ b/gtk/tools/encodesymbolic.c @@ -33,7 +33,7 @@ #include "gdkpixbufutilsprivate.h" -static gchar *output_dir = NULL; +static char *output_dir = NULL; static GOptionEntry args[] = { { "output", 'o', 0, G_OPTION_ARG_FILENAME, &output_dir, N_("Output to this directory instead of cwd"), NULL }, @@ -43,12 +43,12 @@ static GOptionEntry args[] = { int main (int argc, char **argv) { - gchar *path, *basename, *pngpath, *pngfile, *dot; + char *path, *basename, *pngpath, *pngfile, *dot; GOptionContext *context; GdkPixbuf *symbolic; GError *error; int width, height; - gchar **sizev; + char **sizev; GFileOutputStream *out; GFile *dest; char *data; diff --git a/gtk/tools/gdkpixbufutils.c b/gtk/tools/gdkpixbufutils.c index ad67e3b8e8..4912f7962f 100644 --- a/gtk/tools/gdkpixbufutils.c +++ b/gtk/tools/gdkpixbufutils.c @@ -262,8 +262,8 @@ load_symbolic_svg (const char *escaped_file_data, { GInputStream *stream; GdkPixbuf *pixbuf; - gchar *data; - gchar *svg_width, *svg_height; + char *data; + char *svg_width, *svg_height; if (width == 0) width = icon_width * scale; diff --git a/gtk/tools/gtk-builder-tool-enumerate.c b/gtk/tools/gtk-builder-tool-enumerate.c index 45e8275378..382ad93929 100644 --- a/gtk/tools/gtk-builder-tool-enumerate.c +++ b/gtk/tools/gtk-builder-tool-enumerate.c @@ -28,7 +28,7 @@ #include "gtkbuilderprivate.h" #include "gtk-builder-tool.h" -static const gchar * +static const char * object_get_name (GObject *object) { if (GTK_IS_BUILDABLE (object)) @@ -45,8 +45,8 @@ do_enumerate (int *argc, const char ***argv) int ret; GSList *list, *l; GObject *object; - const gchar *name; - const gchar *filename; + const char *name; + const char *filename; filename = (*argv)[1]; diff --git a/gtk/tools/gtk-builder-tool-preview.c b/gtk/tools/gtk-builder-tool-preview.c index d40b9d96a3..3dbc3d1b5b 100644 --- a/gtk/tools/gtk-builder-tool-preview.c +++ b/gtk/tools/gtk-builder-tool-preview.c @@ -34,8 +34,8 @@ set_window_title (GtkWindow *window, const char *filename, const char *id) { - gchar *name; - gchar *title; + char *name; + char *title; name = g_path_get_basename (filename); diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/gtk/tools/gtk-builder-tool-simplify.c index 8545d69b00..246e697c81 100644 --- a/gtk/tools/gtk-builder-tool-simplify.c +++ b/gtk/tools/gtk-builder-tool-simplify.c @@ -130,9 +130,9 @@ static GMarkupParser parser = { NULL }; -static const gchar * +static const char * canonical_boolean_value (MyParserData *data, - const gchar *string) + const char *string) { GValue value = G_VALUE_INIT; gboolean b = FALSE; @@ -348,13 +348,13 @@ is_container_element (Element *element) } static void -canonicalize_key (gchar *key) +canonicalize_key (char *key) { - gchar *p; + char *p; for (p = key; *p != 0; p++) { - gchar c = *p; + char c = *p; /* We may meet something like AtkObject::accessible-name */ if (c == ':' && ((p > key && p[-1] == ':') || p[1] == ':')) @@ -382,14 +382,14 @@ static struct { static GParamSpec * get_property_pspec (MyParserData *data, - const gchar *class_name, - const gchar *property_name, + const char *class_name, + const char *property_name, PropKind kind) { GType type; GObjectClass *class; GParamSpec *pspec; - gchar *canonical_name; + char *canonical_name; type = g_type_from_name (class_name); if (type == G_TYPE_INVALID) @@ -471,7 +471,7 @@ static gboolean value_is_default (Element *element, MyParserData *data, GParamSpec *pspec, - const gchar *value_string) + const char *value_string) { GValue value = { 0, }; gboolean ret; @@ -602,7 +602,7 @@ property_is_boolean (Element *element, for (i = 0; element->attribute_names[i]; i++) { if (strcmp (element->attribute_names[i], "name") == 0) - property_name = (const gchar *)element->attribute_values[i]; + property_name = (const char *)element->attribute_values[i]; } pspec = get_property_pspec (data, class_name, property_name, kind); @@ -653,7 +653,7 @@ property_can_be_omitted (Element *element, else if (strcmp (element->attribute_names[i], "translatable") == 0) translatable = TRUE; else if (strcmp (element->attribute_names[i], "name") == 0) - property_name = (const gchar *)element->attribute_values[i]; + property_name = (const char *)element->attribute_values[i]; } if (data->convert3to4 && @@ -683,8 +683,8 @@ static gboolean property_has_been_removed (Element *element, MyParserData *data) { - const gchar *class_name; - const gchar *property_name; + const char *class_name; + const char *property_name; struct _Prop { const char *class; const char *property; @@ -698,7 +698,7 @@ property_has_been_removed (Element *element, { "GtkHeaderBar", "position", PROP_KIND_PACKING }, { "GtkPopoverMenu", "position",PROP_KIND_PACKING }, }; - gchar *canonical_name; + char *canonical_name; gboolean found; int i, k; PropKind kind; @@ -711,7 +711,7 @@ property_has_been_removed (Element *element, for (i = 0; element->attribute_names[i]; i++) { if (strcmp (element->attribute_names[i], "name") == 0) - property_name = (const gchar *)element->attribute_values[i]; + property_name = (const char *)element->attribute_values[i]; } canonical_name = g_strdup (property_name); @@ -737,8 +737,8 @@ property_has_been_removed (Element *element, static void maybe_rename_property (Element *element, MyParserData *data) { - const gchar *class_name; - const gchar *property_name; + const char *class_name; + const char *property_name; struct _Prop { const char *class; const char *property; @@ -773,7 +773,7 @@ maybe_rename_property (Element *element, MyParserData *data) if (strcmp (element->attribute_names[i], "name") == 0) { prop_name_index = i; - property_name = (const gchar *)element->attribute_values[i]; + property_name = (const char *)element->attribute_values[i]; } } @@ -1860,7 +1860,7 @@ simplify_file (const char *filename, gboolean convert3to4) { GMarkupParseContext *context; - gchar *buffer; + char *buffer; MyParserData data; GError *error = NULL; diff --git a/gtk/tools/gtk-builder-tool-validate.c b/gtk/tools/gtk-builder-tool-validate.c index dfdfc005b8..63910f9fb6 100644 --- a/gtk/tools/gtk-builder-tool-validate.c +++ b/gtk/tools/gtk-builder-tool-validate.c @@ -29,8 +29,8 @@ #include "gtk-builder-tool.h" static GType -make_fake_type (const gchar *type_name, - const gchar *parent_name) +make_fake_type (const char *type_name, + const char *parent_name) { GType parent_type; GTypeQuery query; @@ -53,9 +53,9 @@ make_fake_type (const gchar *type_name, } static void -do_validate_template (const gchar *filename, - const gchar *type_name, - const gchar *parent_name) +do_validate_template (const char *filename, + const char *type_name, + const char *parent_name) { GType template_type; GObject *object; @@ -91,11 +91,11 @@ do_validate_template (const gchar *filename, } static gboolean -parse_template_error (const gchar *message, - gchar **class_name, - gchar **parent_name) +parse_template_error (const char *message, + char **class_name, + char **parent_name) { - gchar *p; + char *p; p = strstr (message, "(class '"); if (p) @@ -123,8 +123,8 @@ validate_file (const char *filename) GtkBuilder *builder; GError *error = NULL; int ret; - gchar *class_name = NULL; - gchar *parent_name = NULL; + char *class_name = NULL; + char *parent_name = NULL; builder = gtk_builder_new (); ret = gtk_builder_add_from_file (builder, filename, &error); diff --git a/gtk/tools/gtk-launch.c b/gtk/tools/gtk-launch.c index bc62584efb..9305095ea2 100644 --- a/gtk/tools/gtk-launch.c +++ b/gtk/tools/gtk-launch.c @@ -34,7 +34,7 @@ #include <gtk.h> static gboolean show_version; -static gchar **args = NULL; +static char **args = NULL; static GOptionEntry entries[] = { { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Show program version"), NULL }, @@ -47,11 +47,11 @@ main (int argc, char *argv[]) { GError *error = NULL; GOptionContext *context = NULL; - gchar *summary; - gchar *app_name; + char *summary; + char *app_name; #ifdef G_OS_UNIX - gchar *desktop_file_name; - gchar *bus_name = NULL; + char *desktop_file_name; + char *bus_name = NULL; #endif GAppInfo *info = NULL; GAppLaunchContext *launch_context; @@ -172,7 +172,7 @@ main (int argc, char *argv[]) if (bus_name != NULL) { GDBusConnection *connection; - gchar *object_path, *p; + char *object_path, *p; connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); diff --git a/gtk/tools/gtk-query-settings.c b/gtk/tools/gtk-query-settings.c index 6a025f5899..fbaaa337a6 100644 --- a/gtk/tools/gtk-query-settings.c +++ b/gtk/tools/gtk-query-settings.c @@ -28,7 +28,7 @@ main (int argc, char **argv) guint n_properties; guint i; int max_prop_name_length = 0; - gchar *pattern = NULL; + char *pattern = NULL; gtk_init (); @@ -51,7 +51,7 @@ main (int argc, char **argv) { GValue value = {0}; GParamSpec *prop = props[i]; - gchar *value_str; + char *value_str; int spacing = max_prop_name_length - strlen (prop->name) + 1; gboolean deprecated; diff --git a/gtk/tools/gtkiconcachevalidator.c b/gtk/tools/gtkiconcachevalidator.c index f449b6d22b..7cec4d486f 100644 --- a/gtk/tools/gtkiconcachevalidator.c +++ b/gtk/tools/gtkiconcachevalidator.c @@ -84,7 +84,7 @@ check_string (CacheInfo *info, if (info->flags & CHECK_STRINGS) { int i; - gchar c; + char c; /* assume no string is longer than 1k */ for (i = 0; i < 1024; i++) @@ -110,7 +110,7 @@ check_string_utf8 (CacheInfo *info, if (info->flags & CHECK_STRINGS) { int i; - gchar c; + char c; /* assume no string is longer than 1k */ for (i = 0; i < 1024; i++) diff --git a/gtk/tools/updateiconcache.c b/gtk/tools/updateiconcache.c index b6b5912e47..49732156f6 100644 --- a/gtk/tools/updateiconcache.c +++ b/gtk/tools/updateiconcache.c @@ -46,7 +46,7 @@ static gboolean ignore_theme_index = FALSE; static gboolean quiet = FALSE; static gboolean index_only = TRUE; static gboolean validate = FALSE; -static gchar *var_name = (gchar *) "-"; +static char *var_name = (char *) "-"; #define CACHE_NAME "icon-theme.cache" @@ -84,9 +84,9 @@ static int check_dir_mtime (const char *dir, } static gboolean -is_cache_up_to_date (const gchar *path) +is_cache_up_to_date (const char *path) { - gchar *cache_path; + char *cache_path; int retval; cache_path = g_build_filename (path, CACHE_NAME, NULL); @@ -109,10 +109,10 @@ is_cache_up_to_date (const gchar *path) #else /* !HAVE_FTW_H */ gboolean -is_cache_up_to_date (const gchar *path) +is_cache_up_to_date (const char *path) { GStatBuf path_stat, cache_stat; - gchar *cache_path; + char *cache_path; int retval; retval = g_stat (path, &path_stat); @@ -141,10 +141,10 @@ is_cache_up_to_date (const gchar *path) #endif /* !HAVE_FTW_H */ static gboolean -has_theme_index (const gchar *path) +has_theme_index (const char *path) { gboolean result; - gchar *index_path; + char *index_path; index_path = g_build_filename (path, "index.theme", NULL); @@ -236,7 +236,7 @@ load_icon_data (const char *path) int i; int *ivalues; GError *error = NULL; - gchar **keys; + char **keys; gsize n_keys; IconData *data; @@ -295,16 +295,16 @@ load_icon_data (const char *path) } keys = g_key_file_get_keys (icon_file, "Icon Data", &n_keys, &error); - data->display_names = g_new0 (gchar *, 2 * n_keys + 1); + data->display_names = g_new0 (char *, 2 * n_keys + 1); data->n_display_names = 0; for (i = 0; i < n_keys; i++) { - gchar *lang, *name; + char *lang, *name; if (g_str_has_prefix (keys[i], "DisplayName")) { - gchar *open, *close = NULL; + char *open, *close = NULL; open = strchr (keys[i], '['); @@ -350,9 +350,9 @@ load_icon_data (const char *path) * probably go to GLib */ static void -canonicalize_filename (gchar *filename) +canonicalize_filename (char *filename) { - gchar *p, *q; + char *p, *q; gboolean last_was_slash = FALSE; p = filename; @@ -418,12 +418,12 @@ canonicalize_filename (gchar *filename) *q = '\0'; } -static gchar * -follow_links (const gchar *path) +static char * +follow_links (const char *path) { - gchar *target; - gchar *d, *s; - gchar *path2 = NULL; + char *target; + char *d, *s; + char *path2 = NULL; path2 = g_strdup (path); while (g_file_test (path2, G_FILE_TEST_IS_SYMLINK)) @@ -459,14 +459,14 @@ follow_links (const gchar *path) static void maybe_cache_image_data (Image *image, - const gchar *path) + const char *path) { if (!index_only && !image->image_data && (g_str_has_suffix (path, ".png") || g_str_has_suffix (path, ".xpm"))) { GdkPixbuf *pixbuf; ImageData *idata; - gchar *path2; + char *path2; idata = g_hash_table_lookup (image_data_hash, path); path2 = follow_links (path); @@ -523,12 +523,12 @@ G_GNUC_END_IGNORE_DEPRECATIONS; static void maybe_cache_icon_data (Image *image, - const gchar *path) + const char *path) { if (g_str_has_suffix (path, ".icon")) { IconData *idata = NULL; - gchar *path2 = NULL; + char *path2 = NULL; idata = g_hash_table_lookup (icon_data_hash, path); path2 = follow_links (path); @@ -576,7 +576,7 @@ maybe_cache_icon_data (Image *image, * directory separators on all platforms. */ static void -replace_backslashes_with_slashes (gchar *path) +replace_backslashes_with_slashes (char *path) { size_t i; if (path == NULL) @@ -587,8 +587,8 @@ replace_backslashes_with_slashes (gchar *path) } static GList * -scan_directory (const gchar *base_path, - const gchar *subdir, +scan_directory (const char *base_path, + const char *subdir, GHashTable *files, GList *directories, int depth) @@ -596,8 +596,8 @@ scan_directory (const gchar *base_path, GHashTable *dir_hash; GDir *dir; GList *list = NULL, *iterator = NULL; - const gchar *name; - gchar *dir_path; + const char *name; + char *dir_path; gboolean dir_added = FALSE; guint dir_index = 0xffff; @@ -620,18 +620,18 @@ scan_directory (const gchar *base_path, { name = iterator->data; - gchar *path; + char *path; gboolean retval; int flags = 0; Image *image; - gchar *basename, *dot; + char *basename, *dot; path = g_build_filename (dir_path, name, NULL); retval = g_file_test (path, G_FILE_TEST_IS_DIR); if (retval) { - gchar *subsubdir; + char *subsubdir; if (subdir) subsubdir = g_build_path ("/", subdir, name, NULL); @@ -714,7 +714,7 @@ typedef struct _HashNode HashNode; struct _HashNode { HashNode *next; - gchar *name; + char *name; GList *image_list; int offset; }; @@ -762,21 +762,21 @@ convert_to_hash (gpointer key, gpointer value, gpointer user_data) static GHashTable *string_pool = NULL; static int -find_string (const gchar *n) +find_string (const char *n) { return GPOINTER_TO_INT (g_hash_table_lookup (string_pool, n)); } static void -add_string (const gchar *n, int offset) +add_string (const char *n, int offset) { g_hash_table_insert (string_pool, (gpointer) n, GINT_TO_POINTER (offset)); } static gboolean -write_string (FILE *cache, const gchar *n) +write_string (FILE *cache, const char *n) { - gchar *s; + char *s; int i, l; l = ALIGN_VALUE (strlen (n) + 1, 4); @@ -1417,7 +1417,7 @@ write_file (FILE *cache, GHashTable *files, GList *directories) } static gboolean -validate_file (const gchar *file) +validate_file (const char *file) { GMappedFile *map; CacheInfo info; @@ -1469,11 +1469,11 @@ safe_fclose (FILE *f) } static void -build_cache (const gchar *path) +build_cache (const char *path) { - gchar *cache_path, *tmp_cache_path; + char *cache_path, *tmp_cache_path; #ifdef G_OS_WIN32 - gchar *bak_cache_path = NULL; + char *bak_cache_path = NULL; #endif GHashTable *files; FILE *cache; @@ -1620,10 +1620,10 @@ opentmp: } static void -write_csource (const gchar *path) +write_csource (const char *path) { - gchar *cache_path; - gchar *data; + char *cache_path; + char *data; gsize len; int i; @@ -1666,9 +1666,9 @@ static GOptionEntry args[] = { }; static void -printerr_handler (const gchar *string) +printerr_handler (const char *string) { - const gchar *charset; + const char *charset; fputs (g_get_prgname (), stderr); fputs (": ", stderr); @@ -1676,7 +1676,7 @@ printerr_handler (const gchar *string) fputs (string, stderr); /* charset is UTF-8 already */ else { - gchar *result; + char *result; result = g_convert_with_fallback (string, -1, charset, "UTF-8", "?", NULL, NULL, NULL); @@ -1694,7 +1694,7 @@ printerr_handler (const gchar *string) int main (int argc, char **argv) { - gchar *path; + char *path; GOptionContext *context; if (argc < 2) @@ -1723,7 +1723,7 @@ main (int argc, char **argv) if (validate) { - gchar *file = g_build_filename (path, CACHE_NAME, NULL); + char *file = g_build_filename (path, CACHE_NAME, NULL); if (!g_file_test (file, G_FILE_TEST_IS_REGULAR)) { |