[json-glib/json-glib-0-12] Remove G_CONST_RETURN usage

[Emmanuele Bassi <ebassi src gnome org>]

commit dadbfd97443970b547b147cf9e5c987a98dc3324
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Thu Jun 9 17:23:04 2011 +0100

    Remove G_CONST_RETURN usage
    
    See GLib bug:
    
      https://bugzilla.gnome.org/show_bug.cgi?id=644611
    
    The macro is going to be deprecated soon.
    (cherry picked from commit c994a9bfdc13aba1b7c5fd019853c68fb38148a6)
    
    Conflicts:
    
    	json-glib/json-reader.c
    	json-glib/json-reader.h

 json-glib/json-array.c         |    2 +-
 json-glib/json-node.c          |    6 +++---
 json-glib/json-object.c        |    2 +-
 json-glib/json-reader.c        |    4 ++--
 json-glib/json-reader.h        |    4 ++--
 json-glib/json-types-private.h |    2 +-
 json-glib/json-types.h         |    8 ++++----
 7 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/json-glib/json-array.c b/json-glib/json-array.c
index 0a19e0a..28fe23a 100644
--- a/json-glib/json-array.c
+++ b/json-glib/json-array.c
@@ -332,7 +332,7 @@ json_array_get_boolean_element (JsonArray *array,
  *
  * Since: 0.8
  */
-G_CONST_RETURN gchar *
+const gchar *
 json_array_get_string_element (JsonArray *array,
                                guint      index_)
 {
diff --git a/json-glib/json-node.c b/json-glib/json-node.c
index cf25cac..905c771 100644
--- a/json-glib/json-node.c
+++ b/json-glib/json-node.c
@@ -462,7 +462,7 @@ json_node_free (JsonNode *node)
  * Return value: a string containing the name of the type. The returned string
  *   is owned by the node and should never be modified or freed
  */
-G_CONST_RETURN gchar *
+const gchar *
 json_node_type_name (JsonNode *node)
 {
   g_return_val_if_fail (node != NULL, "(null)");
@@ -481,7 +481,7 @@ json_node_type_name (JsonNode *node)
   return "unknown";
 }
 
-G_CONST_RETURN gchar *
+const gchar *
 json_node_type_get_name (JsonNodeType node_type)
 {
   switch (node_type)
@@ -579,7 +579,7 @@ json_node_set_string (JsonNode    *node,
  *
  * Return value: a string value.
  */
-G_CONST_RETURN gchar *
+const gchar *
 json_node_get_string (JsonNode *node)
 {
   g_return_val_if_fail (node != NULL, NULL);
diff --git a/json-glib/json-object.c b/json-glib/json-object.c
index 4bcd053..e78a7b9 100644
--- a/json-glib/json-object.c
+++ b/json-glib/json-object.c
@@ -682,7 +682,7 @@ json_object_get_null_member (JsonObject  *object,
  *
  * Since: 0.8
  */
-G_CONST_RETURN gchar *
+const gchar *
 json_object_get_string_member (JsonObject  *object,
                                const gchar *member_name)
 {
diff --git a/json-glib/json-reader.c b/json-glib/json-reader.c
index bf29f31..4cbeaf9 100644
--- a/json-glib/json-reader.c
+++ b/json-glib/json-reader.c
@@ -333,7 +333,7 @@ json_reader_set_error (JsonReader      *reader,
  *
  * Since: 0.12
  */
-G_CONST_RETURN GError *
+const GError *
 json_reader_get_error (JsonReader *reader)
 {
   g_return_val_if_fail (JSON_IS_READER (reader), FALSE);
@@ -764,7 +764,7 @@ json_reader_get_double_value (JsonReader *reader)
  *
  * Since: 0.12
  */
-G_CONST_RETURN gchar *
+const gchar *
 json_reader_get_string_value (JsonReader *reader)
 {
   g_return_val_if_fail (JSON_IS_READER (reader), NULL);
diff --git a/json-glib/json-reader.h b/json-glib/json-reader.h
index a018195..126f248 100644
--- a/json-glib/json-reader.h
+++ b/json-glib/json-reader.h
@@ -113,7 +113,7 @@ JsonReader *           json_reader_new               (JsonNode     *node);
 void                   json_reader_set_root          (JsonReader   *reader,
                                                       JsonNode     *root);
 
-G_CONST_RETURN GError *json_reader_get_error         (JsonReader   *reader);
+const GError *         json_reader_get_error         (JsonReader   *reader);
 
 gboolean               json_reader_is_array          (JsonReader   *reader);
 gboolean               json_reader_read_element      (JsonReader   *reader,
@@ -131,7 +131,7 @@ gboolean               json_reader_is_value          (JsonReader   *reader);
 JsonNode *             json_reader_get_value         (JsonReader   *reader);
 gint64                 json_reader_get_int_value     (JsonReader   *reader);
 gdouble                json_reader_get_double_value  (JsonReader   *reader);
-G_CONST_RETURN gchar * json_reader_get_string_value  (JsonReader   *reader);
+const gchar *          json_reader_get_string_value  (JsonReader   *reader);
 gboolean               json_reader_get_boolean_value (JsonReader   *reader);
 gboolean               json_reader_get_null_value    (JsonReader   *reader);
 
diff --git a/json-glib/json-types-private.h b/json-glib/json-types-private.h
index d0e073e..e7f73f2 100644
--- a/json-glib/json-types-private.h
+++ b/json-glib/json-types-private.h
@@ -59,7 +59,7 @@ struct _JsonObject
   volatile gint ref_count;
 };
 
-G_CONST_RETURN gchar *json_node_type_get_name (JsonNodeType node_type);
+const gchar *json_node_type_get_name (JsonNodeType node_type);
 
 G_END_DECLS
 
diff --git a/json-glib/json-types.h b/json-glib/json-types.h
index b95c356..ecbf198 100644
--- a/json-glib/json-types.h
+++ b/json-glib/json-types.h
@@ -184,7 +184,7 @@ GType                 json_node_get_value_type  (JsonNode     *node);
 void                  json_node_set_parent      (JsonNode     *node,
                                                  JsonNode     *parent);
 JsonNode *            json_node_get_parent      (JsonNode     *node);
-G_CONST_RETURN gchar *json_node_type_name       (JsonNode     *node);
+const gchar *         json_node_type_name       (JsonNode     *node);
 
 void                  json_node_set_object      (JsonNode     *node,
                                                  JsonObject   *object);
@@ -204,7 +204,7 @@ void                  json_node_get_value       (JsonNode     *node,
                                                  GValue       *value);
 void                  json_node_set_string      (JsonNode     *node,
                                                  const gchar  *value);
-G_CONST_RETURN gchar *json_node_get_string      (JsonNode     *node);
+const gchar *         json_node_get_string      (JsonNode     *node);
 gchar *               json_node_dup_string      (JsonNode     *node);
 void                  json_node_set_int         (JsonNode     *node,
                                                  gint64        value);
@@ -265,7 +265,7 @@ gdouble               json_object_get_double_member  (JsonObject  *object,
                                                       const gchar *member_name);
 gboolean              json_object_get_boolean_member (JsonObject  *object,
                                                       const gchar *member_name);
-G_CONST_RETURN gchar *json_object_get_string_member  (JsonObject  *object,
+const gchar *         json_object_get_string_member  (JsonObject  *object,
                                                       const gchar *member_name);
 gboolean              json_object_get_null_member    (JsonObject  *object,
                                                       const gchar *member_name);
@@ -312,7 +312,7 @@ gdouble               json_array_get_double_element  (JsonArray   *array,
                                                       guint        index_);
 gboolean              json_array_get_boolean_element (JsonArray   *array,
                                                       guint        index_);
-G_CONST_RETURN gchar *json_array_get_string_element  (JsonArray   *array,
+const gchar *         json_array_get_string_element  (JsonArray   *array,
                                                       guint        index_);
 gboolean              json_array_get_null_element    (JsonArray   *array,
                                                       guint        index_);