GNOME.org
 

[glib] Convert remaining uses of 'Rename to:'

commit d9de830b65224f6e8f1e1b9284bd049b86b56619
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Mar 12 16:53:18 2015 -0400

    Convert remaining uses of 'Rename to:'
    
    This was replaced by (rename-to) in 2013 (see bug 676133).
    
    They're also causing gtk-doc trouble, so let's get rid of them.

 gio/gdbusinterface.c    |    4 +---
 gio/gdbusnameowning.c   |    8 ++------
 gio/gdbusnamewatching.c |    8 ++------
 gio/gsubprocess.c       |    3 +--
 glib/giochannel.c       |    3 +--
 glib/glib-unix.c        |    3 +--
 glib/gmain.c            |   12 ++++--------
 gobject/gbinding.c      |    4 +---
 gobject/gobject.c       |    3 +--
 gobject/gvaluearray.c   |    3 +--
 10 files changed, 15 insertions(+), 36 deletions(-)
---
diff --git a/gio/gdbusinterface.c b/gio/gdbusinterface.c
index 5c1b355..4f1ce3f 100644
--- a/gio/gdbusinterface.c
+++ b/gio/gdbusinterface.c
@@ -86,7 +86,7 @@ g_dbus_interface_get_object (GDBusInterface *interface_)
 }
 
 /**
- * g_dbus_interface_dup_object:
+ * g_dbus_interface_dup_object: (rename-to g_dbus_interface_get_object)
  * @interface_: An exported D-Bus interface.
  *
  * Gets the #GDBusObject that @interface_ belongs to, if any.
@@ -95,8 +95,6 @@ g_dbus_interface_get_object (GDBusInterface *interface_)
  * reference should be freed with g_object_unref().
  *
  * Since: 2.32
- *
- * Rename to: g_dbus_interface_get_object
  */
 GDBusObject *
 g_dbus_interface_dup_object (GDBusInterface *interface_)
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index cb7cb09..00b2dfd 100644
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.c
@@ -784,7 +784,7 @@ bus_own_name_free_func (gpointer user_data)
 }
 
 /**
- * g_bus_own_name_with_closures:
+ * g_bus_own_name_with_closures: (rename-to g_bus_own_name)
  * @bus_type: the type of bus to own a name on
  * @name: the well-known name to own
  * @flags: a set of flags from the #GBusNameOwnerFlags enumeration
@@ -801,8 +801,6 @@ bus_own_name_free_func (gpointer user_data)
  * Returns: an identifier (never 0) that an be used with
  *     g_bus_unown_name() to stop owning the name.
  *
- * Rename to: g_bus_own_name
- *
  * Since: 2.26
  */
 guint
@@ -826,7 +824,7 @@ g_bus_own_name_with_closures (GBusType            bus_type,
 }
 
 /**
- * g_bus_own_name_on_connection_with_closures:
+ * g_bus_own_name_on_connection_with_closures: (rename-to g_bus_own_name_on_connection)
  * @connection: a #GDBusConnection
  * @name: the well-known name to own
  * @flags: a set of flags from the #GBusNameOwnerFlags enumeration
@@ -841,8 +839,6 @@ g_bus_own_name_with_closures (GBusType            bus_type,
  * Returns: an identifier (never 0) that an be used with
  *     g_bus_unown_name() to stop owning the name.
  *
- * Rename to: g_bus_own_name_on_connection
- *
  * Since: 2.26
  */
 guint
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index adf53c3..07713db 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -740,7 +740,7 @@ bus_watch_name_free_func (gpointer user_data)
 }
 
 /**
- * g_bus_watch_name_with_closures:
+ * g_bus_watch_name_with_closures: (rename-to g_bus_watch_name)
  * @bus_type: The type of bus to watch a name on.
  * @name: The name (well-known or unique) to watch.
  * @flags: Flags from the #GBusNameWatcherFlags enumeration.
@@ -755,8 +755,6 @@ bus_watch_name_free_func (gpointer user_data)
  * Returns: An identifier (never 0) that an be used with
  * g_bus_unwatch_name() to stop watching the name.
  *
- * Rename to: g_bus_watch_name
- *
  * Since: 2.26
  */
 guint
