From: Matthias Berndt Date: Fri, 7 Oct 2016 21:42:29 +0000 (+0200) Subject: vapi: Add missing type parameters for delegates X-Git-Tag: 0.35.1~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41942694292e63346f9f7bdf7c6b52aa91bead2e;p=thirdparty%2Fvala.git vapi: Add missing type parameters for delegates https://bugzilla.gnome.org/show_bug.cgi?id=772204 --- diff --git a/vapi/gdl-1.0.vapi b/vapi/gdl-1.0.vapi index cc77b87f8..7d8295a3a 100644 --- a/vapi/gdl-1.0.vapi +++ b/vapi/gdl-1.0.vapi @@ -126,8 +126,8 @@ namespace Gdl { [CCode (has_construct_function = false)] protected DockMaster (); public void add (Gdl.DockObject object); - public void @foreach (GLib.Func function); - public void foreach_toplevel (bool include_controller, GLib.Func function); + public void @foreach (GLib.Func function); + public void foreach_toplevel (bool include_controller, GLib.Func function); public unowned Gdl.DockObject get_controller (); public unowned Gdl.DockObject get_object (string nick_name); public void remove (Gdl.DockObject object); diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 833071197..69433a2a7 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -1610,13 +1610,13 @@ namespace GLib { [Version (since = "2.44")] public void insert (uint position, GLib.Object item); [Version (since = "2.44")] - public uint insert_sorted (GLib.Object item, GLib.CompareDataFunc compare_func); + public uint insert_sorted (GLib.Object item, GLib.CompareDataFunc 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 compare_func); + public void sort (GLib.CompareDataFunc 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); [NoAccessorMethod] @@ -4678,10 +4678,10 @@ namespace GLib { public delegate GLib.File VfsFileLookupFunc (GLib.Vfs vfs, string identifier); [CCode (cheader_filename = "gio/gio.h")] [Version (deprecated_since = "vala-0.16", replacement = "File.equal")] - public static GLib.EqualFunc file_equal; + public static GLib.EqualFunc file_equal; [CCode (cheader_filename = "gio/gio.h")] [Version (deprecated_since = "vala-0.16", replacement = "File.hash")] - public static GLib.HashFunc file_hash; + public static GLib.HashFunc file_hash; [CCode (cheader_filename = "glib.h", cname = "g_realloc")] public static GLib.ReallocFunc g_realloc; [CCode (cheader_filename = "gio/gio.h")] diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi index 84b097d4d..4cf561aab 100644 --- a/vapi/gstreamer-0.10.vapi +++ b/vapi/gstreamer-0.10.vapi @@ -643,7 +643,7 @@ namespace Gst { public unowned Gst.IndexEntry? add_object (int id, string key, GLib.Type type, void* object); public virtual void commit (int id); public virtual unowned Gst.IndexEntry? get_assoc_entry (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value); - public unowned Gst.IndexEntry? get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func); + public unowned Gst.IndexEntry? get_assoc_entry_full (int id, Gst.IndexLookupMethod method, Gst.AssocFlags flags, Gst.Format format, int64 value, GLib.CompareDataFunc func); public Gst.IndexCertainty get_certainty (); public int get_group (); public virtual bool get_writer_id (Gst.Object writer, out int id); @@ -706,9 +706,9 @@ namespace Gst { public GLib.Type type; [CCode (has_construct_function = false)] public Iterator (uint size, GLib.Type type, GLib.Mutex @lock, ref uint32 master_cookie, Gst.IteratorNextFunction next, Gst.IteratorItemFunction item, Gst.IteratorResyncFunction resync, Gst.IteratorFreeFunction free); - public T find_custom (GLib.CompareFunc func, T user_data); + public T find_custom (GLib.CompareFunc func, T user_data); public Gst.IteratorResult fold ([CCode (delegate_target_pos = 2.1)] Gst.IteratorFoldFunction func, out Gst.Value ret); - public Gst.IteratorResult @foreach (GLib.Func func); + public Gst.IteratorResult @foreach (GLib.Func func); [CCode (has_construct_function = false)] public Iterator.list (GLib.Type type, GLib.Mutex @lock, ref uint32 master_cookie, GLib.List list, void* owner, Gst.IteratorItemFunction item, Gst.IteratorDisposeFunction free); public Gst.IteratorResult next (out T elem); @@ -3032,7 +3032,7 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public static bool uri_protocol_is_valid (string protocol); [CCode (cheader_filename = "gst/gst.h")] - public static void* util_array_binary_search (void* array, uint num_elements, size_t element_size, GLib.CompareDataFunc search_func, Gst.SearchMode mode, void* search_data); + public static void* util_array_binary_search (void* array, uint num_elements, size_t element_size, GLib.CompareDataFunc search_func, Gst.SearchMode mode, void* search_data); [CCode (cheader_filename = "gst/gst.h")] public static void util_double_to_fraction (double src, int dest_n, int dest_d); [CCode (cheader_filename = "gst/gst.h")] diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index 51387f52c..1468272bc 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -378,7 +378,7 @@ namespace Gst { } namespace Util { [CCode (cheader_filename = "gst/gst.h")] - public static void* array_binary_search (void* array, uint num_elements, size_t element_size, [CCode (delegate_target_pos = 6.1)] GLib.CompareDataFunc search_func, Gst.SearchMode mode, void* search_data); + public static void* array_binary_search (void* array, uint num_elements, size_t element_size, [CCode (delegate_target_pos = 6.1)] GLib.CompareDataFunc search_func, Gst.SearchMode mode, void* search_data); [CCode (cheader_filename = "gst/gst.h")] public static void double_to_fraction (double src, out int dest_n, out int dest_d); [CCode (cheader_filename = "gst/gst.h")] diff --git a/vapi/libgda-4.0.vapi b/vapi/libgda-4.0.vapi index 0082d901b..d1c8e3354 100644 --- a/vapi/libgda-4.0.vapi +++ b/vapi/libgda-4.0.vapi @@ -722,7 +722,7 @@ namespace Gda { public void clear (); public unowned Gda.QuarkList copy (); public unowned string find (string name); - public void @foreach (GLib.HFunc func); + public void @foreach (GLib.HFunc func); [CCode (has_construct_function = false)] public QuarkList.from_string (string str); public void remove (string name); diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi index 6e1f2ab2b..69e72283a 100644 --- a/vapi/libgsf-1.vapi +++ b/vapi/libgsf-1.vapi @@ -21,7 +21,7 @@ namespace Gsf { public class DocMetaData : GLib.Object { [CCode (has_construct_function = false)] public DocMetaData (); - public void @foreach (GLib.HFunc func); + public void @foreach (GLib.HFunc func); public void insert (string name, GLib.Value value); public unowned Gsf.DocProp? lookup (string name); public void remove (string name); diff --git a/vapi/metadata/Gio-2.0-custom.vala b/vapi/metadata/Gio-2.0-custom.vala index f312ea688..0dd38f22f 100644 --- a/vapi/metadata/Gio-2.0-custom.vala +++ b/vapi/metadata/Gio-2.0-custom.vala @@ -164,9 +164,9 @@ namespace GLib { [CCode (cheader_filename = "gio/gio.h", instance_pos = 7.9)] public delegate bool DBusInterfaceSetPropertyFunc (GLib.DBusConnection connection, string sender, string object_path, string interface_name, string property_name, GLib.Variant value) throws GLib.Error; [Version (deprecated_since = "vala-0.16", replacement = "File.equal")] - public static GLib.EqualFunc file_equal; + public static GLib.EqualFunc file_equal; [Version (deprecated_since = "vala-0.16", replacement = "File.hash")] - public static GLib.HashFunc file_hash; + public static GLib.HashFunc file_hash; [Version (deprecated_since = "vala-0.12", replacement = "GLib.ContentType.can_be_executable")] [CCode (cname = "g_content_type_can_be_executable", cheader_filename = "gio/gio.h")] public static bool g_content_type_can_be_executable (string type); diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata index c9552e43e..4911f6acc 100644 --- a/vapi/metadata/Gio-2.0.metadata +++ b/vapi/metadata/Gio-2.0.metadata @@ -152,6 +152,9 @@ InputStream ListModel .get_item#virtual_method skip .get_item#method skip=false abstract +ListStore + .insert_sorted.compare_func type_arguments="GLib.Object" + .sort.compare_func type_arguments="GLib.Object" MemoryInputStream .add_data.destroy default=GLib.g_free MemoryInputStream diff --git a/vapi/metadata/Gst-1.0.metadata b/vapi/metadata/Gst-1.0.metadata index d005e210b..c1cda2265 100644 --- a/vapi/metadata/Gst-1.0.metadata +++ b/vapi/metadata/Gst-1.0.metadata @@ -60,7 +60,7 @@ parse_launchv_full floating parse_launch_full floating parse_bin_from_description_full floating -// Variaidc functions +// Variadic functions *_valist skip=false *.*_valist skip=false *.*_valist_* skip=false @@ -236,3 +236,5 @@ URIHandler .get_protocols abstract .get_uri_type abstract vfunc_name="get_type" +util_array_binary_search.search_func type_arguments="void*" + diff --git a/vapi/packages/gdl-1.0/gdl-1.0.metadata b/vapi/packages/gdl-1.0/gdl-1.0.metadata index 54ed19dc5..c9fb07d4b 100644 --- a/vapi/packages/gdl-1.0/gdl-1.0.metadata +++ b/vapi/packages/gdl-1.0/gdl-1.0.metadata @@ -3,4 +3,5 @@ GdlDockObject::detach name="detached" GdlDockObject::dock name="docked" gdl_dock_object_dock.other_data nullable="1" gdl_dock_item_dock_to.target nullable="1" - +gdl_dock_master_foreach.function type_arguments="DockObject" +gdl_dock_master_foreach_toplevel.function type_arguments="DockObject" diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata index 23b01f13a..0ccb091be 100644 --- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata +++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata @@ -221,6 +221,7 @@ gst_index_set_resolver_full name="set_resolver" gst_index_get_writer_id.id is_out="1" gst_index_add* nullable="1" gst_index_get_assoc_entry* nullable="1" +gst_index_get_assoc_entry_full.func type_arguments="void*" GstIndexAssociation hidden="1" GstIndexGroup hidden="1" GstIndexEntry.* hidden="1" @@ -248,10 +249,12 @@ gst_iterator_new_list.item type_arguments="T" gst_iterator_next.elem type_name="T" is_out="1" transfer_ownership="1" gst_iterator_fold.func type_arguments="T" delegate_target_pos="2.1" gst_iterator_fold.ret type_name="Gst.Value" is_out="1" +gst_iterator_foreach.func type_arguments="T" gst_iterator_new_list.list type_arguments="T" gst_iterator_new.master_cookie is_ref="1" gst_iterator_new_list.master_cookie is_ref="1" gst_iterator_find_custom type_name="T" transfer_ownership="1" +gst_iterator_find_custom.func type_arguments="T" gst_iterator_find_custom.user_data type_name="T" hidden="0" gst_iterator_new_single.object type_name="T" gst_iterator_filter hidden="1" @@ -723,3 +726,4 @@ GstValueSubtractFunc.* type_name="Gst.Value" GstValueUnionFunc.* type_name="Gst.Value" GstXML.topelements type_arguments="Element" gst_xml_get_topelements type_arguments="Element" +gst_util_array_binary_search.search_func type_arguments="void*" diff --git a/vapi/packages/libgda-4.0/libgda-4.0.metadata b/vapi/packages/libgda-4.0/libgda-4.0.metadata index abf803e26..19a595b27 100644 --- a/vapi/packages/libgda-4.0/libgda-4.0.metadata +++ b/vapi/packages/libgda-4.0/libgda-4.0.metadata @@ -79,3 +79,4 @@ GdaDsnInfo is_value_type="1" GdaXaTransactionId.data type_name="uint8[]" gda_xa_transaction_commit.cnc_to_recover is_out="1" transfer_ownership="1" type_arguments="Connection" gda_xa_transaction_commit_recovered.cnc_to_recover is_out="1" transfer_ownership="1" type_arguments="Connection" +gda_quark_list_foreach.func type_arguments="string" type_arguments="string" diff --git a/vapi/packages/libgsf-1/libgsf-1.metadata b/vapi/packages/libgsf-1/libgsf-1.metadata index 811e8aaa3..96181c95f 100644 --- a/vapi/packages/libgsf-1/libgsf-1.metadata +++ b/vapi/packages/libgsf-1/libgsf-1.metadata @@ -108,6 +108,7 @@ gsf_input_Read.optional_buffer is_array="1" no_array_length="1" nullable="1" gsf_input_Read is_array="1" nullable="1" no_array_length="1" gsf_doc_meta_data_lookup nullable="1" gsf_doc_meta_data_steal nullable="1" +gsf_doc_meta_data_foreach.func type_arguments="string" type_arguments="DocProp" gsf_infile_child_by_vname nullable="1" gsf_infile_child_by_name nullable="1" gsf_infile_child_by_index nullable="1"