[glib-controller] Remove G_CONST_RETURN usage
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-controller] Remove G_CONST_RETURN usage
- Date: Mon, 12 Sep 2011 15:41:38 +0000 (UTC)
commit c24a85f3a98facb9aa59f2e9688ec863014c222a
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Mon Sep 12 16:40:52 2011 +0100
Remove G_CONST_RETURN usage
It has been deprecated upstream.
examples/simple-model.c | 4 ++--
glib-controller/gcontrollerreference.c | 4 ++--
glib-controller/gcontrollerreference.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/examples/simple-model.c b/examples/simple-model.c
index b99d95d..a90fe88 100644
--- a/examples/simple-model.c
+++ b/examples/simple-model.c
@@ -124,7 +124,7 @@ my_simple_model_remove_text (MySimpleModel *model,
g_ptr_array_remove_index (model->array, pos);
}
-G_CONST_RETURN gchar *
+const gchar *
my_simple_model_get_text (MySimpleModel *model,
gint pos)
{
@@ -133,7 +133,7 @@ my_simple_model_get_text (MySimpleModel *model,
return g_ptr_array_index (model->array, pos);
}
-G_CONST_RETURN gchar **
+const gchar **
my_simple_model_get_items (MySimpleModel *model)
{
g_return_val_if_fail (MY_IS_SIMPLE_MODEL (model), NULL);
diff --git a/glib-controller/gcontrollerreference.c b/glib-controller/gcontrollerreference.c
index be5401c..93ab8b0 100644
--- a/glib-controller/gcontrollerreference.c
+++ b/glib-controller/gcontrollerreference.c
@@ -542,7 +542,7 @@ g_controller_reference_get_index_uint (GControllerReference *ref,
*
* Return value: a string index at the given position
*/
-G_CONST_RETURN gchar *
+const gchar *
g_controller_reference_get_index_string (GControllerReference *ref,
gint pos)
{
@@ -565,7 +565,7 @@ g_controller_reference_get_index_string (GControllerReference *ref,
*
* Typed accessor for pointer indexes stored inside the @ref
*
- * Return value: a pointer index at the given position
+ * Return value: (transfer none): a pointer index at the given position
*/
gpointer
g_controller_reference_get_index_pointer (GControllerReference *ref,
diff --git a/glib-controller/gcontrollerreference.h b/glib-controller/gcontrollerreference.h
index f77ba2d..973a3d9 100644
--- a/glib-controller/gcontrollerreference.h
+++ b/glib-controller/gcontrollerreference.h
@@ -70,7 +70,7 @@ gint g_controller_reference_get_index_int (GControllerRefer
gint pos);
guint g_controller_reference_get_index_uint (GControllerReference *ref,
gint pos);
-G_CONST_RETURN gchar *g_controller_reference_get_index_string (GControllerReference *ref,
+const gchar * g_controller_reference_get_index_string (GControllerReference *ref,
gint pos);
gpointer g_controller_reference_get_index_pointer (GControllerReference *ref,
gint pos);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]