@@ -776,7 +774,7 @@ g_bus_watch_name_with_closures (GBusType                 bus_type,
 }
 
 /**
- * g_bus_watch_name_on_connection_with_closures:
+ * g_bus_watch_name_on_connection_with_closures: (rename-to g_bus_watch_name_on_connection)
  * @connection: A #GDBusConnection.
  * @name: The name (well-known or unique) to watch.
  * @flags: Flags from the #GBusNameWatcherFlags enumeration.
@@ -791,8 +789,6 @@ g_bus_watch_name_with_closures (GBusType                 bus_type,
  * Returns: An identifier (never 0) that an be used with
  * g_bus_unwatch_name() to stop watching the name.
  *
- * Rename to: g_bus_watch_name_on_connection
- *
  * Since: 2.26
  */
 guint g_bus_watch_name_on_connection_with_closures (
diff --git a/gio/gsubprocess.c b/gio/gsubprocess.c
index ddb8bb1..170e7e7 100644
--- a/gio/gsubprocess.c
+++ b/gio/gsubprocess.c
@@ -696,7 +696,7 @@ g_subprocess_new (GSubprocessFlags   flags,
 }
 
 /**
- * g_subprocess_newv:
+ * g_subprocess_newv: (rename-to g_subprocess_new)
  * @argv: (array zero-terminated=1) (element-type utf8): commandline arguments for the subprocess
  * @flags: flags that define the behaviour of the subprocess
  * @error: (allow-none): return location for an error, or %NULL
@@ -709,7 +709,6 @@ g_subprocess_new (GSubprocessFlags   flags,
  *   will be set)
  *
  * Since: 2.40
- * Rename to: g_subprocess_new
  */
 GSubprocess *
 g_subprocess_newv (const gchar * const  *argv,
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 19fc1d4..f40b86d 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -616,7 +616,7 @@ g_io_create_watch (GIOChannel   *channel,
 }
 
 /**
- * g_io_add_watch_full:
+ * g_io_add_watch_full: (rename-to g_io_add_watch)
  * @channel: a #GIOChannel
  * @priority: the priority of the #GIOChannel source
  * @condition: the condition to watch for
@@ -632,7 +632,6 @@ g_io_create_watch (GIOChannel   *channel,
  * You can do these steps manually if you need greater control.
  *
  * Returns: the event source id
- * Rename to: g_io_add_watch
  */
 guint 
 g_io_add_watch_full (GIOChannel    *channel,
diff --git a/glib/glib-unix.c b/glib/glib-unix.c
index 3e6cdbe..6203889 100644
--- a/glib/glib-unix.c
+++ b/glib/glib-unix.c
@@ -222,7 +222,7 @@ g_unix_signal_source_new (int signum)
 }
 
 /**
- * g_unix_signal_add_full:
+ * g_unix_signal_add_full: (rename-to g_unix_signal_add)
  * @priority: the priority of the signal source. Typically this will be in
  *            the range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH.
  * @signum: Signal number
@@ -236,7 +236,6 @@ g_unix_signal_source_new (int signum)
  *
  * Returns: An ID (greater than 0) for the event source
  *
- * Rename to: g_unix_signal_add
  * Since: 2.30
  */
 guint
diff --git a/glib/gmain.c b/glib/gmain.c
index d5661bb..f1bb254 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -4613,7 +4613,7 @@ g_timeout_source_new_seconds (guint interval)
 
 
 /**
- * g_timeout_add_full:
+ * g_timeout_add_full: (rename-to g_timeout_add)
  * @priority: the priority of the timeout source. Typically this will be in
  *            the range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH.
  * @interval: the time between calls to the function, in milliseconds
@@ -4645,7 +4645,6 @@ g_timeout_source_new_seconds (guint interval)
  * See g_get_monotonic_time().
  * 
  * Returns: the ID (greater than 0) of the event source.
- * Rename to: g_timeout_add
  **/
 guint
 g_timeout_add_full (gint           priority,
@@ -4716,7 +4715,7 @@ g_timeout_add (guint32        interval,
 }
 
 /**
- * g_timeout_add_seconds_full:
+ * g_timeout_add_seconds_full: (rename-to g_timeout_add_seconds)
  * @priority: the priority of the timeout source. Typically this will be in
  *            the range between #G_PRIORITY_DEFAULT and #G_PRIORITY_HIGH.
  * @interval: the time between calls to the function, in seconds
@@ -4760,7 +4759,6 @@ g_timeout_add (guint32        interval,
  * 
  * Returns: the ID (greater than 0) of the event source.
  *
- * Rename to: g_timeout_add_seconds
  * Since: 2.14
  **/
 guint
@@ -5260,7 +5258,7 @@ g_child_watch_source_new (GPid pid)
 }
 
 /**
- * g_child_watch_add_full:
+ * g_child_watch_add_full: (rename-to g_child_watch_add)
  * @priority: the priority of the idle source. Typically this will be in the
  *            range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE.
  * @pid:      process to watch. On POSIX the positive pid of a child process. On
@@ -5294,7 +5292,6 @@ g_child_watch_source_new (GPid pid)
  *
  * Returns: the ID (greater than 0) of the event source.
  *
- * Rename to: g_child_watch_add
  * Since: 2.4
  **/
 guint
@@ -5421,7 +5418,7 @@ g_idle_source_new (void)
 }
 
 /**
- * g_idle_add_full:
+ * g_idle_add_full: (rename-to g_idle_add)
  * @priority: the priority of the idle source. Typically this will be in the
  *            range between #G_PRIORITY_DEFAULT_IDLE and #G_PRIORITY_HIGH_IDLE.
  * @function: function to call
@@ -5439,7 +5436,6 @@ g_idle_source_new (void)
  * use a custom main context.
  * 
  * Returns: the ID (greater than 0) of the event source.
- * Rename to: g_idle_add
  **/
 guint 
 g_idle_add_full (gint           priority,
diff --git a/gobject/gbinding.c b/gobject/gbinding.c
index 2237e5e..7bcdb4c 100644
--- a/gobject/gbinding.c
+++ b/gobject/gbinding.c
@@ -1165,7 +1165,7 @@ bind_with_closures_free_func (gpointer data)
 }
 
 /**
- * g_object_bind_property_with_closures:
+ * g_object_bind_property_with_closures: (rename-to g_object_bind_property_full)
  * @source: (type GObject.Object): the source #GObject
  * @source_property: the property on @source to bind
  * @target: (type GObject.Object): the target #GObject
@@ -1184,8 +1184,6 @@ bind_with_closures_free_func (gpointer data)
  * g_object_bind_property_full(), using #GClosures instead of
  * function pointers.
  *
- * Rename to: g_object_bind_property_full
- *
  * Returns: (transfer none): the #GBinding instance representing the
  *     binding between the two #GObject instances. The binding is released
  *     whenever the #GBinding reference count reaches zero.
diff --git a/gobject/gobject.c b/gobject/gobject.c
index ae6265e..c321aa7 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -1835,7 +1835,7 @@ g_object_new_internal (GObjectClass          *class,
 }
 
 /**
- * g_object_newv:
+ * g_object_newv: (rename-to g_object_new)
  * @object_type: the type id of the #GObject subtype to instantiate
  * @n_parameters: the length of the @parameters array
  * @parameters: (array length=n_parameters): an array of #GParameter
@@ -1845,7 +1845,6 @@ g_object_new_internal (GObjectClass          *class,
  * Construction parameters (see #G_PARAM_CONSTRUCT, #G_PARAM_CONSTRUCT_ONLY)
  * which are not explicitly specified are set to their default values.
  *
- * Rename to: g_object_new
  * Returns: (type GObject.Object) (transfer full): a new instance of
  * @object_type
  */
diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c
index fb92ba8..43cda60 100644
--- a/gobject/gvaluearray.c
+++ b/gobject/gvaluearray.c
@@ -353,7 +353,7 @@ g_value_array_sort (GValueArray *value_array,
 }
 
 /**
- * g_value_array_sort_with_data:
+ * g_value_array_sort_with_data: (rename-to g_value_array_sort)
  * @value_array: #GValueArray to sort
  * @compare_func: (scope call): function to compare elements
  * @user_data: (closure): extra data argument provided for @compare_func
@@ -364,7 +364,6 @@ g_value_array_sort (GValueArray *value_array,
  * The current implementation uses the same sorting algorithm as standard
  * C qsort() function.
  *
- * Rename to: g_value_array_sort
  * Returns: (transfer none): the #GValueArray passed in as @value_array
  *
  * Deprecated: 2.32: Use #GArray and g_array_sort_with_data().
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]