From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 9 Nov 2020 12:59:35 +0000 (+0100)
Subject: glib-2.0: Make PtrArray a subclass of GenericArray
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b4e3467ddcc9179a1d39f7cac3341c87c62747;p=thirdparty%2Fvala.git

glib-2.0: Make PtrArray a subclass of GenericArray
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 3ed2b2a4f..147b1a658 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -5370,33 +5370,15 @@ namespace GLib {
 	/* Pointer Arrays */
 
 	[Compact]
-	[Version (since = "2.22", deprecated_since = "vala-0.26", replacement="GenericArray")]
-	[CCode (ref_function = "g_ptr_array_ref", unref_function = "g_ptr_array_unref", type_id = "G_TYPE_PTR_ARRAY")]
-	public class PtrArray {
+	[Version (since = "2.22")]
+	public class PtrArray : GenericArray<void*> {
 		public PtrArray ();
 		[Version (since = "2.22")]
 		public PtrArray.with_free_func (GLib.DestroyNotify? element_free_func);
 		[CCode (cname = "g_ptr_array_sized_new")]
 		public PtrArray.sized (uint reserved_size);
-		public void add (void* data);
-		[Version (since = "2.4")]
-		public void foreach (GLib.Func<void*> func);
-		[CCode (cname = "g_ptr_array_index")]
-		public void* index(uint index);
-		public bool remove (void* data);
-		public void* remove_index (uint index);
-		public bool remove_fast (void *data);
-		public void remove_index_fast (uint index);
-		[Version (since = "2.4")]
-		public void remove_range (uint index, uint length);
-		public void sort (CompareFunc<void**> compare_func);
-		public void sort_with_data (CompareDataFunc<void**> compare_func);
 		[Version (since = "2.22")]
 		public void set_free_func (GLib.DestroyNotify? element_free_function);
-		public void set_size (int length);
-
-		public uint len;
-		public void** pdata;
 	}
 
 	[CCode (cname = "GEqualFunc", has_target = false)]