diff options
| author | Javier Jardón <jjardon@gnome.org> | 2011-06-06 19:13:44 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2011-06-10 13:07:54 +0100 |
| commit | bf0d8402f5382fadd32a9748d00a4bcd715ea07a (patch) | |
| tree | fb60ab4c6589c0dac140fe16b63fced2d7bbf070 /gtk | |
| parent | a8f5a8b9190d4c72f46a38579f23f2f2acfb174a (diff) | |
| download | gtk+-bf0d8402f5382fadd32a9748d00a4bcd715ea07a.tar.gz | |
gtk: Use const instead G_CONST_RETURN
Diffstat (limited to 'gtk')
87 files changed, 219 insertions, 221 deletions
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 5692273e72..ae6c91865f 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1024,7 +1024,7 @@ gtk_about_dialog_show (GtkWidget *widget) * * Since: 2.12 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_program_name (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; @@ -1104,7 +1104,7 @@ gtk_about_dialog_set_program_name (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_version (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1152,7 +1152,7 @@ gtk_about_dialog_set_version (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_copyright (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1211,7 +1211,7 @@ gtk_about_dialog_set_copyright (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_comments (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1268,7 +1268,7 @@ gtk_about_dialog_set_comments (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_license (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1379,7 +1379,7 @@ gtk_about_dialog_set_wrap_license (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_website (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; @@ -1431,7 +1431,7 @@ gtk_about_dialog_set_website (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_website_label (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; @@ -1485,7 +1485,7 @@ gtk_about_dialog_set_website_label (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * G_CONST_RETURN * +const gchar * const * gtk_about_dialog_get_authors (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; @@ -1540,7 +1540,7 @@ gtk_about_dialog_set_authors (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * G_CONST_RETURN * +const gchar * const * gtk_about_dialog_get_documenters (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; @@ -1595,7 +1595,7 @@ gtk_about_dialog_set_documenters (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * G_CONST_RETURN * +const gchar * const * gtk_about_dialog_get_artists (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; @@ -1649,7 +1649,7 @@ gtk_about_dialog_set_artists (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_translator_credits (GtkAboutDialog *about) { g_return_val_if_fail (GTK_IS_ABOUT_DIALOG (about), NULL); @@ -1805,7 +1805,7 @@ gtk_about_dialog_set_logo (GtkAboutDialog *about, * * Since: 2.6 */ -G_CONST_RETURN gchar * +const gchar * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about) { GtkAboutDialogPrivate *priv; diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h index 42eba5861d..68c24d7b40 100644 --- a/gtk/gtkaboutdialog.h +++ b/gtk/gtkaboutdialog.h @@ -112,19 +112,19 @@ GtkWidget *gtk_about_dialog_new (void); void gtk_show_about_dialog (GtkWindow *parent, const gchar *first_property_name, ...) G_GNUC_NULL_TERMINATED; -G_CONST_RETURN gchar *gtk_about_dialog_get_program_name (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_program_name (GtkAboutDialog *about); void gtk_about_dialog_set_program_name (GtkAboutDialog *about, const gchar *name); -G_CONST_RETURN gchar *gtk_about_dialog_get_version (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_version (GtkAboutDialog *about); void gtk_about_dialog_set_version (GtkAboutDialog *about, const gchar *version); -G_CONST_RETURN gchar *gtk_about_dialog_get_copyright (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_copyright (GtkAboutDialog *about); void gtk_about_dialog_set_copyright (GtkAboutDialog *about, const gchar *copyright); -G_CONST_RETURN gchar *gtk_about_dialog_get_comments (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_comments (GtkAboutDialog *about); void gtk_about_dialog_set_comments (GtkAboutDialog *about, const gchar *comments); -G_CONST_RETURN gchar *gtk_about_dialog_get_license (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_license (GtkAboutDialog *about); void gtk_about_dialog_set_license (GtkAboutDialog *about, const gchar *license); void gtk_about_dialog_set_license_type (GtkAboutDialog *about, @@ -135,28 +135,28 @@ gboolean gtk_about_dialog_get_wrap_license (GtkAboutDialog void gtk_about_dialog_set_wrap_license (GtkAboutDialog *about, gboolean wrap_license); -G_CONST_RETURN gchar *gtk_about_dialog_get_website (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_website (GtkAboutDialog *about); void gtk_about_dialog_set_website (GtkAboutDialog *about, const gchar *website); -G_CONST_RETURN gchar *gtk_about_dialog_get_website_label (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_website_label (GtkAboutDialog *about); void gtk_about_dialog_set_website_label (GtkAboutDialog *about, const gchar *website_label); -G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_authors (GtkAboutDialog *about); +const gchar* const * gtk_about_dialog_get_authors (GtkAboutDialog *about); void gtk_about_dialog_set_authors (GtkAboutDialog *about, const gchar **authors); -G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_documenters (GtkAboutDialog *about); +const gchar* const * gtk_about_dialog_get_documenters (GtkAboutDialog *about); void gtk_about_dialog_set_documenters (GtkAboutDialog *about, const gchar **documenters); -G_CONST_RETURN gchar* G_CONST_RETURN * gtk_about_dialog_get_artists (GtkAboutDialog *about); +const gchar* const * gtk_about_dialog_get_artists (GtkAboutDialog *about); void gtk_about_dialog_set_artists (GtkAboutDialog *about, const gchar **artists); -G_CONST_RETURN gchar *gtk_about_dialog_get_translator_credits (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_translator_credits (GtkAboutDialog *about); void gtk_about_dialog_set_translator_credits (GtkAboutDialog *about, const gchar *translator_credits); GdkPixbuf *gtk_about_dialog_get_logo (GtkAboutDialog *about); void gtk_about_dialog_set_logo (GtkAboutDialog *about, GdkPixbuf *logo); -G_CONST_RETURN gchar *gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about); +const gchar * gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about); void gtk_about_dialog_set_logo_icon_name (GtkAboutDialog *about, const gchar *icon_name); diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index 45a93a0ccf..b1e4957609 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -995,7 +995,7 @@ gtk_action_get_proxies (GtkAction *action) * * Since: 2.4 **/ -G_CONST_RETURN gchar * +const gchar * gtk_action_get_name (GtkAction *action) { g_return_val_if_fail (GTK_IS_ACTION (action), NULL); @@ -1292,7 +1292,7 @@ gtk_action_set_label (GtkAction *action, * * Since: 2.16 */ -G_CONST_RETURN gchar * +const gchar * gtk_action_get_label (GtkAction *action) { g_return_val_if_fail (GTK_IS_ACTION (action), NULL); @@ -1338,7 +1338,7 @@ gtk_action_set_short_label (GtkAction *action, * * Since: 2.16 */ -G_CONST_RETURN gchar * +const gchar * gtk_action_get_short_label (GtkAction *action) { g_return_val_if_fail (GTK_IS_ACTION (action), NULL); @@ -1470,7 +1470,7 @@ gtk_action_set_tooltip (GtkAction *action, * * Since: 2.16 */ -G_CONST_RETURN gchar * +const gchar * gtk_action_get_tooltip (GtkAction *action) { g_return_val_if_fail (GTK_IS_ACTION (action), NULL); @@ -1528,7 +1528,7 @@ gtk_action_set_stock_id (GtkAction *action, * * Since: 2.16 */ -G_CONST_RETURN gchar * +const gchar * gtk_action_get_stock_id (GtkAction *action) { g_return_val_if_fail (GTK_IS_ACTION (action), NULL); @@ -1570,7 +1570,7 @@ gtk_action_set_icon_name (GtkAction *action, * * Since: 2.16 */ -G_CONST_RETURN gchar * +const gchar * gtk_action_get_icon_name (GtkAction *action) { g_return_val_if_fail (GTK_IS_ACTION (action), NULL); @@ -1687,7 +1687,7 @@ gtk_action_set_accel_path (GtkAction *action, * if none is set. The returned string is owned by GTK+ * and must not be freed or modified. */ -G_CONST_RETURN gchar * +const gchar * gtk_action_get_accel_path (GtkAction *action) { g_return_val_if_fail (GTK_IS_ACTION (action), NULL); diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h index c1212f2fd1..f60173ea89 100644 --- a/gtk/gtkaction.h +++ b/gtk/gtkaction.h @@ -90,7 +90,7 @@ GtkAction *gtk_action_new (const gchar *name, const gchar *label, const gchar *tooltip, const gchar *stock_id); -G_CONST_RETURN gchar* gtk_action_get_name (GtkAction *action); +const gchar* gtk_action_get_name (GtkAction *action); gboolean gtk_action_is_sensitive (GtkAction *action); gboolean gtk_action_get_sensitive (GtkAction *action); void gtk_action_set_sensitive (GtkAction *action, @@ -108,7 +108,7 @@ GtkWidget * gtk_action_create_menu (GtkAction *action); GSList * gtk_action_get_proxies (GtkAction *action); void gtk_action_connect_accelerator (GtkAction *action); void gtk_action_disconnect_accelerator (GtkAction *action); -G_CONST_RETURN gchar *gtk_action_get_accel_path (GtkAction *action); +const gchar *gtk_action_get_accel_path (GtkAction *action); GClosure *gtk_action_get_accel_closure (GtkAction *action); void gtk_action_block_activate (GtkAction *action); void gtk_action_unblock_activate (GtkAction *action); @@ -133,22 +133,22 @@ void _gtk_action_sync_menu_visible (GtkAction *action, void gtk_action_set_label (GtkAction *action, const gchar *label); -G_CONST_RETURN gchar *gtk_action_get_label (GtkAction *action); +const gchar * gtk_action_get_label (GtkAction *action); void gtk_action_set_short_label (GtkAction *action, const gchar *short_label); -G_CONST_RETURN gchar *gtk_action_get_short_label (GtkAction *action); +const gchar * gtk_action_get_short_label (GtkAction *action); void gtk_action_set_tooltip (GtkAction *action, const gchar *tooltip); -G_CONST_RETURN gchar *gtk_action_get_tooltip (GtkAction *action); +const gchar * gtk_action_get_tooltip (GtkAction *action); void gtk_action_set_stock_id (GtkAction *action, const gchar *stock_id); -G_CONST_RETURN gchar *gtk_action_get_stock_id (GtkAction *action); +const gchar * gtk_action_get_stock_id (GtkAction *action); void gtk_action_set_gicon (GtkAction *action, GIcon *icon); GIcon *gtk_action_get_gicon (GtkAction *action); void gtk_action_set_icon_name (GtkAction *action, const gchar *icon_name); -G_CONST_RETURN gchar *gtk_action_get_icon_name (GtkAction *action); +const gchar * gtk_action_get_icon_name (GtkAction *action); void gtk_action_set_visible_horizontal (GtkAction *action, gboolean visible_horizontal); gboolean gtk_action_get_visible_horizontal (GtkAction *action); diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index a3d1f5bc90..cb16e44f0e 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -645,7 +645,7 @@ gtk_action_group_real_get_action (GtkActionGroup *self, * * Since: 2.4 */ -G_CONST_RETURN gchar * +const gchar * gtk_action_group_get_name (GtkActionGroup *action_group) { GtkActionGroupPrivate *private; @@ -1442,7 +1442,7 @@ gtk_action_group_set_translation_domain (GtkActionGroup *action_group, * * Since: 2.6 **/ -G_CONST_RETURN gchar * +const gchar * gtk_action_group_translate_string (GtkActionGroup *action_group, const gchar *string) { diff --git a/gtk/gtkactiongroup.h b/gtk/gtkactiongroup.h index 33fa000dfa..aae24a8600 100644 --- a/gtk/gtkactiongroup.h +++ b/gtk/gtkactiongroup.h @@ -160,7 +160,7 @@ struct _GtkRadioActionEntry GType gtk_action_group_get_type (void) G_GNUC_CONST; GtkActionGroup *gtk_action_group_new (const gchar *name); -G_CONST_RETURN gchar *gtk_action_group_get_name (GtkActionGroup *action_group); +const gchar *gtk_action_group_get_name (GtkActionGroup *action_group); gboolean gtk_action_group_get_sensitive (GtkActionGroup *action_group); void gtk_action_group_set_sensitive (GtkActionGroup *action_group, gboolean sensitive); @@ -214,7 +214,7 @@ void gtk_action_group_set_translate_func (GtkActionGroup GDestroyNotify notify); void gtk_action_group_set_translation_domain (GtkActionGroup *action_group, const gchar *domain); -G_CONST_RETURN gchar *gtk_action_group_translate_string (GtkActionGroup *action_group, +const gchar * gtk_action_group_translate_string (GtkActionGroup *action_group, const gchar *string); /* Protected for use by GtkAction */ diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 6a466aac5b..69fc67e1d0 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -1793,7 +1793,7 @@ gtk_assistant_set_page_title (GtkAssistant *assistant, * * Since: 2.10 */ -G_CONST_RETURN gchar* +const gchar* gtk_assistant_get_page_title (GtkAssistant *assistant, GtkWidget *page) { diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h index e380f835ae..b1483691ff 100644 --- a/gtk/gtkassistant.h +++ b/gtk/gtkassistant.h @@ -151,7 +151,7 @@ GtkAssistantPageType gtk_assistant_get_page_type (GtkAssistant void gtk_assistant_set_page_title (GtkAssistant *assistant, GtkWidget *page, const gchar *title); -G_CONST_RETURN gchar *gtk_assistant_get_page_title (GtkAssistant *assistant, +const gchar * gtk_assistant_get_page_title (GtkAssistant *assistant, GtkWidget *page); #if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION) diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index c5ea7ed20e..3072635094 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -2032,7 +2032,7 @@ gtk_button_set_label (GtkButton *button, * Return value: The text of the label widget. This string is owned * by the widget and must not be modified or freed. **/ -G_CONST_RETURN gchar * +const gchar * gtk_button_get_label (GtkButton *button) { g_return_val_if_fail (GTK_IS_BUTTON (button), NULL); diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index a373291b61..997342edc9 100644 --- a/gtk/gtkbutton.h +++ b/gtk/gtkbutton.h @@ -96,7 +96,7 @@ void gtk_button_set_relief (GtkButton *button, GtkReliefStyle gtk_button_get_relief (GtkButton *button); void gtk_button_set_label (GtkButton *button, const gchar *label); -G_CONST_RETURN gchar *gtk_button_get_label (GtkButton *button); +const gchar * gtk_button_get_label (GtkButton *button); void gtk_button_set_use_underline (GtkButton *button, gboolean use_underline); gboolean gtk_button_get_use_underline (GtkButton *button); diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c index 0af3c53df5..099c4e58b6 100644 --- a/gtk/gtkcellarea.c +++ b/gtk/gtkcellarea.c @@ -2376,7 +2376,7 @@ gtk_cell_area_apply_attributes (GtkCellArea *area, * * Since: 3.0 */ -G_CONST_RETURN gchar * +const gchar * gtk_cell_area_get_current_path_string (GtkCellArea *area) { GtkCellAreaPrivate *priv; diff --git a/gtk/gtkcellarea.h b/gtk/gtkcellarea.h index e2066054a8..7ae49a43f5 100644 --- a/gtk/gtkcellarea.h +++ b/gtk/gtkcellarea.h @@ -353,7 +353,7 @@ void gtk_cell_area_get_preferred_width_for_height (GtkCellArea gint height, gint *minimum_width, gint *natural_width); -G_CONST_RETURN gchar *gtk_cell_area_get_current_path_string (GtkCellArea *area); +const gchar * gtk_cell_area_get_current_path_string (GtkCellArea *area); /* Attributes */ @@ -432,7 +432,7 @@ void gtk_cell_area_remove_focus_sibling (GtkCellArea gboolean gtk_cell_area_is_focus_sibling (GtkCellArea *area, GtkCellRenderer *renderer, GtkCellRenderer *sibling); -G_CONST_RETURN GList *gtk_cell_area_get_focus_siblings (GtkCellArea *area, +const GList * gtk_cell_area_get_focus_siblings (GtkCellArea *area, GtkCellRenderer *renderer); GtkCellRenderer *gtk_cell_area_get_focus_from_sibling (GtkCellArea *area, GtkCellRenderer *renderer); diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 472efddb6c..5f13c54606 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -897,7 +897,7 @@ gtk_color_button_set_title (GtkColorButton *color_button, * * Since: 2.4 */ -G_CONST_RETURN gchar * +const gchar * gtk_color_button_get_title (GtkColorButton *color_button) { g_return_val_if_fail (GTK_IS_COLOR_BUTTON (color_button), NULL); diff --git a/gtk/gtkcolorbutton.h b/gtk/gtkcolorbutton.h index 98e7e8cf20..7e1aae1a95 100644 --- a/gtk/gtkcolorbutton.h +++ b/gtk/gtkcolorbutton.h @@ -93,7 +93,7 @@ void gtk_color_button_get_rgba (GtkColorButton *color_button, GdkRGBA *rgba); void gtk_color_button_set_title (GtkColorButton *color_button, const gchar *title); -G_CONST_RETURN gchar *gtk_color_button_get_title (GtkColorButton *color_button); +const gchar *gtk_color_button_get_title (GtkColorButton *color_button); G_END_DECLS diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index b123de8764..8a74f8f1a6 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -4835,7 +4835,7 @@ gtk_combo_box_set_add_tearoffs (GtkComboBox *combo_box, * * Since: 2.10 */ -G_CONST_RETURN gchar* +const gchar* gtk_combo_box_get_title (GtkComboBox *combo_box) { g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL); diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h index 6156659c97..776d1b74be 100644 --- a/gtk/gtkcombobox.h +++ b/gtk/gtkcombobox.h @@ -88,8 +88,8 @@ gboolean gtk_combo_box_get_add_tearoffs (GtkComboBox *combo_box); void gtk_combo_box_set_add_tearoffs (GtkComboBox *combo_box, gboolean add_tearoffs); -G_CONST_RETURN gchar *gtk_combo_box_get_title (GtkComboBox *combo_box); -void gtk_combo_box_set_title (GtkComboBox *combo_box, +const gchar * gtk_combo_box_get_title (GtkComboBox *combo_box); +void gtk_combo_box_set_title (GtkComboBox *combo_box, const gchar *title); gboolean gtk_combo_box_get_focus_on_click (GtkComboBox *combo); diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 677de09dfc..0e2d931b30 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -7271,7 +7271,7 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry) * storage in the widget and must not be freed, modified or * stored. **/ -G_CONST_RETURN gchar* +const gchar* gtk_entry_get_text (GtkEntry *entry) { g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); @@ -7536,7 +7536,7 @@ gtk_entry_set_inner_border (GtkEntry *entry, * * Since: 2.10 **/ -G_CONST_RETURN GtkBorder * +const GtkBorder * gtk_entry_get_inner_border (GtkEntry *entry) { g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL); @@ -10354,7 +10354,7 @@ gtk_entry_set_placeholder_text (GtkEntry *entry, * * Since: 3.2 **/ -G_CONST_RETURN gchar * +const gchar * gtk_entry_get_placeholder_text (GtkEntry *entry) { GtkEntryPrivate *priv; diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 2bca501592..605d293962 100644 --- a/gtk/gtkentry.h +++ b/gtk/gtkentry.h @@ -149,9 +149,9 @@ void gtk_entry_set_has_frame (GtkEntry *entry, gboolean setting); gboolean gtk_entry_get_has_frame (GtkEntry *entry); -void gtk_entry_set_inner_border (GtkEntry *entry, - const GtkBorder *border); -G_CONST_RETURN GtkBorder* gtk_entry_get_inner_border (GtkEntry *entry); +void gtk_entry_set_inner_border (GtkEntry *entry, + const GtkBorder *border); +const GtkBorder* gtk_entry_get_inner_border (GtkEntry *entry); void gtk_entry_set_overwrite_mode (GtkEntry *entry, gboolean overwrite); @@ -176,7 +176,7 @@ gint gtk_entry_get_width_chars (GtkEntry *entry); void gtk_entry_set_text (GtkEntry *entry, const gchar *text); /* returns a reference to the text */ -G_CONST_RETURN gchar* gtk_entry_get_text (GtkEntry *entry); +const gchar* gtk_entry_get_text (GtkEntry *entry); PangoLayout* gtk_entry_get_layout (GtkEntry *entry); void gtk_entry_get_layout_offsets (GtkEntry *entry, @@ -213,10 +213,10 @@ gdouble gtk_entry_get_progress_pulse_step (GtkEntry *entry); void gtk_entry_progress_pulse (GtkEntry *entry); -G_CONST_RETURN gchar* gtk_entry_get_placeholder_text (GtkEntry *entry); +const gchar* gtk_entry_get_placeholder_text (GtkEntry *entry); -void gtk_entry_set_placeholder_text (GtkEntry *entry, - const gchar *text); +void gtk_entry_set_placeholder_text (GtkEntry *entry, + const gchar *text); /* Setting and managing icons */ void gtk_entry_set_icon_from_pixbuf (GtkEntry *entry, diff --git a/gtk/gtkentrybuffer.c b/gtk/gtkentrybuffer.c index bd05b8275e..5968a1a68d 100644 --- a/gtk/gtkentrybuffer.c +++ b/gtk/gtkentrybuffer.c @@ -519,7 +519,7 @@ gtk_entry_buffer_get_bytes (GtkEntryBuffer *buffer) * * Since: 2.18 **/ -G_CONST_RETURN gchar* +const gchar* gtk_entry_buffer_get_text (GtkEntryBuffer *buffer) { GtkEntryBufferClass *klass; diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h index 00e24c32bd..2378c68756 100644 --- a/gtk/gtkentrybuffer.h +++ b/gtk/gtkentrybuffer.h @@ -101,7 +101,7 @@ gsize gtk_entry_buffer_get_bytes (GtkEntryBuffe guint gtk_entry_buffer_get_length (GtkEntryBuffer *buffer); -G_CONST_RETURN gchar* gtk_entry_buffer_get_text (GtkEntryBuffer *buffer); +const gchar* gtk_entry_buffer_get_text (GtkEntryBuffer *buffer); void gtk_entry_buffer_set_text (GtkEntryBuffer *buffer, const gchar *chars, diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c index 2bfc6c8796..2c33a1ac15 100644 --- a/gtk/gtkexpander.c +++ b/gtk/gtkexpander.c @@ -1864,7 +1864,7 @@ gtk_expander_set_label (GtkExpander *expander, * * Since: 2.4 */ -G_CONST_RETURN char * +const char * gtk_expander_get_label (GtkExpander *expander) { GtkExpanderPrivate *priv; diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h index 4a1b813d85..c88be57c5b 100644 --- a/gtk/gtkexpander.h +++ b/gtk/gtkexpander.h @@ -82,7 +82,7 @@ gint gtk_expander_get_spacing (GtkExpander *expander); void gtk_expander_set_label (GtkExpander *expander, const gchar *label); -G_CONST_RETURN gchar *gtk_expander_get_label (GtkExpander *expander); +const gchar * gtk_expander_get_label (GtkExpander *expander); void gtk_expander_set_use_underline (GtkExpander *expander, gboolean use_underline); diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index f3ede0cf83..2abc11304f 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -2822,7 +2822,7 @@ gtk_file_chooser_button_set_title (GtkFileChooserButton *button, * * Since: 2.6 **/ -G_CONST_RETURN gchar * +const gchar * 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 fb0cee19dc..7742c98b0c 100644 --- a/gtk/gtkfilechooserbutton.h +++ b/gtk/gtkfilechooserbutton.h @@ -68,7 +68,7 @@ GType gtk_file_chooser_button_get_type (void) G_GNUC_CON GtkWidget * gtk_file_chooser_button_new (const gchar *title, GtkFileChooserAction action); GtkWidget * gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog); -G_CONST_RETURN gchar *gtk_file_chooser_button_get_title (GtkFileChooserButton *button); +const gchar * gtk_file_chooser_button_get_title (GtkFileChooserButton *button); void gtk_file_chooser_button_set_title (GtkFileChooserButton *button, const gchar *title); gint gtk_file_chooser_button_get_width_chars (GtkFileChooserButton *button); diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c index 5754979f7f..4fdc624633 100644 --- a/gtk/gtkfilefilter.c +++ b/gtk/gtkfilefilter.c @@ -404,7 +404,7 @@ gtk_file_filter_set_name (GtkFileFilter *filter, * * Since: 2.4 **/ -G_CONST_RETURN gchar * +const gchar * gtk_file_filter_get_name (GtkFileFilter *filter) { g_return_val_if_fail (GTK_IS_FILE_FILTER (filter), NULL); diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h index 02e277557d..c723199f4a 100644 --- a/gtk/gtkfilefilter.h +++ b/gtk/gtkfilefilter.h @@ -96,7 +96,7 @@ GType gtk_file_filter_get_type (void) G_GNUC_CONST; GtkFileFilter * gtk_file_filter_new (void); void gtk_file_filter_set_name (GtkFileFilter *filter, const gchar *name); -G_CONST_RETURN gchar *gtk_file_filter_get_name (GtkFileFilter *filter); +const gchar * gtk_file_filter_get_name (GtkFileFilter *filter); void gtk_file_filter_add_mime_type (GtkFileFilter *filter, const gchar *mime_type); diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index e3ba766c04..a1b1e13200 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -438,7 +438,7 @@ gtk_font_button_set_title (GtkFontButton *font_button, * * Since: 2.4 */ -G_CONST_RETURN gchar* +const gchar* gtk_font_button_get_title (GtkFontButton *font_button) { g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL); @@ -650,7 +650,7 @@ gtk_font_button_set_show_size (GtkFontButton *font_button, * * Since: 2.4 */ -G_CONST_RETURN gchar * +const gchar * gtk_font_button_get_font_name (GtkFontButton *font_button) { g_return_val_if_fail (GTK_IS_FONT_BUTTON (font_button), NULL); diff --git a/gtk/gtkfontbutton.h b/gtk/gtkfontbutton.h index bc64767d8d..79d60457ad 100644 --- a/gtk/gtkfontbutton.h +++ b/gtk/gtkfontbutton.h @@ -75,7 +75,7 @@ GType gtk_font_button_get_type (void) G_GNUC_CONST; GtkWidget *gtk_font_button_new (void); GtkWidget *gtk_font_button_new_with_font (const gchar *fontname); -G_CONST_RETURN gchar *gtk_font_button_get_title (GtkFontButton *font_button); +const gchar * gtk_font_button_get_title (GtkFontButton *font_button); void gtk_font_button_set_title (GtkFontButton *font_button, const gchar *title); gboolean gtk_font_button_get_use_font (GtkFontButton *font_button); @@ -84,7 +84,7 @@ void gtk_font_button_set_use_font (GtkFontButton *font_button gboolean gtk_font_button_get_use_size (GtkFontButton *font_button); void gtk_font_button_set_use_size (GtkFontButton *font_button, gboolean use_size); -G_CONST_RETURN gchar* gtk_font_button_get_font_name (GtkFontButton *font_button); +const gchar * gtk_font_button_get_font_name (GtkFontButton *font_button); gboolean gtk_font_button_set_font_name (GtkFontButton *font_button, const gchar *fontname); gboolean gtk_font_button_get_show_style (GtkFontButton *font_button); diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 7885899752..4beed4c2ce 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -1563,7 +1563,7 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel, * This string is owned by the widget and should not be * modified or freed */ -G_CONST_RETURN gchar* +const gchar* gtk_font_selection_get_preview_text (GtkFontSelection *fontsel) { GtkFontSelectionPrivate *priv; @@ -1868,7 +1868,7 @@ gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog *fsd, * This string is owned by the widget and should not be * modified or freed */ -G_CONST_RETURN gchar* +const gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd) { GtkFontSelectionDialogPrivate *priv; diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 1bf2907847..f9e60f8e52 100644 --- a/gtk/gtkfontsel.h +++ b/gtk/gtkfontsel.h @@ -161,7 +161,7 @@ gboolean gtk_font_selection_dialog_set_font_name (GtkFontSelectionDialog * /* This returns the text in the preview entry. You should copy the returned text if you need it. */ -G_CONST_RETURN gchar* +const gchar* gtk_font_selection_dialog_get_preview_text (GtkFontSelectionDialog *fsd); /* This sets the text in the preview entry. It will be copied by the entry, diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c index f0a42ed953..f63de8091e 100644 --- a/gtk/gtkframe.c +++ b/gtk/gtkframe.c @@ -432,7 +432,7 @@ gtk_frame_set_label (GtkFrame *frame, * a #GtkLabel. This string is owned by GTK+ and * must not be modified or freed. **/ -G_CONST_RETURN gchar * +const gchar * gtk_frame_get_label (GtkFrame *frame) { GtkFramePrivate *priv; diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h index d8485f109a..04b06006e7 100644 --- a/gtk/gtkframe.h +++ b/gtk/gtkframe.h @@ -74,9 +74,9 @@ struct _GtkFrameClass GType gtk_frame_get_type (void) G_GNUC_CONST; GtkWidget* gtk_frame_new (const gchar *label); -void gtk_frame_set_label (GtkFrame *frame, - const gchar *label); -G_CONST_RETURN gchar *gtk_frame_get_label (GtkFrame *frame); +void gtk_frame_set_label (GtkFrame *frame, + const gchar *label); +const gchar * gtk_frame_get_label (GtkFrame *frame); void gtk_frame_set_label_widget (GtkFrame *frame, GtkWidget *label_widget); diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index 2d5902c622..c17feef5d9 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -1171,7 +1171,7 @@ gtk_icon_size_from_name (const gchar *name) * Gets the canonical name of the given icon size. The returned string * is statically allocated and should not be freed. */ -G_CONST_RETURN gchar* +const gchar* gtk_icon_size_get_name (GtkIconSize size) { if (size >= icon_sizes_used) @@ -2210,7 +2210,7 @@ gtk_icon_source_set_pixbuf (GtkIconSource *source, * Return value: (type filename): image filename. This string must not * be modified or freed. */ -G_CONST_RETURN gchar* +const gchar* gtk_icon_source_get_filename (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, NULL); @@ -2231,7 +2231,7 @@ gtk_icon_source_get_filename (const GtkIconSource *source) * * Return value: icon name. This string must not be modified or freed. */ -G_CONST_RETURN gchar* +const gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source) { g_return_val_if_fail (source != NULL, NULL); diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 1faf7b73cd..17b0c92651 100644 --- a/gtk/gtkiconfactory.h +++ b/gtk/gtkiconfactory.h @@ -109,7 +109,7 @@ GtkIconSize gtk_icon_size_register (const gchar *name, void gtk_icon_size_register_alias (const gchar *alias, GtkIconSize target); GtkIconSize gtk_icon_size_from_name (const gchar *name); -G_CONST_RETURN gchar* gtk_icon_size_get_name (GtkIconSize size); +const gchar* gtk_icon_size_get_name (GtkIconSize size); /* Icon sets */ @@ -153,9 +153,9 @@ void gtk_icon_source_set_icon_name (GtkIconSource *so void gtk_icon_source_set_pixbuf (GtkIconSource *source, GdkPixbuf *pixbuf); -G_CONST_RETURN gchar* gtk_icon_source_get_filename (const GtkIconSource *source); -G_CONST_RETURN gchar* gtk_icon_source_get_icon_name (const GtkIconSource *source); -GdkPixbuf* gtk_icon_source_get_pixbuf (const GtkIconSource *source); +const gchar * gtk_icon_source_get_filename (const GtkIconSource *source); +const gchar * gtk_icon_source_get_icon_name (const GtkIconSource *source); +GdkPixbuf* gtk_icon_source_get_pixbuf (const GtkIconSource *source); void gtk_icon_source_set_direction_wildcarded (GtkIconSource *source, gboolean setting); diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index ad55d02537..cdebec327a 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -2765,7 +2765,7 @@ gtk_icon_info_get_base_size (GtkIconInfo *icon_info) * * Since: 2.4 **/ -G_CONST_RETURN gchar * +const gchar * gtk_icon_info_get_filename (GtkIconInfo *icon_info) { g_return_val_if_fail (icon_info != NULL, NULL); @@ -3641,7 +3641,7 @@ gtk_icon_info_get_attach_points (GtkIconInfo *icon_info, * * Since: 2.4 **/ -G_CONST_RETURN gchar * +const gchar * gtk_icon_info_get_display_name (GtkIconInfo *icon_info) { g_return_val_if_fail (icon_info != NULL, NULL); diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h index 6d3ea2d266..43363a11b4 100644 --- a/gtk/gtkicontheme.h +++ b/gtk/gtkicontheme.h @@ -196,7 +196,7 @@ GtkIconInfo * gtk_icon_info_new_for_pixbuf (GtkIconTheme *icon_them GdkPixbuf *pixbuf); gint gtk_icon_info_get_base_size (GtkIconInfo *icon_info); -G_CONST_RETURN gchar *gtk_icon_info_get_filename (GtkIconInfo *icon_info); +const gchar * gtk_icon_info_get_filename (GtkIconInfo *icon_info); GdkPixbuf * gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info); GdkPixbuf * gtk_icon_info_load_icon (GtkIconInfo *icon_info, GError **error); @@ -226,7 +226,7 @@ gboolean gtk_icon_info_get_embedded_rect (GtkIconInfo *icon_info gboolean gtk_icon_info_get_attach_points (GtkIconInfo *icon_info, GdkPoint **points, gint *n_points); -G_CONST_RETURN gchar *gtk_icon_info_get_display_name (GtkIconInfo *icon_info); +const gchar * gtk_icon_info_get_display_name (GtkIconInfo *icon_info); /* Non-public methods */ void _gtk_icon_theme_check_reload (GdkDisplay *display); diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 1c9c0a3d07..821f98c838 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -1258,9 +1258,9 @@ gtk_image_get_animation (GtkImage *image) * Since: 2.6 **/ void -gtk_image_get_icon_name (GtkImage *image, - G_CONST_RETURN gchar **icon_name, - GtkIconSize *size) +gtk_image_get_icon_name (GtkImage *image, + const gchar **icon_name, + GtkIconSize *size) { GtkImagePrivate *priv; diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index bdd74e7058..ec8d243f94 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -154,9 +154,9 @@ void gtk_image_get_icon_set (GtkImage *image, GtkIconSet **icon_set, GtkIconSize *size); GdkPixbufAnimation* gtk_image_get_animation (GtkImage *image); -void gtk_image_get_icon_name (GtkImage *image, - G_CONST_RETURN gchar **icon_name, - GtkIconSize *size); +void gtk_image_get_icon_name (GtkImage *image, + const gchar **icon_name, + GtkIconSize *size); void gtk_image_get_gicon (GtkImage *image, GIcon **gicon, GtkIconSize *size); diff --git a/gtk/gtkimagemenuitem.c b/gtk/gtkimagemenuitem.c index 69fea65bba..480df828ea 100644 --- a/gtk/gtkimagemenuitem.c +++ b/gtk/gtkimagemenuitem.c @@ -93,7 +93,7 @@ static void gtk_image_menu_item_toggle_size_request (GtkMenuItem *menu_ite gint *requisition); static void gtk_image_menu_item_set_label (GtkMenuItem *menu_item, const gchar *label); -static G_CONST_RETURN gchar *gtk_image_menu_item_get_label (GtkMenuItem *menu_item); +static const gchar * gtk_image_menu_item_get_label (GtkMenuItem *menu_item); static void gtk_image_menu_item_forall (GtkContainer *container, gboolean include_internals, @@ -424,7 +424,7 @@ gtk_image_menu_item_set_label (GtkMenuItem *menu_item, } } -static G_CONST_RETURN gchar * +static const gchar * gtk_image_menu_item_get_label (GtkMenuItem *menu_item) { GtkImageMenuItemPrivate *priv = GTK_IMAGE_MENU_ITEM (menu_item)->priv; diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 71a61558b2..685429d9be 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2265,7 +2265,7 @@ gtk_label_set_label (GtkLabel *label, * Return value: the text of the label widget. This string is * owned by the widget and must not be modified or freed. **/ -G_CONST_RETURN gchar * +const gchar * gtk_label_get_label (GtkLabel *label) { g_return_val_if_fail (GTK_IS_LABEL (label), NULL); @@ -2730,7 +2730,7 @@ gtk_label_set_markup_with_mnemonic (GtkLabel *label, * Return value: the text in the label widget. This is the internal * string used by the label, and must not be modified. **/ -G_CONST_RETURN gchar * +const gchar * gtk_label_get_text (GtkLabel *label) { g_return_val_if_fail (GTK_IS_LABEL (label), NULL); @@ -6531,7 +6531,7 @@ gtk_label_get_current_link (GtkLabel *label) * * Since: 2.18 */ -G_CONST_RETURN gchar * +const gchar * gtk_label_get_current_uri (GtkLabel *label) { GtkLabelLink *link; diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 9085005a15..f22c84df79 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -93,13 +93,13 @@ GtkWidget* gtk_label_new (const gchar *str); GtkWidget* gtk_label_new_with_mnemonic (const gchar *str); void gtk_label_set_text (GtkLabel *label, const gchar *str); -G_CONST_RETURN gchar* gtk_label_get_text (GtkLabel *label); +const gchar* gtk_label_get_text (GtkLabel *label); void gtk_label_set_attributes (GtkLabel *label, PangoAttrList *attrs); PangoAttrList *gtk_label_get_attributes (GtkLabel *label); void gtk_label_set_label (GtkLabel *label, const gchar *str); -G_CONST_RETURN gchar *gtk_label_get_label (GtkLabel *label); +const gchar * gtk_label_get_label (GtkLabel *label); void gtk_label_set_markup (GtkLabel *label, const gchar *str); void gtk_label_set_use_markup (GtkLabel *label, @@ -159,7 +159,7 @@ void gtk_label_set_single_line_mode (GtkLabel *label, gboolean single_line_mode); gboolean gtk_label_get_single_line_mode (GtkLabel *label); -G_CONST_RETURN gchar *gtk_label_get_current_uri (GtkLabel *label); +const gchar *gtk_label_get_current_uri (GtkLabel *label); void gtk_label_set_track_visited_links (GtkLabel *label, gboolean track_links); gboolean gtk_label_get_track_visited_links (GtkLabel *label); diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c index 2c76adea76..b98972fe62 100644 --- a/gtk/gtklinkbutton.c +++ b/gtk/gtklinkbutton.c @@ -752,7 +752,7 @@ gtk_link_button_set_uri (GtkLinkButton *link_button, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * 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 06e361677d..1f74477bef 100644 --- a/gtk/gtklinkbutton.h +++ b/gtk/gtklinkbutton.h @@ -87,7 +87,7 @@ GtkWidget * gtk_link_button_new (const gchar *uri); GtkWidget * gtk_link_button_new_with_label (const gchar *uri, const gchar *label); -G_CONST_RETURN gchar *gtk_link_button_get_uri (GtkLinkButton *link_button); +const gchar * gtk_link_button_get_uri (GtkLinkButton *link_button); void gtk_link_button_set_uri (GtkLinkButton *link_button, const gchar *uri); diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 5cf965b12c..3dbbc049b5 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2408,7 +2408,7 @@ gtk_menu_set_title (GtkMenu *menu, * has no title set on it. This string is owned by GTK+ * and should not be modified or freed. **/ -G_CONST_RETURN gchar * +const gchar * gtk_menu_get_title (GtkMenu *menu) { g_return_val_if_fail (GTK_IS_MENU (menu), NULL); diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index 5f49dfbb47..fb5e1970a2 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -182,9 +182,9 @@ gboolean gtk_menu_get_tearoff_state (GtkMenu *menu); /* This sets the window manager title for the window that * appears when a menu is torn off */ -void gtk_menu_set_title (GtkMenu *menu, - const gchar *title); -G_CONST_RETURN gchar *gtk_menu_get_title (GtkMenu *menu); +void gtk_menu_set_title (GtkMenu *menu, + const gchar *title); +const gchar * gtk_menu_get_title (GtkMenu *menu); void gtk_menu_reorder_child (GtkMenu *menu, GtkWidget *child, diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index ea19152c6c..1537e84713 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -155,7 +155,7 @@ static gboolean gtk_menu_item_can_activate_accel (GtkWidget *widget, static void gtk_real_menu_item_set_label (GtkMenuItem *menu_item, const gchar *label); -static G_CONST_RETURN gchar * gtk_real_menu_item_get_label (GtkMenuItem *menu_item); +static const gchar * gtk_real_menu_item_get_label (GtkMenuItem *menu_item); static void gtk_menu_item_get_preferred_width (GtkWidget *widget, gint *minimum_size, @@ -1893,7 +1893,7 @@ gtk_real_menu_item_set_label (GtkMenuItem *menu_item, } } -static G_CONST_RETURN gchar * +static const gchar * gtk_real_menu_item_get_label (GtkMenuItem *menu_item) { GtkWidget *child; @@ -2521,7 +2521,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item, * * Since: 2.14 */ -G_CONST_RETURN gchar * +const gchar * gtk_menu_item_get_accel_path (GtkMenuItem *menu_item) { g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL); @@ -2604,7 +2604,7 @@ gtk_menu_item_set_label (GtkMenuItem *menu_item, * * Since: 2.16 */ -G_CONST_RETURN gchar * +const gchar * gtk_menu_item_get_label (GtkMenuItem *menu_item) { g_return_val_if_fail (GTK_IS_MENU_ITEM (menu_item), NULL); diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index 26d86b7af8..50eb571088 100644 --- a/gtk/gtkmenuitem.h +++ b/gtk/gtkmenuitem.h @@ -76,7 +76,7 @@ struct _GtkMenuItemClass gint allocation); void (* set_label) (GtkMenuItem *menu_item, const gchar *label); - G_CONST_RETURN gchar *(* get_label) (GtkMenuItem *menu_item); + const gchar * (* get_label) (GtkMenuItem *menu_item); void (* select) (GtkMenuItem *menu_item); void (* deselect) (GtkMenuItem *menu_item); @@ -109,13 +109,13 @@ void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item, gboolean right_justified); gboolean gtk_menu_item_get_right_justified (GtkMenuItem *menu_item); #endif /* GTK_DISABLE_DEPRECATED */ -void gtk_menu_item_set_accel_path (GtkMenuItem *menu_item, +void gtk_menu_item_set_accel_path (GtkMenuItem *menu_item, const gchar *accel_path); -G_CONST_RETURN gchar* gtk_menu_item_get_accel_path (GtkMenuItem *menu_item); +const gchar * gtk_menu_item_get_accel_path (GtkMenuItem *menu_item); -void gtk_menu_item_set_label (GtkMenuItem *menu_item, +void gtk_menu_item_set_label (GtkMenuItem *menu_item, const gchar *label); -G_CONST_RETURN gchar *gtk_menu_item_get_label (GtkMenuItem *menu_item); +const gchar * gtk_menu_item_get_label (GtkMenuItem *menu_item); void gtk_menu_item_set_use_underline (GtkMenuItem *menu_item, gboolean setting); diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 8cb21a70db..7b44f82655 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -7665,7 +7665,7 @@ gtk_notebook_set_tab_label_text (GtkNotebook *notebook, * tab label widget is not a #GtkLabel. The string is owned * by the widget and must not be freed. */ -G_CONST_RETURN gchar * +const gchar * gtk_notebook_get_tab_label_text (GtkNotebook *notebook, GtkWidget *child) { @@ -7803,7 +7803,7 @@ gtk_notebook_set_menu_label_text (GtkNotebook *notebook, * menu label, or the menu label widget is not a #GtkLabel. * The string is owned by the widget and must not be freed. */ -G_CONST_RETURN gchar * +const gchar * gtk_notebook_get_menu_label_text (GtkNotebook *notebook, GtkWidget *child) { diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index d69d4f0835..9fe962e3dd 100644 --- a/gtk/gtknotebook.h +++ b/gtk/gtknotebook.h @@ -212,20 +212,20 @@ GtkWidget * gtk_notebook_get_tab_label (GtkNotebook *notebook, void gtk_notebook_set_tab_label (GtkNotebook *notebook, GtkWidget *child, GtkWidget *tab_label); -void gtk_notebook_set_tab_label_text (GtkNotebook *notebook, - GtkWidget *child, - const gchar *tab_text); -G_CONST_RETURN gchar *gtk_notebook_get_tab_label_text (GtkNotebook *notebook, - GtkWidget *child); +void gtk_notebook_set_tab_label_text (GtkNotebook *notebook, + GtkWidget *child, + const gchar *tab_text); +const gchar * gtk_notebook_get_tab_label_text (GtkNotebook *notebook, + GtkWidget *child); GtkWidget * gtk_notebook_get_menu_label (GtkNotebook *notebook, GtkWidget *child); void gtk_notebook_set_menu_label (GtkNotebook *notebook, GtkWidget *child, GtkWidget *menu_label); -void gtk_notebook_set_menu_label_text (GtkNotebook *notebook, - GtkWidget *child, - const gchar *menu_text); -G_CONST_RETURN gchar *gtk_notebook_get_menu_label_text (GtkNotebook *notebook, +void gtk_notebook_set_menu_label_text (GtkNotebook *notebook, + GtkWidget *child, + const gchar *menu_text); +const gchar * gtk_notebook_get_menu_label_text (GtkNotebook *notebook, GtkWidget *child); void gtk_notebook_reorder_child (GtkNotebook *notebook, GtkWidget *child, diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c index 23017eaf73..06852c0a05 100644 --- a/gtk/gtkpapersize.c +++ b/gtk/gtkpapersize.c @@ -516,7 +516,7 @@ gtk_paper_size_get_paper_sizes (gboolean include_custom) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_paper_size_get_name (GtkPaperSize *size) { if (size->name) @@ -535,7 +535,7 @@ gtk_paper_size_get_name (GtkPaperSize *size) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_paper_size_get_display_name (GtkPaperSize *size) { const gchar *display_name; @@ -560,7 +560,7 @@ gtk_paper_size_get_display_name (GtkPaperSize *size) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_paper_size_get_ppd_name (GtkPaperSize *size) { if (size->ppd_name) @@ -660,7 +660,7 @@ gtk_paper_size_set_size (GtkPaperSize *size, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_paper_size_get_default (void) { char *locale, *freeme = NULL; diff --git a/gtk/gtkpapersize.h b/gtk/gtkpapersize.h index 864eb3818e..0cdb8ae122 100644 --- a/gtk/gtkpapersize.h +++ b/gtk/gtkpapersize.h @@ -105,9 +105,9 @@ gboolean gtk_paper_size_is_equal (GtkPaperSize *size1, GList *gtk_paper_size_get_paper_sizes (gboolean include_custom); /* The width is always the shortest side, measure in mm */ -G_CONST_RETURN gchar *gtk_paper_size_get_name (GtkPaperSize *size); -G_CONST_RETURN gchar *gtk_paper_size_get_display_name (GtkPaperSize *size); -G_CONST_RETURN gchar *gtk_paper_size_get_ppd_name (GtkPaperSize *size); +const gchar *gtk_paper_size_get_name (GtkPaperSize *size); +const gchar *gtk_paper_size_get_display_name (GtkPaperSize *size); +const gchar *gtk_paper_size_get_ppd_name (GtkPaperSize *size); gdouble gtk_paper_size_get_width (GtkPaperSize *size, GtkUnit unit); gdouble gtk_paper_size_get_height (GtkPaperSize *size, GtkUnit unit); @@ -128,7 +128,7 @@ gdouble gtk_paper_size_get_default_left_margin (GtkPaperSize *size, gdouble gtk_paper_size_get_default_right_margin (GtkPaperSize *size, GtkUnit unit); -G_CONST_RETURN gchar *gtk_paper_size_get_default (void); +const gchar *gtk_paper_size_get_default (void); GtkPaperSize *gtk_paper_size_new_from_key_file (GKeyFile *key_file, const gchar *group_name, diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c index 95df2f0792..d6ac906371 100644 --- a/gtk/gtkprinter.c +++ b/gtk/gtkprinter.c @@ -436,7 +436,7 @@ gtk_printer_get_backend (GtkPrinter *printer) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_printer_get_name (GtkPrinter *printer) { g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL); @@ -454,7 +454,7 @@ gtk_printer_get_name (GtkPrinter *printer) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_printer_get_description (GtkPrinter *printer) { g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL); @@ -492,7 +492,7 @@ gtk_printer_set_description (GtkPrinter *printer, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_printer_get_state_message (GtkPrinter *printer) { g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL); @@ -530,7 +530,7 @@ gtk_printer_set_state_message (GtkPrinter *printer, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_printer_get_location (GtkPrinter *printer) { g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL); @@ -568,7 +568,7 @@ gtk_printer_set_location (GtkPrinter *printer, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_printer_get_icon_name (GtkPrinter *printer) { g_return_val_if_fail (GTK_IS_PRINTER (printer), NULL); diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h index a9e8736d1c..595db52305 100644 --- a/gtk/gtkprinter.h +++ b/gtk/gtkprinter.h @@ -117,11 +117,11 @@ GtkPrinter *gtk_printer_new (const gchar *nam GtkPrintBackend *backend, gboolean virtual_); GtkPrintBackend *gtk_printer_get_backend (GtkPrinter *printer); -G_CONST_RETURN gchar *gtk_printer_get_name (GtkPrinter *printer); -G_CONST_RETURN gchar *gtk_printer_get_state_message (GtkPrinter *printer); -G_CONST_RETURN gchar *gtk_printer_get_description (GtkPrinter *printer); -G_CONST_RETURN gchar *gtk_printer_get_location (GtkPrinter *printer); -G_CONST_RETURN gchar *gtk_printer_get_icon_name (GtkPrinter *printer); +const gchar * gtk_printer_get_name (GtkPrinter *printer); +const gchar * gtk_printer_get_state_message (GtkPrinter *printer); +const gchar * gtk_printer_get_description (GtkPrinter *printer); +const gchar * gtk_printer_get_location (GtkPrinter *printer); +const gchar * gtk_printer_get_icon_name (GtkPrinter *printer); gint gtk_printer_get_job_count (GtkPrinter *printer); gboolean gtk_printer_is_active (GtkPrinter *printer); gboolean gtk_printer_is_paused (GtkPrinter *printer); diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 58d339778d..bb9a2126f1 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -376,7 +376,7 @@ gtk_print_job_get_printer (GtkPrintJob *job) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_print_job_get_title (GtkPrintJob *job) { g_return_val_if_fail (GTK_IS_PRINT_JOB (job), NULL); diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index d09004a63f..3851e40eaa 100644 --- a/gtk/gtkprintjob.h +++ b/gtk/gtkprintjob.h @@ -85,7 +85,7 @@ GtkPrintJob *gtk_print_job_new (const gchar GtkPageSetup *page_setup); GtkPrintSettings *gtk_print_job_get_settings (GtkPrintJob *job); GtkPrinter *gtk_print_job_get_printer (GtkPrintJob *job); -G_CONST_RETURN gchar *gtk_print_job_get_title (GtkPrintJob *job); +const gchar * gtk_print_job_get_title (GtkPrintJob *job); GtkPrintStatus gtk_print_job_get_status (GtkPrintJob *job); gboolean gtk_print_job_set_source_file (GtkPrintJob *job, const gchar *filename, diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index ff95003570..ebc7ad4565 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -1833,7 +1833,7 @@ gtk_print_operation_get_status (GtkPrintOperation *op) * * Since: 2.10 **/ -G_CONST_RETURN gchar * +const gchar * gtk_print_operation_get_status_string (GtkPrintOperation *op) { g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), ""); diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h index c0ee030ec3..4d51e4d81c 100644 --- a/gtk/gtkprintoperation.h +++ b/gtk/gtkprintoperation.h @@ -236,7 +236,7 @@ GtkPrintOperationResult gtk_print_operation_run (GtkPrintOper void gtk_print_operation_get_error (GtkPrintOperation *op, GError **error); GtkPrintStatus gtk_print_operation_get_status (GtkPrintOperation *op); -G_CONST_RETURN gchar * gtk_print_operation_get_status_string (GtkPrintOperation *op); +const gchar * gtk_print_operation_get_status_string (GtkPrintOperation *op); gboolean gtk_print_operation_is_finished (GtkPrintOperation *op); void gtk_print_operation_cancel (GtkPrintOperation *op); void gtk_print_operation_draw_page_finish (GtkPrintOperation *op); diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c index cf60c9329d..4871a11654 100644 --- a/gtk/gtkprintsettings.c +++ b/gtk/gtkprintsettings.c @@ -169,7 +169,7 @@ gtk_print_settings_copy (GtkPrintSettings *other) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_print_settings_get (GtkPrintSettings *settings, const gchar *key) { @@ -524,7 +524,7 @@ gtk_print_settings_foreach (GtkPrintSettings *settings, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_print_settings_get_printer (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_PRINTER); @@ -1540,7 +1540,7 @@ gtk_print_settings_set_page_ranges (GtkPrintSettings *settings, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_print_settings_get_default_source (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DEFAULT_SOURCE); @@ -1575,7 +1575,7 @@ gtk_print_settings_set_default_source (GtkPrintSettings *settings, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_print_settings_get_media_type (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_MEDIA_TYPE); @@ -1610,7 +1610,7 @@ gtk_print_settings_set_media_type (GtkPrintSettings *settings, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_print_settings_get_dither (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_DITHER); @@ -1674,7 +1674,7 @@ gtk_print_settings_set_finishings (GtkPrintSettings *settings, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_print_settings_get_output_bin (GtkPrintSettings *settings) { return gtk_print_settings_get (settings, GTK_PRINT_SETTINGS_OUTPUT_BIN); diff --git a/gtk/gtkprintsettings.h b/gtk/gtkprintsettings.h index 02b6073466..af35f3b097 100644 --- a/gtk/gtkprintsettings.h +++ b/gtk/gtkprintsettings.h @@ -71,7 +71,7 @@ void gtk_print_settings_to_key_file (GtkPrintSettings const gchar *group_name); gboolean gtk_print_settings_has_key (GtkPrintSettings *settings, const gchar *key); -G_CONST_RETURN gchar *gtk_print_settings_get (GtkPrintSettings *settings, +const gchar * gtk_print_settings_get (GtkPrintSettings *settings, const gchar *key); void gtk_print_settings_set (GtkPrintSettings *settings, const gchar *key, @@ -159,7 +159,7 @@ void gtk_print_settings_set_int (GtkPrintSettings /* Helpers: */ -G_CONST_RETURN gchar *gtk_print_settings_get_printer (GtkPrintSettings *settings); +const gchar * gtk_print_settings_get_printer (GtkPrintSettings *settings); void gtk_print_settings_set_printer (GtkPrintSettings *settings, const gchar *printer); GtkPageOrientation gtk_print_settings_get_orientation (GtkPrintSettings *settings); @@ -227,19 +227,19 @@ void gtk_print_settings_set_page_ranges (GtkPrintSettings GtkPageSet gtk_print_settings_get_page_set (GtkPrintSettings *settings); void gtk_print_settings_set_page_set (GtkPrintSettings *settings, GtkPageSet page_set); -G_CONST_RETURN gchar *gtk_print_settings_get_default_source (GtkPrintSettings *settings); +const gchar * gtk_print_settings_get_default_source (GtkPrintSettings *settings); void gtk_print_settings_set_default_source (GtkPrintSettings *settings, const gchar *default_source); -G_CONST_RETURN gchar *gtk_print_settings_get_media_type (GtkPrintSettings *settings); +const gchar * gtk_print_settings_get_media_type (GtkPrintSettings *settings); void gtk_print_settings_set_media_type (GtkPrintSettings *settings, const gchar *media_type); -G_CONST_RETURN gchar *gtk_print_settings_get_dither (GtkPrintSettings *settings); +const gchar * gtk_print_settings_get_dither (GtkPrintSettings *settings); void gtk_print_settings_set_dither (GtkPrintSettings *settings, const gchar *dither); -G_CONST_RETURN gchar *gtk_print_settings_get_finishings (GtkPrintSettings *settings); +const gchar * gtk_print_settings_get_finishings (GtkPrintSettings *settings); void gtk_print_settings_set_finishings (GtkPrintSettings *settings, const gchar *finishings); -G_CONST_RETURN gchar *gtk_print_settings_get_output_bin (GtkPrintSettings *settings); +const gchar * gtk_print_settings_get_output_bin (GtkPrintSettings *settings); void gtk_print_settings_set_output_bin (GtkPrintSettings *settings, const gchar *output_bin); diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c index 46e9aa42b7..aa1f28dd0b 100644 --- a/gtk/gtkprogressbar.c +++ b/gtk/gtkprogressbar.c @@ -1245,7 +1245,7 @@ gtk_progress_bar_set_inverted (GtkProgressBar *pbar, * Return value: text, or %NULL; this string is owned by the widget * and should not be modified or freed. **/ -G_CONST_RETURN gchar* +const gchar* 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 be14b7c66e..b64181384a 100644 --- a/gtk/gtkprogressbar.h +++ b/gtk/gtkprogressbar.h @@ -81,9 +81,9 @@ void gtk_progress_bar_set_pulse_step (GtkProgressBar *pbar, void gtk_progress_bar_set_inverted (GtkProgressBar *pbar, gboolean inverted); -G_CONST_RETURN gchar* gtk_progress_bar_get_text (GtkProgressBar *pbar); -gdouble gtk_progress_bar_get_fraction (GtkProgressBar *pbar); -gdouble gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar); +const gchar * gtk_progress_bar_get_text (GtkProgressBar *pbar); +gdouble gtk_progress_bar_get_fraction (GtkProgressBar *pbar); +gdouble gtk_progress_bar_get_pulse_step (GtkProgressBar *pbar); gboolean gtk_progress_bar_get_inverted (GtkProgressBar *pbar); void gtk_progress_bar_set_ellipsize (GtkProgressBar *pbar, diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c index fbdc88c333..07a4a0a6b8 100644 --- a/gtk/gtkrecentfilter.c +++ b/gtk/gtkrecentfilter.c @@ -458,7 +458,7 @@ gtk_recent_filter_set_name (GtkRecentFilter *filter, * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_recent_filter_get_name (GtkRecentFilter *filter) { g_return_val_if_fail (GTK_IS_RECENT_FILTER (filter), NULL); diff --git a/gtk/gtkrecentfilter.h b/gtk/gtkrecentfilter.h index ad3fd09903..163fcc5b91 100644 --- a/gtk/gtkrecentfilter.h +++ b/gtk/gtkrecentfilter.h @@ -99,7 +99,7 @@ GType gtk_recent_filter_get_type (void) G_GNUC_CONST; GtkRecentFilter * gtk_recent_filter_new (void); void gtk_recent_filter_set_name (GtkRecentFilter *filter, const gchar *name); -G_CONST_RETURN gchar *gtk_recent_filter_get_name (GtkRecentFilter *filter); +const gchar * gtk_recent_filter_get_name (GtkRecentFilter *filter); void gtk_recent_filter_add_mime_type (GtkRecentFilter *filter, const gchar *mime_type); diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c index a33b58a012..dbe83fa975 100644 --- a/gtk/gtkrecentmanager.c +++ b/gtk/gtkrecentmanager.c @@ -1539,7 +1539,7 @@ gtk_recent_info_unref (GtkRecentInfo *info) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_recent_info_get_uri (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); @@ -1559,7 +1559,7 @@ gtk_recent_info_get_uri (GtkRecentInfo *info) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_recent_info_get_display_name (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); @@ -1581,7 +1581,7 @@ gtk_recent_info_get_display_name (GtkRecentInfo *info) * * Since: 2.10 **/ -G_CONST_RETURN gchar * +const gchar * gtk_recent_info_get_description (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); @@ -1600,7 +1600,7 @@ gtk_recent_info_get_description (GtkRecentInfo *info) * * Since: 2.10 */ -G_CONST_RETURN gchar * +const gchar * gtk_recent_info_get_mime_type (GtkRecentInfo *info) { g_return_val_if_fail (info != NULL, NULL); diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h index 41e7c841ba..6d7bda6f4d 100644 --- a/gtk/gtkrecentmanager.h +++ b/gtk/gtkrecentmanager.h @@ -191,10 +191,10 @@ GType gtk_recent_info_get_type (void) G_GNUC_CONST; GtkRecentInfo * gtk_recent_info_ref (GtkRecentInfo *info); void gtk_recent_info_unref (GtkRecentInfo *info); -G_CONST_RETURN gchar *gtk_recent_info_get_uri (GtkRecentInfo *info); -G_CONST_RETURN gchar *gtk_recent_info_get_display_name (GtkRecentInfo *info); -G_CONST_RETURN gchar *gtk_recent_info_get_description (GtkRecentInfo *info); -G_CONST_RETURN gchar *gtk_recent_info_get_mime_type (GtkRecentInfo *info); +const gchar * gtk_recent_info_get_uri (GtkRecentInfo *info); +const gchar * gtk_recent_info_get_display_name (GtkRecentInfo *info); +const gchar * gtk_recent_info_get_description (GtkRecentInfo *info); +const gchar * gtk_recent_info_get_mime_type (GtkRecentInfo *info); time_t gtk_recent_info_get_added (GtkRecentInfo *info); time_t gtk_recent_info_get_modified (GtkRecentInfo *info); time_t gtk_recent_info_get_visited (GtkRecentInfo *info); diff --git a/gtk/gtksearchenginebeagle.c b/gtk/gtksearchenginebeagle.c index fe99b1ee92..1722d0278a 100644 --- a/gtk/gtksearchenginebeagle.c +++ b/gtk/gtksearchenginebeagle.c @@ -63,7 +63,7 @@ typedef enum static gboolean (*beagle_client_send_request_async) (BeagleClient *client, BeagleRequest *request, GError **err) = NULL; -static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL; +static const char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL; static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL; static GSList *(*beagle_hits_subtracted_response_get_uris) (BeagleHitsSubtractedResponse *response) = NULL; static BeagleQuery *(*beagle_query_new) (void) = NULL; diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index aa37454d42..6e53bc9f71 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -2135,7 +2135,7 @@ gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon) * * Since: 2.10 **/ -G_CONST_RETURN gchar * +const gchar * gtk_status_icon_get_stock (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv; @@ -2167,7 +2167,7 @@ gtk_status_icon_get_stock (GtkStatusIcon *status_icon) * * Since: 2.10 **/ -G_CONST_RETURN gchar * +const gchar * gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv; @@ -2920,7 +2920,7 @@ gtk_status_icon_set_title (GtkStatusIcon *status_icon, * * Since: 2.18 */ -G_CONST_RETURN gchar * +const gchar * gtk_status_icon_get_title (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv; diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h index 5508066cac..758ed0a9fa 100644 --- a/gtk/gtkstatusicon.h +++ b/gtk/gtkstatusicon.h @@ -102,8 +102,8 @@ void gtk_status_icon_set_from_gicon (GtkStatusIcon *st GtkImageType gtk_status_icon_get_storage_type (GtkStatusIcon *status_icon); GdkPixbuf *gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon); -G_CONST_RETURN gchar *gtk_status_icon_get_stock (GtkStatusIcon *status_icon); -G_CONST_RETURN gchar *gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon); +const gchar * gtk_status_icon_get_stock (GtkStatusIcon *status_icon); +const gchar * gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon); GIcon *gtk_status_icon_get_gicon (GtkStatusIcon *status_icon); gint gtk_status_icon_get_size (GtkStatusIcon *status_icon); @@ -120,7 +120,7 @@ void gtk_status_icon_set_tooltip_markup (GtkStatusIcon *st const gchar *markup); void gtk_status_icon_set_title (GtkStatusIcon *status_icon, const gchar *title); -G_CONST_RETURN gchar *gtk_status_icon_get_title (GtkStatusIcon *status_icon); +const gchar * gtk_status_icon_get_title (GtkStatusIcon *status_icon); void gtk_status_icon_set_name (GtkStatusIcon *status_icon, const gchar *name); void gtk_status_icon_set_visible (GtkStatusIcon *status_icon, diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index aad8e22248..762f889e8a 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -1695,7 +1695,7 @@ gtk_style_context_set_path (GtkStyleContext *context, * * Since: 3.0 **/ -G_CONST_RETURN GtkWidgetPath * +const GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context) { GtkStyleContextPrivate *priv; diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index 8d8f51153f..4e3d4d5ed9 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -563,7 +563,7 @@ gboolean gtk_style_context_state_is_running (GtkStyleContext *context, void gtk_style_context_set_path (GtkStyleContext *context, GtkWidgetPath *path); -G_CONST_RETURN GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context); +const GtkWidgetPath * gtk_style_context_get_path (GtkStyleContext *context); GList * gtk_style_context_list_classes (GtkStyleContext *context); diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h index 8b714bc25e..3e45d3cd40 100644 --- a/gtk/gtktextmark.h +++ b/gtk/gtktextmark.h @@ -93,7 +93,7 @@ void gtk_text_mark_set_visible (GtkTextMark *mark, gboolean setting); gboolean gtk_text_mark_get_visible (GtkTextMark *mark); -G_CONST_RETURN gchar* gtk_text_mark_get_name (GtkTextMark *mark); +const gchar * gtk_text_mark_get_name (GtkTextMark *mark); gboolean gtk_text_mark_get_deleted (GtkTextMark *mark); GtkTextBuffer* gtk_text_mark_get_buffer (GtkTextMark *mark); gboolean gtk_text_mark_get_left_gravity (GtkTextMark *mark); diff --git a/gtk/gtkthemingengine.c b/gtk/gtkthemingengine.c index 68520a0160..dc59928c68 100644 --- a/gtk/gtkthemingengine.c +++ b/gtk/gtkthemingengine.c @@ -638,7 +638,7 @@ gtk_theming_engine_state_is_running (GtkThemingEngine *engine, * * Since: 3.0 **/ -G_CONST_RETURN GtkWidgetPath * +const GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine) { GtkThemingEnginePrivate *priv; diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h index 148bbd2773..63c792c1fd 100644 --- a/gtk/gtkthemingengine.h +++ b/gtk/gtkthemingengine.h @@ -211,7 +211,7 @@ gboolean gtk_theming_engine_lookup_color (GtkThemingEngine *engine, const gchar *color_name, GdkRGBA *color); -G_CONST_RETURN GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine); +const GtkWidgetPath * gtk_theming_engine_get_path (GtkThemingEngine *engine); gboolean gtk_theming_engine_has_class (GtkThemingEngine *engine, const gchar *style_class); diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index ddf321b09b..f78572985a 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -1051,7 +1051,7 @@ gtk_tool_button_set_label (GtkToolButton *button, * * Since: 2.4 **/ -G_CONST_RETURN gchar * +const gchar * gtk_tool_button_get_label (GtkToolButton *button) { g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL); @@ -1152,7 +1152,7 @@ gtk_tool_button_set_stock_id (GtkToolButton *button, * * Since: 2.4 **/ -G_CONST_RETURN gchar * +const gchar * gtk_tool_button_get_stock_id (GtkToolButton *button) { g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL); @@ -1203,7 +1203,7 @@ gtk_tool_button_set_icon_name (GtkToolButton *button, * * Since: 2.8 **/ -G_CONST_RETURN gchar* +const gchar* gtk_tool_button_get_icon_name (GtkToolButton *button) { g_return_val_if_fail (GTK_IS_TOOL_BUTTON (button), NULL); diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h index 3783e70657..eba864536a 100644 --- a/gtk/gtktoolbutton.h +++ b/gtk/gtktoolbutton.h @@ -73,16 +73,16 @@ GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id); void gtk_tool_button_set_label (GtkToolButton *button, const gchar *label); -G_CONST_RETURN gchar *gtk_tool_button_get_label (GtkToolButton *button); +const gchar * gtk_tool_button_get_label (GtkToolButton *button); void gtk_tool_button_set_use_underline (GtkToolButton *button, gboolean use_underline); gboolean gtk_tool_button_get_use_underline (GtkToolButton *button); void gtk_tool_button_set_stock_id (GtkToolButton *button, const gchar *stock_id); -G_CONST_RETURN gchar *gtk_tool_button_get_stock_id (GtkToolButton *button); +const gchar * gtk_tool_button_get_stock_id (GtkToolButton *button); void gtk_tool_button_set_icon_name (GtkToolButton *button, const gchar *icon_name); -G_CONST_RETURN gchar *gtk_tool_button_get_icon_name (GtkToolButton *button); +const gchar * gtk_tool_button_get_icon_name (GtkToolButton *button); void gtk_tool_button_set_icon_widget (GtkToolButton *button, GtkWidget *icon_widget); GtkWidget * gtk_tool_button_get_icon_widget (GtkToolButton *button); diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c index 20981baa34..018b32b28a 100644 --- a/gtk/gtktoolitemgroup.c +++ b/gtk/gtktoolitemgroup.c @@ -1980,7 +1980,7 @@ gtk_tool_item_group_set_ellipsize (GtkToolItemGroup *group, * * Since: 2.20 */ -G_CONST_RETURN gchar* +const gchar* gtk_tool_item_group_get_label (GtkToolItemGroup *group) { GtkToolItemGroupPrivate *priv; diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h index 1024bc046c..1d7852eae6 100644 --- a/gtk/gtktoolitemgroup.h +++ b/gtk/gtktoolitemgroup.h @@ -78,7 +78,7 @@ void gtk_tool_item_group_set_ellipsize (GtkToolItemGroup void gtk_tool_item_group_set_header_relief (GtkToolItemGroup *group, GtkReliefStyle style); -G_CONST_RETURN gchar* gtk_tool_item_group_get_label (GtkToolItemGroup *group); +const gchar * gtk_tool_item_group_get_label (GtkToolItemGroup *group); GtkWidget *gtk_tool_item_group_get_label_widget (GtkToolItemGroup *group); gboolean gtk_tool_item_group_get_collapsed (GtkToolItemGroup *group); PangoEllipsizeMode gtk_tool_item_group_get_ellipsize (GtkToolItemGroup *group); diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c index 907c989c1c..e0084fab12 100644 --- a/gtk/gtktoolpalette.c +++ b/gtk/gtktoolpalette.c @@ -1881,7 +1881,7 @@ _gtk_tool_palette_child_set_drag_source (GtkWidget *child, * * Since: 2.20 */ -G_CONST_RETURN GtkTargetEntry* +const GtkTargetEntry* gtk_tool_palette_get_drag_target_item (void) { return &dnd_targets[0]; @@ -1896,7 +1896,7 @@ gtk_tool_palette_get_drag_target_item (void) * * Since: 2.20 */ -G_CONST_RETURN GtkTargetEntry* +const GtkTargetEntry* gtk_tool_palette_get_drag_target_group (void) { return &dnd_targets[1]; diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h index 7870c55967..a8e3ddeda9 100644 --- a/gtk/gtktoolpalette.h +++ b/gtk/gtktoolpalette.h @@ -133,8 +133,8 @@ GtkAdjustment* gtk_tool_palette_get_vadjustment (GtkToolPa #endif -G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_item (void) G_GNUC_CONST; -G_CONST_RETURN GtkTargetEntry* gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST; +const GtkTargetEntry* gtk_tool_palette_get_drag_target_item (void) G_GNUC_CONST; +const GtkTargetEntry* gtk_tool_palette_get_drag_target_group (void) G_GNUC_CONST; G_END_DECLS diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index c97f8e55d3..11f86cd1d6 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -2412,7 +2412,7 @@ gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column, * Return value: the title of the column. This string should not be * modified or freed. **/ -G_CONST_RETURN gchar * +const gchar * 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 c6b2e792ae..2635fd860c 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/gtk/gtktreeviewcolumn.h @@ -161,7 +161,7 @@ void gtk_tree_view_column_clicked (GtkTreeViewCol */ void gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column, const gchar *title); -G_CONST_RETURN gchar *gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column); +const gchar * gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column); void gtk_tree_view_column_set_expand (GtkTreeViewColumn *tree_column, gboolean expand); gboolean gtk_tree_view_column_get_expand (GtkTreeViewColumn *tree_column); diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 17ebd4447b..caeec32450 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -6964,7 +6964,7 @@ gtk_widget_set_name (GtkWidget *widget, * Return value: name of the widget. This string is owned by GTK+ and * should not be modified or freed **/ -G_CONST_RETURN gchar* +const gchar* gtk_widget_get_name (GtkWidget *widget) { GtkWidgetPrivate *priv; diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 739e9111f4..064152112a 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -578,7 +578,7 @@ gboolean gtk_widget_device_is_shadowed (GtkWidget *widget, void gtk_widget_set_name (GtkWidget *widget, const gchar *name); -G_CONST_RETURN gchar* gtk_widget_get_name (GtkWidget *widget); +const gchar * gtk_widget_get_name (GtkWidget *widget); void gtk_widget_set_state (GtkWidget *widget, GtkStateType state); diff --git a/gtk/gtkwidgetpath.c b/gtk/gtkwidgetpath.c index c6f3fb3c1b..bdbb7d0b2d 100644 --- a/gtk/gtkwidgetpath.c +++ b/gtk/gtkwidgetpath.c @@ -578,7 +578,7 @@ gtk_widget_path_iter_set_object_type (GtkWidgetPath *path, * * Returns: The widget name, or %NULL if none was set. **/ -G_CONST_RETURN gchar * +const gchar * gtk_widget_path_iter_get_name (const GtkWidgetPath *path, gint pos) { diff --git a/gtk/gtkwidgetpath.h b/gtk/gtkwidgetpath.h index 66441fa3a1..0ff9b76e16 100644 --- a/gtk/gtkwidgetpath.h +++ b/gtk/gtkwidgetpath.h @@ -70,7 +70,7 @@ const GtkWidgetPath * guint gtk_widget_path_iter_get_sibling_index(const GtkWidgetPath *path, gint pos); -G_CONST_RETURN gchar * gtk_widget_path_iter_get_name (const GtkWidgetPath *path, +const gchar * gtk_widget_path_iter_get_name (const GtkWidgetPath *path, gint pos); void gtk_widget_path_iter_set_name (GtkWidgetPath *path, gint pos, diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 76d029edac..31877d2861 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -1584,7 +1584,7 @@ gtk_window_set_title (GtkWindow *window, * been set explicitely. The returned string is owned by the widget * and must not be modified or freed. **/ -G_CONST_RETURN gchar * +const gchar * gtk_window_get_title (GtkWindow *window) { g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); @@ -1746,7 +1746,7 @@ gtk_window_set_startup_id (GtkWindow *window, * returned is owned by the widget and must not be modified * or freed. **/ -G_CONST_RETURN gchar * +const gchar * gtk_window_get_role (GtkWindow *window) { g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 3820070287..2752d8daed 100644 --- a/gtk/gtkwindow.h +++ b/gtk/gtkwindow.h @@ -108,7 +108,7 @@ GType gtk_window_get_type (void) G_GNUC_CONST; GtkWidget* gtk_window_new (GtkWindowType type); void gtk_window_set_title (GtkWindow *window, const gchar *title); -G_CONST_RETURN gchar *gtk_window_get_title (GtkWindow *window); +const gchar * gtk_window_get_title (GtkWindow *window); void gtk_window_set_wmclass (GtkWindow *window, const gchar *wmclass_name, const gchar *wmclass_class); @@ -116,7 +116,7 @@ void gtk_window_set_role (GtkWindow *window, const gchar *role); void gtk_window_set_startup_id (GtkWindow *window, const gchar *startup_id); -G_CONST_RETURN gchar *gtk_window_get_role (GtkWindow *window); +const gchar * gtk_window_get_role (GtkWindow *window); void gtk_window_add_accel_group (GtkWindow *window, GtkAccelGroup *accel_group); void gtk_window_remove_accel_group (GtkWindow *window, @@ -202,14 +202,12 @@ gboolean gtk_window_set_icon_from_file (GtkWindow *window, const gchar *filename, GError **err); GdkPixbuf* gtk_window_get_icon (GtkWindow *window); -G_CONST_RETURN -gchar *gtk_window_get_icon_name (GtkWindow *window); +const gchar * gtk_window_get_icon_name (GtkWindow *window); void gtk_window_set_default_icon_list (GList *list); GList* gtk_window_get_default_icon_list (void); void gtk_window_set_default_icon (GdkPixbuf *icon); void gtk_window_set_default_icon_name (const gchar *name); -G_CONST_RETURN -gchar *gtk_window_get_default_icon_name (void); +const gchar * gtk_window_get_default_icon_name (void); gboolean gtk_window_set_default_icon_from_file (const gchar *filename, GError **err); |