[glade/wip/chergert/fix-deprecations: 2/3] build: remove G_CONST_RETURN usage
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glade/wip/chergert/fix-deprecations: 2/3] build: remove G_CONST_RETURN usage
- Date: Mon, 5 Aug 2019 22:02:48 +0000 (UTC)
commit aa2ee2e6654e882fd298d81969e10fb3ea488333
Author: Christian Hergert <chergert redhat com>
Date: Mon Aug 5 14:57:17 2019 -0700
build: remove G_CONST_RETURN usage
gladeui/glade-catalog.c | 10 +++++-----
gladeui/glade-catalog.h | 10 +++++-----
gladeui/glade-command.c | 2 +-
gladeui/glade-command.h | 2 +-
gladeui/glade-displayable-values.c | 4 ++--
gladeui/glade-displayable-values.h | 4 ++--
gladeui/glade-property-def.c | 12 ++++++------
gladeui/glade-property-def.h | 12 ++++++------
gladeui/glade-property.c | 8 ++++----
gladeui/glade-property.h | 8 ++++----
gladeui/glade-signal-def.c | 4 ++--
gladeui/glade-signal-def.h | 4 ++--
gladeui/glade-signal.c | 12 ++++++------
gladeui/glade-signal.h | 12 ++++++------
gladeui/glade-widget-adaptor.c | 24 ++++++++++++------------
gladeui/glade-widget-adaptor.h | 24 ++++++++++++------------
gladeui/glade-widget.c | 6 +++---
gladeui/glade-widget.h | 8 ++++----
18 files changed, 83 insertions(+), 83 deletions(-)
---
diff --git a/gladeui/glade-catalog.c b/gladeui/glade-catalog.c
index c0a27343..aa3b8925 100644
--- a/gladeui/glade-catalog.c
+++ b/gladeui/glade-catalog.c
@@ -722,7 +722,7 @@ glade_catalog_load_all (void)
*
* Returns: The symbolic catalog name.
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_catalog_get_name (GladeCatalog *catalog)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), NULL);
@@ -736,7 +736,7 @@ glade_catalog_get_name (GladeCatalog *catalog)
*
* Returns: The catalog path prefix.
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_catalog_get_prefix (GladeCatalog *catalog)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), NULL);
@@ -750,7 +750,7 @@ glade_catalog_get_prefix (GladeCatalog *catalog)
*
* Returns: The Devhelp search domain.
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_catalog_get_book (GladeCatalog *catalog)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), NULL);
@@ -764,7 +764,7 @@ glade_catalog_get_book (GladeCatalog *catalog)
*
* Returns: The domain to be used to translate strings from this catalog
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_catalog_get_domain (GladeCatalog *catalog)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), NULL);
@@ -778,7 +778,7 @@ glade_catalog_get_domain (GladeCatalog *catalog)
*
* Returns: The prefix for icons.
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_catalog_get_icon_prefix (GladeCatalog *catalog)
{
g_return_val_if_fail (GLADE_IS_CATALOG (catalog), NULL);
diff --git a/gladeui/glade-catalog.h b/gladeui/glade-catalog.h
index efa13dd0..24e77730 100644
--- a/gladeui/glade-catalog.h
+++ b/gladeui/glade-catalog.h
@@ -58,11 +58,11 @@ void glade_catalog_remove_path (const gchar *path);
const GList *glade_catalog_get_extra_paths (void);
const GList *glade_catalog_load_all (void);
-G_CONST_RETURN gchar *glade_catalog_get_name (GladeCatalog *catalog);
-G_CONST_RETURN gchar *glade_catalog_get_prefix (GladeCatalog *catalog);
-G_CONST_RETURN gchar *glade_catalog_get_icon_prefix(GladeCatalog *catalog);
-G_CONST_RETURN gchar *glade_catalog_get_domain (GladeCatalog *catalog);
-G_CONST_RETURN gchar *glade_catalog_get_book (GladeCatalog *catalog);
+const gchar *glade_catalog_get_name (GladeCatalog *catalog);
+const gchar *glade_catalog_get_prefix (GladeCatalog *catalog);
+const gchar *glade_catalog_get_icon_prefix(GladeCatalog *catalog);
+const gchar *glade_catalog_get_domain (GladeCatalog *catalog);
+const gchar *glade_catalog_get_book (GladeCatalog *catalog);
GList *glade_catalog_get_targets (GladeCatalog *catalog);
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c
index cc05fb40..6c47fad5 100644
--- a/gladeui/glade-command.c
+++ b/gladeui/glade-command.c
@@ -198,7 +198,7 @@ typedef struct { \
static MAKE_TYPE(func, type, GLADE_TYPE_COMMAND)
-G_CONST_RETURN gchar *
+const gchar *
glade_command_description (GladeCommand *command)
{
g_return_val_if_fail (GLADE_IS_COMMAND (command), NULL);
diff --git a/gladeui/glade-command.h b/gladeui/glade-command.h
index 39c86b89..0531acbf 100644
--- a/gladeui/glade-command.h
+++ b/gladeui/glade-command.h
@@ -71,7 +71,7 @@ void glade_command_push_group (const gchar *fmt
void glade_command_pop_group (void);
gint glade_command_get_group_depth (void);
-G_CONST_RETURN gchar *glade_command_description (GladeCommand *command);
+const gchar *glade_command_description (GladeCommand *command);
gint glade_command_group_id (GladeCommand *command);
gboolean glade_command_execute (GladeCommand *command);
gboolean glade_command_undo (GladeCommand *command);
diff --git a/gladeui/glade-displayable-values.c b/gladeui/glade-displayable-values.c
index a7fd1ace..da69b269 100644
--- a/gladeui/glade-displayable-values.c
+++ b/gladeui/glade-displayable-values.c
@@ -146,7 +146,7 @@ glade_type_has_displayable_values (GType type)
return has;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_get_displayable_value (GType type, const gchar *value)
{
ValueTab *tab;
@@ -160,7 +160,7 @@ glade_get_displayable_value (GType type, const gchar *value)
}
-G_CONST_RETURN gchar *
+const gchar *
glade_get_value_from_displayable (GType type, const gchar *displayable)
{
ValueTab *tab;
diff --git a/gladeui/glade-displayable-values.h b/gladeui/glade-displayable-values.h
index 9f4e39f1..602b1c62 100644
--- a/gladeui/glade-displayable-values.h
+++ b/gladeui/glade-displayable-values.h
@@ -17,7 +17,7 @@ void glade_register_translated_value (GType type,
gboolean glade_type_has_displayable_values (GType type);
-G_CONST_RETURN
+const
gchar *glade_get_displayable_value (GType type,
const gchar *value);
@@ -28,7 +28,7 @@ void glade_displayable_value_set_disabled (GType type,
const gchar *value,
gboolean disabled);
-G_CONST_RETURN
+const
gchar *glade_get_value_from_displayable (GType type,
const gchar *displayabe);
diff --git a/gladeui/glade-property-def.c b/gladeui/glade-property-def.c
index 76534d56..0c5fe345 100644
--- a/gladeui/glade-property-def.c
+++ b/gladeui/glade-property-def.c
@@ -1355,7 +1355,7 @@ glade_property_def_set_name (GladePropertyDef *property_def,
property_def->name = g_strdup (name);
}
-G_CONST_RETURN gchar *
+const gchar *
glade_property_def_get_name (GladePropertyDef *property_def)
{
g_return_val_if_fail (GLADE_IS_PROPERTY_DEF (property_def), NULL);
@@ -1373,7 +1373,7 @@ glade_property_def_set_tooltip (GladePropertyDef *property_def,
property_def->tooltip = g_strdup (tooltip);
}
-G_CONST_RETURN gchar *
+const gchar *
glade_property_def_get_tooltip (GladePropertyDef *property_def)
{
g_return_val_if_fail (GLADE_IS_PROPERTY_DEF (property_def), NULL);
@@ -1398,7 +1398,7 @@ glade_property_def_get_construct_only (GladePropertyDef *property_def)
return property_def->construct_only;
}
-G_CONST_RETURN GValue *
+const GValue *
glade_property_def_get_default (GladePropertyDef *property_def)
{
g_return_val_if_fail (GLADE_IS_PROPERTY_DEF (property_def), NULL);
@@ -1406,7 +1406,7 @@ glade_property_def_get_default (GladePropertyDef *property_def)
return property_def->def;
}
-G_CONST_RETURN GValue *
+const GValue *
glade_property_def_get_original_default (GladePropertyDef *property_def)
{
g_return_val_if_fail (GLADE_IS_PROPERTY_DEF (property_def), NULL);
@@ -1526,7 +1526,7 @@ glade_property_def_weight (GladePropertyDef *property_def)
return property_def->weight;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_property_def_create_type (GladePropertyDef *property_def)
{
g_return_val_if_fail (GLADE_IS_PROPERTY_DEF (property_def), NULL);
@@ -1567,7 +1567,7 @@ glade_property_def_deprecated (GladePropertyDef *property_def)
return property_def->deprecated;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_property_def_id (GladePropertyDef *property_def)
{
g_return_val_if_fail (GLADE_IS_PROPERTY_DEF (property_def), NULL);
diff --git a/gladeui/glade-property-def.h b/gladeui/glade-property-def.h
index 7e20ea8e..8076fca0 100644
--- a/gladeui/glade-property-def.h
+++ b/gladeui/glade-property-def.h
@@ -86,17 +86,17 @@ void glade_property_def_set_ignore (GladeProperty
gboolean glade_property_def_get_ignore (GladePropertyDef *property_def);
void glade_property_def_set_name (GladePropertyDef *property_def,
const gchar *name);
-G_CONST_RETURN gchar *glade_property_def_get_name (GladePropertyDef *property_def);
+const gchar *glade_property_def_get_name (GladePropertyDef *property_def);
void glade_property_def_set_tooltip (GladePropertyDef *property_def,
const gchar *tooltip);
-G_CONST_RETURN gchar *glade_property_def_get_tooltip (GladePropertyDef *property_def);
-G_CONST_RETURN gchar *glade_property_def_id (GladePropertyDef *property_def);
+const gchar *glade_property_def_get_tooltip (GladePropertyDef *property_def);
+const gchar *glade_property_def_id (GladePropertyDef *property_def);
gboolean glade_property_def_themed_icon (GladePropertyDef *property_def);
void glade_property_def_set_construct_only (GladePropertyDef *property_def,
gboolean construct_only);
gboolean glade_property_def_get_construct_only (GladePropertyDef *property_def);
-G_CONST_RETURN GValue *glade_property_def_get_default (GladePropertyDef *property_def);
-G_CONST_RETURN GValue *glade_property_def_get_original_default (GladePropertyDef *property_def);
+const GValue *glade_property_def_get_default (GladePropertyDef *property_def);
+const GValue *glade_property_def_get_original_default (GladePropertyDef *property_def);
gboolean glade_property_def_translatable (GladePropertyDef *property_def);
gboolean glade_property_def_needs_sync (GladePropertyDef *property_def);
@@ -113,7 +113,7 @@ gboolean glade_property_def_transfer_on_paste (GladeProperty
gboolean glade_property_def_custom_layout (GladePropertyDef *property_def);
gdouble glade_property_def_weight (GladePropertyDef *property_def);
-G_CONST_RETURN gchar *glade_property_def_create_type (GladePropertyDef *property_def);
+const gchar *glade_property_def_create_type (GladePropertyDef *property_def);
guint16 glade_property_def_since_major (GladePropertyDef *property_def);
guint16 glade_property_def_since_minor (GladePropertyDef *property_def);
diff --git a/gladeui/glade-property.c b/gladeui/glade-property.c
index ee021652..008a290b 100644
--- a/gladeui/glade-property.c
+++ b/gladeui/glade-property.c
@@ -1430,7 +1430,7 @@ glade_property_i18n_set_comment (GladeProperty *property, const gchar *str)
g_object_notify_by_pspec (G_OBJECT (property), properties[PROP_I18N_COMMENT]);
}
-G_CONST_RETURN gchar *
+const gchar *
glade_property_i18n_get_comment (GladeProperty * property)
{
g_return_val_if_fail (GLADE_IS_PROPERTY (property), NULL);
@@ -1448,7 +1448,7 @@ glade_property_i18n_set_context (GladeProperty *property, const gchar *str)
g_object_notify_by_pspec (G_OBJECT (property), properties[PROP_I18N_CONTEXT]);
}
-G_CONST_RETURN gchar *
+const gchar *
glade_property_i18n_get_context (GladeProperty *property)
{
g_return_val_if_fail (GLADE_IS_PROPERTY (property), NULL);
@@ -1505,7 +1505,7 @@ glade_property_set_sensitive (GladeProperty *property,
g_object_notify_by_pspec (G_OBJECT (property), properties[PROP_SENSITIVE]);
}
-G_CONST_RETURN gchar *
+const gchar *
glade_propert_get_insensitive_tooltip (GladeProperty *property)
{
g_return_val_if_fail (GLADE_IS_PROPERTY (property), NULL);
@@ -1555,7 +1555,7 @@ glade_property_set_support_warning (GladeProperty *property,
glade_widget_verify (property->priv->widget);
}
-G_CONST_RETURN gchar *
+const gchar *
glade_property_get_support_warning (GladeProperty *property)
{
g_return_val_if_fail (GLADE_IS_PROPERTY (property), NULL);
diff --git a/gladeui/glade-property.h b/gladeui/glade-property.h
index 14dafff1..b4ecf5c1 100644
--- a/gladeui/glade-property.h
+++ b/gladeui/glade-property.h
@@ -126,12 +126,12 @@ GladePropertyDef *glade_property_get_def (GladeProperty
void glade_property_set_sensitive (GladeProperty *property,
gboolean sensitive,
const gchar *reason);
-G_CONST_RETURN gchar *glade_propert_get_insensitive_tooltip(GladeProperty *property);
+const gchar *glade_propert_get_insensitive_tooltip(GladeProperty *property);
void glade_property_set_support_warning (GladeProperty *property,
gboolean disable,
const gchar *reason);
-G_CONST_RETURN gchar *glade_property_get_support_warning (GladeProperty *property);
+const gchar *glade_property_get_support_warning (GladeProperty *property);
gboolean glade_property_warn_usage (GladeProperty *property);
@@ -163,12 +163,12 @@ GladePropertyState glade_property_get_state (GladeProperty
void glade_property_i18n_set_comment (GladeProperty *property,
const gchar *str);
-G_CONST_RETURN gchar *glade_property_i18n_get_comment (GladeProperty *property);
+const gchar *glade_property_i18n_get_comment (GladeProperty *property);
void glade_property_i18n_set_context (GladeProperty *property,
const gchar *str);
-G_CONST_RETURN gchar *glade_property_i18n_get_context (GladeProperty *property);
+const gchar *glade_property_i18n_get_context (GladeProperty *property);
void glade_property_i18n_set_translatable (GladeProperty *property,
gboolean translatable);
diff --git a/gladeui/glade-signal-def.c b/gladeui/glade-signal-def.c
index 1dbc8c81..90269eaa 100644
--- a/gladeui/glade-signal-def.c
+++ b/gladeui/glade-signal-def.c
@@ -164,7 +164,7 @@ glade_signal_def_get_adaptor (const GladeSignalDef *signal_def)
*
* Returns: the name of the signal
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_signal_def_get_name (const GladeSignalDef *signal_def)
{
g_return_val_if_fail (signal_def != NULL, NULL);
@@ -180,7 +180,7 @@ glade_signal_def_get_name (const GladeSignalDef *signal_def)
*
* Returns: the type name of the signal
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_signal_def_get_object_type_name (const GladeSignalDef *signal_def)
{
g_return_val_if_fail (signal_def != NULL, NULL);
diff --git a/gladeui/glade-signal-def.h b/gladeui/glade-signal-def.h
index de674e25..cb843bc4 100644
--- a/gladeui/glade-signal-def.h
+++ b/gladeui/glade-signal-def.h
@@ -60,8 +60,8 @@ void glade_signal_def_update_from_node (GladeSignalDef
const gchar *domain);
GladeWidgetAdaptor *glade_signal_def_get_adaptor (const GladeSignalDef *signal_def);
-G_CONST_RETURN gchar *glade_signal_def_get_name (const GladeSignalDef *signal_def);
-G_CONST_RETURN gchar *glade_signal_def_get_object_type_name (const GladeSignalDef *signal_def);
+const gchar *glade_signal_def_get_name (const GladeSignalDef *signal_def);
+const gchar *glade_signal_def_get_object_type_name (const GladeSignalDef *signal_def);
GSignalFlags glade_signal_def_get_flags (const GladeSignalDef *signal_def);
void glade_signal_def_set_since (GladeSignalDef *signal_def,
diff --git a/gladeui/glade-signal.c b/gladeui/glade-signal.c
index 0b0d1e54..fa5578f6 100644
--- a/gladeui/glade-signal.c
+++ b/gladeui/glade-signal.c
@@ -413,7 +413,7 @@ glade_signal_read (GladeXmlNode *node, GladeWidgetAdaptor *adaptor)
return signal;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_signal_get_name (const GladeSignal *signal)
{
g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
@@ -421,7 +421,7 @@ glade_signal_get_name (const GladeSignal *signal)
return glade_signal_def_get_name (signal->priv->def);
}
-G_CONST_RETURN GladeSignalDef *
+const GladeSignalDef *
glade_signal_get_def (const GladeSignal *signal)
{
return signal->priv->def;
@@ -441,7 +441,7 @@ glade_signal_set_detail (GladeSignal *signal, const gchar *detail)
}
}
-G_CONST_RETURN gchar *
+const gchar *
glade_signal_get_detail (const GladeSignal *signal)
{
g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
@@ -464,7 +464,7 @@ glade_signal_set_handler (GladeSignal *signal, const gchar *handler)
}
}
-G_CONST_RETURN gchar *
+const gchar *
glade_signal_get_handler (const GladeSignal *signal)
{
g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
@@ -487,7 +487,7 @@ glade_signal_set_userdata (GladeSignal *signal, const gchar *userdata)
}
}
-G_CONST_RETURN gchar *
+const gchar *
glade_signal_get_userdata (const GladeSignal *signal)
{
g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
@@ -553,7 +553,7 @@ glade_signal_set_support_warning (GladeSignal *signal,
}
}
-G_CONST_RETURN gchar *
+const gchar *
glade_signal_get_support_warning (const GladeSignal *signal)
{
g_return_val_if_fail (GLADE_IS_SIGNAL (signal), NULL);
diff --git a/gladeui/glade-signal.h b/gladeui/glade-signal.h
index fccaf568..3a8fdd60 100644
--- a/gladeui/glade-signal.h
+++ b/gladeui/glade-signal.h
@@ -50,17 +50,17 @@ void glade_signal_write (GladeSignal *sign
GladeXmlContext *context,
GladeXmlNode *node);
-G_CONST_RETURN gchar *glade_signal_get_name (const GladeSignal *signal);
-G_CONST_RETURN GladeSignalDef *glade_signal_get_def (const GladeSignal * signal);
+const gchar *glade_signal_get_name (const GladeSignal *signal);
+const GladeSignalDef *glade_signal_get_def (const GladeSignal * signal);
void glade_signal_set_detail (GladeSignal *signal,
const gchar *detail);
-G_CONST_RETURN gchar *glade_signal_get_detail (const GladeSignal *signal);
+const gchar *glade_signal_get_detail (const GladeSignal *signal);
void glade_signal_set_handler (GladeSignal *signal,
const gchar *handler);
-G_CONST_RETURN gchar *glade_signal_get_handler (const GladeSignal *signal);
+const gchar *glade_signal_get_handler (const GladeSignal *signal);
void glade_signal_set_userdata (GladeSignal *signal,
const gchar *userdata);
-G_CONST_RETURN gchar *glade_signal_get_userdata (const GladeSignal *signal);
+const gchar *glade_signal_get_userdata (const GladeSignal *signal);
void glade_signal_set_after (GladeSignal *signal,
gboolean after);
gboolean glade_signal_get_after (const GladeSignal *signal);
@@ -69,7 +69,7 @@ void glade_signal_set_swapped (GladeSignal *sign
gboolean glade_signal_get_swapped (const GladeSignal *signal);
void glade_signal_set_support_warning (GladeSignal *signal,
const gchar *support_warning);
-G_CONST_RETURN gchar *glade_signal_get_support_warning (const GladeSignal *signal);
+const gchar *glade_signal_get_support_warning (const GladeSignal *signal);
G_END_DECLS
diff --git a/gladeui/glade-widget-adaptor.c b/gladeui/glade-widget-adaptor.c
index f2a0d66c..e0b430b4 100644
--- a/gladeui/glade-widget-adaptor.c
+++ b/gladeui/glade-widget-adaptor.c
@@ -1769,7 +1769,7 @@ glade_widget_adaptor_get_object_type (GladeWidgetAdaptor *adaptor)
return adaptor->priv->type;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_name (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1783,7 +1783,7 @@ glade_widget_adaptor_get_name (GladeWidgetAdaptor *adaptor)
*
* Returns: the name of the adaptor without %GLADE_WIDGET_ADAPTOR_INSTANTIABLE_PREFIX
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_display_name (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1794,7 +1794,7 @@ glade_widget_adaptor_get_display_name (GladeWidgetAdaptor *adaptor)
return adaptor->priv->name;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_generic_name (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1802,7 +1802,7 @@ glade_widget_adaptor_get_generic_name (GladeWidgetAdaptor *adaptor)
return adaptor->priv->generic_name;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_title (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1810,7 +1810,7 @@ glade_widget_adaptor_get_title (GladeWidgetAdaptor *adaptor)
return adaptor->priv->title;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_icon_name (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1818,7 +1818,7 @@ glade_widget_adaptor_get_icon_name (GladeWidgetAdaptor *adaptor)
return adaptor->priv->icon_name;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_missing_icon (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1826,7 +1826,7 @@ glade_widget_adaptor_get_missing_icon (GladeWidgetAdaptor *adaptor)
return adaptor->priv->missing_icon;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_catalog (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1834,7 +1834,7 @@ glade_widget_adaptor_get_catalog (GladeWidgetAdaptor *adaptor)
return adaptor->priv->catalog;
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_book (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1848,7 +1848,7 @@ glade_widget_adaptor_get_book (GladeWidgetAdaptor *adaptor)
*
* Returns: (transfer none) (element-type GladePropertyDef): a list of #GladePropertyDef
*/
-G_CONST_RETURN GList *
+const GList *
glade_widget_adaptor_get_properties (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1862,7 +1862,7 @@ glade_widget_adaptor_get_properties (GladeWidgetAdaptor *adaptor)
*
* Returns: (transfer none) (element-type GladePropertyDef): a list of #GladePropertyDef
*/
-G_CONST_RETURN GList *
+const GList *
glade_widget_adaptor_get_packing_props (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -1876,7 +1876,7 @@ glade_widget_adaptor_get_packing_props (GladeWidgetAdaptor *adaptor)
*
* Returns: (transfer none) (element-type GladeSignalDef): a list of #GladeSignalDef
*/
-G_CONST_RETURN GList *
+const GList *
glade_widget_adaptor_get_signals (GladeWidgetAdaptor *adaptor)
{
g_return_val_if_fail (GLADE_IS_WIDGET_ADAPTOR (adaptor), NULL);
@@ -3837,7 +3837,7 @@ glade_widget_adaptor_query (GladeWidgetAdaptor *adaptor)
*
* Returns: a string representing the default value for @property_id
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_adaptor_get_packing_default (GladeWidgetAdaptor *child_adaptor,
GladeWidgetAdaptor *container_adaptor,
const gchar *id)
diff --git a/gladeui/glade-widget-adaptor.h b/gladeui/glade-widget-adaptor.h
index aacf5f12..67868e3e 100644
--- a/gladeui/glade-widget-adaptor.h
+++ b/gladeui/glade-widget-adaptor.h
@@ -743,17 +743,17 @@ struct _GladeWidgetAdaptorClass
GType glade_widget_adaptor_get_type (void) G_GNUC_CONST;
GType glade_widget_adaptor_get_object_type (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_name (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_generic_name (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_display_name (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_title (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_icon_name (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_missing_icon (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_catalog (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_book (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN GList *glade_widget_adaptor_get_properties (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN GList *glade_widget_adaptor_get_packing_props(GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN GList *glade_widget_adaptor_get_signals (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_name (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_generic_name (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_display_name (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_title (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_icon_name (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_missing_icon (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_catalog (GladeWidgetAdaptor *adaptor);
+const gchar *glade_widget_adaptor_get_book (GladeWidgetAdaptor *adaptor);
+const GList *glade_widget_adaptor_get_properties (GladeWidgetAdaptor *adaptor);
+const GList *glade_widget_adaptor_get_packing_props(GladeWidgetAdaptor *adaptor);
+const GList *glade_widget_adaptor_get_signals (GladeWidgetAdaptor *adaptor);
GList *glade_widget_adaptor_list_adaptors (void);
@@ -849,7 +849,7 @@ void glade_widget_adaptor_replace_child (GladeWidgetAdapto
GObject *new_obj);
gboolean glade_widget_adaptor_query (GladeWidgetAdaptor *adaptor);
-G_CONST_RETURN gchar *glade_widget_adaptor_get_packing_default(GladeWidgetAdaptor *child_adaptor,
+const gchar *glade_widget_adaptor_get_packing_default(GladeWidgetAdaptor *child_adaptor,
GladeWidgetAdaptor *container_adaptor,
const gchar *id);
gboolean glade_widget_adaptor_is_container (GladeWidgetAdaptor *adaptor);
diff --git a/gladeui/glade-widget.c b/gladeui/glade-widget.c
index 28ecc656..74e2c407 100644
--- a/gladeui/glade-widget.c
+++ b/gladeui/glade-widget.c
@@ -2768,7 +2768,7 @@ glade_widget_get_name (GladeWidget *widget)
* string if the widget is not intended to be serialized
* with an ID (i.e. the user did not provide a name).
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_get_display_name (GladeWidget *widget)
{
g_return_val_if_fail (GLADE_IS_WIDGET (widget), NULL);
@@ -2868,7 +2868,7 @@ glade_widget_set_internal (GladeWidget *widget, const gchar *internal)
*
* Returns: the internal name of @widget
*/
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_get_internal (GladeWidget *widget)
{
g_return_val_if_fail (GLADE_IS_WIDGET (widget), NULL);
@@ -5005,7 +5005,7 @@ glade_widget_set_support_warning (GladeWidget *widget, const gchar *warning)
g_object_notify_by_pspec (G_OBJECT (widget), properties[PROP_SUPPORT_WARNING]);
}
-G_CONST_RETURN gchar *
+const gchar *
glade_widget_support_warning (GladeWidget *widget)
{
g_return_val_if_fail (GLADE_IS_WIDGET (widget), NULL);
diff --git a/gladeui/glade-widget.h b/gladeui/glade-widget.h
index 991482d7..c6189731 100644
--- a/gladeui/glade-widget.h
+++ b/gladeui/glade-widget.h
@@ -350,8 +350,8 @@ gchar *glade_widget_pack_property_string (GladeWidget *w
void glade_widget_set_name (GladeWidget *widget,
const gchar *name);
-G_CONST_RETURN gchar *glade_widget_get_name (GladeWidget *widget);
-G_CONST_RETURN gchar *glade_widget_get_display_name (GladeWidget *widget);
+const gchar *glade_widget_get_name (GladeWidget *widget);
+const gchar *glade_widget_get_display_name (GladeWidget *widget);
gboolean glade_widget_has_name (GladeWidget *widget);
void glade_widget_set_is_composite (GladeWidget *widget,
@@ -362,7 +362,7 @@ gboolean glade_widget_get_is_composite (GladeWidget *w
void glade_widget_set_internal (GladeWidget *widget,
const gchar *internal);
-G_CONST_RETURN gchar *glade_widget_get_internal (GladeWidget *widget);
+const gchar *glade_widget_get_internal (GladeWidget *widget);
GObject *glade_widget_get_object (GladeWidget *widget);
@@ -395,7 +395,7 @@ void glade_widget_pop_superuser (void);
void glade_widget_verify (GladeWidget *widget);
void glade_widget_set_support_warning (GladeWidget *widget,
const gchar *warning);
-G_CONST_RETURN gchar *glade_widget_support_warning (GladeWidget *widget);
+const gchar *glade_widget_support_warning (GladeWidget *widget);
void glade_widget_lock (GladeWidget *widget,
GladeWidget *locked);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
