gio-2.0: Really use generics in ListModel/Store

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index c5cb62e694bfacfc1ef3d6797aae2e12e6ce2f2f..04b1570d40b36e9f1b232ba870556832c898f6e2 100644 (file)
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1796,25 +1796,25 @@ namespace GLib {
                [Version (since = "2.44")]
                public ListStore (GLib.Type item_type = typeof (G));
                [Version (since = "2.44")]
-               public void append (GLib.Object item);
+               public void append ([CCode (type = "gpointer")] G item);
                [Version (since = "2.64")]
-               public bool find (GLib.Object item, out uint position);
+               public bool find ([CCode (type = "gpointer")] G item, out uint position);
                [Version (since = "2.64")]
-               public bool find_with_equal_func (GLib.Object? item, GLib.EqualFunc<GLib.Object> equal_func, out uint position);
+               public bool find_with_equal_func ([CCode (type = "gpointer")] G? item, GLib.EqualFunc<G> equal_func, out uint position);
                [Version (since = "2.74")]
-               public bool find_with_equal_func_full (GLib.Object? item, [CCode (delegate_target_pos = 2.5)] GLib.EqualFuncFull<GLib.Object> equal_func, out uint position);
+               public bool find_with_equal_func_full ([CCode (type = "gpointer")] G? item, [CCode (delegate_target_pos = 2.5)] GLib.EqualFuncFull<G> equal_func, out uint position);
                [Version (since = "2.44")]
-               public void insert (uint position, GLib.Object item);
+               public void insert (uint position, [CCode (type = "gpointer")] G item);
                [Version (since = "2.44")]
-               public uint insert_sorted (GLib.Object item, GLib.CompareDataFunc<GLib.Object> compare_func);
+               public uint insert_sorted ([CCode (type = "gpointer")] G item, GLib.CompareDataFunc<G> compare_func);
                [Version (since = "2.44")]
                public void remove (uint position);
                [Version (since = "2.44")]
                public void remove_all ();
                [Version (since = "2.46")]
-               public void sort (GLib.CompareDataFunc<GLib.Object> compare_func);
+               public void sort (GLib.CompareDataFunc<G> compare_func);
                [Version (since = "2.44")]
-               public void splice (uint position, uint n_removals, [CCode (array_length_cname = "n_additions", array_length_pos = 3.1, array_length_type = "guint")] GLib.Object[] additions);
+               public void splice (uint position, uint n_removals, [CCode (array_length_cname = "n_additions", array_length_pos = 3.1, array_length_type = "guint")] G[] additions);
                [NoAccessorMethod]
                [Version (since = "2.44")]
                public GLib.Type item_type { get; construct; }
@@ -4002,13 +4002,13 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gio.h", no_generic_args = true, type_cname = "GListModelInterface", type_id = "g_list_model_get_type ()")]
        public interface ListModel<G> : GLib.Object where G : GLib.Object {
                [Version (since = "2.44")]
-               public abstract GLib.Object? get_item (uint position);
+               public abstract G? get_item (uint position);
                [Version (since = "2.44")]
                public abstract GLib.Type get_item_type ();
                [Version (since = "2.44")]
                public abstract uint get_n_items ();
                [Version (since = "2.44")]
-               public GLib.Object? get_object (uint position);
+               public G? get_object (uint position);
                [HasEmitter]
                [Version (since = "2.44")]
                public signal void items_changed (uint position, uint removed, uint added);

diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 3a8483547c4816ecc3e811f8be2c2ad7544fcb73..8c2409ac816df360f2ae85443022c513bd05290c 100644 (file)
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -165,13 +165,19 @@ InputStream
   .skip_finish throws="GLib.IOError"
 ListModel type_parameters="GLib.Object:G"
   .get_item#virtual_method skip
-  .get_item#method skip=false abstract type="GLib.Object?"
+  .get_item#method skip=false abstract type="G?"
+  .get_object type="G?"
 ListStore type_parameters="GLib.Object:G" implements="GLib.ListModel<G>"
-  .find_with_equal_func.equal_func type_arguments="GLib.Object"
-  .find_with_equal_func_full.equal_func type_arguments="GLib.Object"
-  .insert_sorted.compare_func type_arguments="GLib.Object"
+  .append.item type="G"
+  .find.item type="G"
+  .find_*.item type="G?"
+  .find_with_equal_func.equal_func type_arguments="G"
+  .find_with_equal_func_full.equal_func type_arguments="G"
+  .insert*.item type="G"
+  .insert_sorted.compare_func type_arguments="G"
   .new.item_type default=typeof(G)
-  .sort.compare_func type_arguments="GLib.Object"
+  .sort.compare_func type_arguments="G"
+  .splice.additions type="G[]"
 MemoryInputStream
   .add_data.destroy default=GLib.g_free
 MemoryInputStream