[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

[platform/upstream/glib.git] / gobject / gvaluearray.h

diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index 456962e..a52fe2c 100644 (file)
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * gvaluearray.h: GLib array type holding GValues
  */
@@ -27,14 +25,27 @@
 
 #include       <gobject/gvalue.h>
 
+G_BEGIN_DECLS
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+/**
+ * G_TYPE_VALUE_ARRAY:
+ *
+ * The type ID of the "GValueArray" type which is a boxed type,
+ * used to pass around pointers to GValueArrays.
+ *
+ * Deprecated: 2.32: Use #GArray instead of #GValueArray
+ */
+#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ())
 
 /* --- typedefs & structs --- */
 typedef struct _GValueArray GValueArray;
+/**
+ * GValueArray:
+ * @n_values: number of values contained in the array
+ * @values: array of values
+ * 
+ * A #GValueArray contains an array of #GValue elements.
+ */
 struct _GValueArray
 {
   guint   n_values;
@@ -44,32 +55,50 @@ struct _GValueArray
   guint   n_prealloced;
 };
 
-
 /* --- prototypes --- */
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
+GType           g_value_array_get_type       (void) G_GNUC_CONST;
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValue*                g_value_array_get_nth        (GValueArray       *value_array,
-                                             guint              index);
+                                             guint              index_);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_new            (guint              n_prealloced);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 void           g_value_array_free           (GValueArray       *value_array);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_copy           (const GValueArray *value_array);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_prepend        (GValueArray       *value_array,
                                              const GValue      *value);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_append         (GValueArray       *value_array,
                                              const GValue      *value);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_insert         (GValueArray       *value_array,
-                                             guint              index,
+                                             guint              index_,
                                              const GValue      *value);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_remove         (GValueArray       *value_array,
-                                             guint              index);
+                                             guint              index_);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_sort           (GValueArray       *value_array,
                                              GCompareFunc       compare_func);
+
+GLIB_DEPRECATED_IN_2_32_FOR(GArray)
 GValueArray*   g_value_array_sort_with_data (GValueArray       *value_array,
                                              GCompareDataFunc   compare_func,
                                              gpointer           user_data);
 
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __G_VALUE_ARRAY_H__ */