[vala/staging] gio-2.0, gtk+-3.0, gtk4: Drop explicit c-type attributes of va_list parameters



commit c3db423aaf254ebf4e2bb70464798df57e806436
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Tue Jan 26 13:03:17 2021 +0100

    gio-2.0,gtk+-3.0,gtk4: Drop explicit c-type attributes of va_list parameters

 vapi/gio-2.0.vapi              |  2 +-
 vapi/gtk+-3.0.vapi             | 30 +++++++++++++++---------------
 vapi/gtk4.vapi                 | 12 ++++++------
 vapi/metadata/Gio-2.0.metadata |  1 -
 vapi/metadata/Gtk-3.0.metadata |  2 --
 vapi/metadata/Gtk-4.0.metadata |  2 --
 6 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 13ba6578c..5c1f6d57d 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -885,7 +885,7 @@ namespace GLib {
                [DestroysInstance]
                public void return_error_literal (GLib.Quark domain, int code, string message);
                [DestroysInstance]
-               public void return_error_valist (GLib.Quark domain, int code, string format, [CCode (type = 
"va_list")] va_list var_args);
+               public void return_error_valist (GLib.Quark domain, int code, string format, va_list 
var_args);
                [DestroysInstance]
                public void return_gerror (GLib.Error error);
                [DestroysInstance]
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 39e006b88..f0133ef31 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1391,13 +1391,13 @@ namespace Gtk {
                [Version (since = "3.0")]
                public void cell_get_property (Gtk.CellRenderer renderer, string property_name, ref 
GLib.Value value);
                [Version (since = "3.0")]
-               public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, [CCode 
(type = "va_list")] va_list var_args);
+               public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, va_list 
var_args);
                [Version (since = "3.0")]
                public void cell_set (Gtk.CellRenderer renderer, ...);
                [Version (since = "3.0")]
                public void cell_set_property (Gtk.CellRenderer renderer, string property_name, GLib.Value 
value);
                [Version (since = "3.0")]
-               public void cell_set_valist (Gtk.CellRenderer renderer, string first_property_name, [CCode 
(type = "va_list")] va_list var_args);
+               public void cell_set_valist (Gtk.CellRenderer renderer, string first_property_name, va_list 
var_args);
                [Version (since = "3.0")]
                public virtual Gtk.CellAreaContext copy_context (Gtk.CellAreaContext context);
                [Version (since = "3.0")]
@@ -2325,14 +2325,14 @@ namespace Gtk {
                public void add_with_properties (Gtk.Widget widget, ...);
                public void child_get (Gtk.Widget child, ...);
                public void child_get_property (Gtk.Widget child, string property_name, ref GLib.Value value);
-               public void child_get_valist (Gtk.Widget child, string first_property_name, [CCode (type = 
"va_list")] va_list var_args);
+               public void child_get_valist (Gtk.Widget child, string first_property_name, va_list var_args);
                [Version (since = "3.2")]
                public void child_notify (Gtk.Widget child, string child_property);
                [Version (since = "3.18")]
                public void child_notify_by_pspec (Gtk.Widget child, GLib.ParamSpec pspec);
                public void child_set (Gtk.Widget child, ...);
                public void child_set_property (Gtk.Widget child, string property_name, GLib.Value value);
-               public void child_set_valist (Gtk.Widget child, string first_property_name, [CCode (type = 
"va_list")] va_list var_args);
+               public void child_set_valist (Gtk.Widget child, string first_property_name, va_list var_args);
                public virtual GLib.Type child_type ();
                [Version (deprecated_since = "vala-0.40", replacement = "find_child_property")]
                public class unowned GLib.ParamSpec? class_find_child_property (string property_name);
@@ -4736,7 +4736,7 @@ namespace Gtk {
                [CCode (sentinel = "-1")]
                public void @set (Gtk.TreeIter iter, ...);
                public void set_column_types ([CCode (array_length_cname = "n_columns", array_length_pos = 
0.5)] GLib.Type[] types);
-               public void set_valist (Gtk.TreeIter iter, [CCode (type = "va_list")] va_list var_args);
+               public void set_valist (Gtk.TreeIter iter, va_list var_args);
                public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
                [Version (since = "2.12")]
                public void set_valuesv (Gtk.TreeIter iter, [CCode (array_length_cname = "n_values", 
array_length_pos = 3.1)] int[] columns, [CCode (array_length_cname = "n_values", array_length_pos = 3.1)] 
GLib.Value[] values);
@@ -7498,7 +7498,7 @@ namespace Gtk {
                [Version (since = "2.16")]
                public void get_style_property (GLib.Type widget_type, string property_name, ref GLib.Value 
value);
                [Version (since = "2.16")]
-               public void get_valist (GLib.Type widget_type, string first_property_name, [CCode (type = 
"va_list")] va_list var_args);
+               public void get_valist (GLib.Type widget_type, string first_property_name, va_list var_args);
                [Version (since = "3.0")]
                public bool has_context ();
                [NoWrapper]
@@ -7567,9 +7567,9 @@ namespace Gtk {
                public void get_style (...);
                public void get_style_property (string property_name, ref GLib.Value value);
                [Version (since = "3.0")]
-               public void get_style_valist ([CCode (type = "va_list")] va_list args);
+               public void get_style_valist (va_list args);
                [Version (since = "3.0")]
-               public void get_valist (Gtk.StateFlags state, [CCode (type = "va_list")] va_list args);
+               public void get_valist (Gtk.StateFlags state, va_list args);
                [Version (since = "3.0")]
                public bool has_class (string class_name);
                [Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
@@ -7705,7 +7705,7 @@ namespace Gtk {
                [Version (deprecated = true, deprecated_since = "3.16", since = "3.0")]
                public bool get_property (string property, Gtk.StateFlags state, out GLib.Value value);
                [Version (deprecated = true, deprecated_since = "3.16", since = "3.0")]
-               public void get_valist (Gtk.StateFlags state, [CCode (type = "va_list")] va_list args);
+               public void get_valist (Gtk.StateFlags state, va_list args);
                [Version (deprecated = true, deprecated_since = "3.8", since = "3.0")]
                public unowned Gtk.SymbolicColor lookup_color (string name);
                [Version (deprecated = true, deprecated_since = "3.8", since = "3.0")]
@@ -7721,7 +7721,7 @@ namespace Gtk {
                [Version (deprecated = true, deprecated_since = "3.16", since = "3.0")]
                public void set_property (string property, Gtk.StateFlags state, GLib.Value value);
                [Version (deprecated = true, deprecated_since = "3.16", since = "3.0")]
-               public void set_valist (Gtk.StateFlags state, [CCode (type = "va_list")] va_list args);
+               public void set_valist (Gtk.StateFlags state, va_list args);
                [Version (deprecated = true, deprecated_since = "3.16", since = "3.0")]
                public void unset_property (string property, Gtk.StateFlags state);
        }
@@ -8408,9 +8408,9 @@ namespace Gtk {
                [Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
                public void get_style_property (string property_name, ref GLib.Value value);
                [Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
-               public void get_style_valist ([CCode (type = "va_list")] va_list args);
+               public void get_style_valist (va_list args);
                [Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
-               public void get_valist (Gtk.StateFlags state, [CCode (type = "va_list")] va_list args);
+               public void get_valist (Gtk.StateFlags state, va_list args);
                [Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
                public bool has_class (string style_class);
                [Version (deprecated = true, deprecated_since = "3.14", since = "3.0")]
@@ -8922,7 +8922,7 @@ namespace Gtk {
                [CCode (sentinel = "-1")]
                public void @set (Gtk.TreeIter iter, ...);
                public void set_column_types ([CCode (array_length_cname = "n_columns", array_length_pos = 
0.5)] GLib.Type[] types);
-               public void set_valist (Gtk.TreeIter iter, [CCode (type = "va_list")] va_list var_args);
+               public void set_valist (Gtk.TreeIter iter, va_list var_args);
                public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
                [Version (since = "2.12")]
                public void set_valuesv (Gtk.TreeIter iter, [CCode (array_length_cname = "n_values", 
array_length_pos = 3.1)] int[] columns, [CCode (array_length_cname = "n_values", array_length_pos = 3.1)] 
GLib.Value[] values);
@@ -9770,7 +9770,7 @@ namespace Gtk {
                public void style_attach ();
                public void style_get (...);
                public void style_get_property (string property_name, ref GLib.Value value);
-               public void style_get_valist (string first_property_name, [CCode (type = "va_list")] va_list 
var_args);
+               public void style_get_valist (string first_property_name, va_list var_args);
                public void thaw_child_notify ();
                public bool translate_coordinates (Gtk.Widget dest_widget, int src_x, int src_y, out int 
dest_x, out int dest_y);
                [Version (since = "2.12")]
@@ -10843,7 +10843,7 @@ namespace Gtk {
                public abstract Gtk.TreePath? get_path (Gtk.TreeIter iter);
                [Version (since = "2.2")]
                public string get_string_from_iter (Gtk.TreeIter iter);
-               public void get_valist (Gtk.TreeIter iter, [CCode (type = "va_list")] va_list var_args);
+               public void get_valist (Gtk.TreeIter iter, va_list var_args);
                public abstract void get_value (Gtk.TreeIter iter, int column, out GLib.Value value);
                public abstract bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
                public abstract bool iter_has_child (Gtk.TreeIter iter);
diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi
index b34d5fd2d..55f2b73bf 100644
--- a/vapi/gtk4.vapi
+++ b/vapi/gtk4.vapi
@@ -6960,10 +6960,10 @@ namespace Gtk {
                public int attribute_get_column (Gtk.CellRenderer renderer, string attribute);
                public void cell_get (Gtk.CellRenderer renderer, ...);
                public void cell_get_property (Gtk.CellRenderer renderer, string property_name, ref 
GLib.Value value);
-               public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, [CCode 
(type = "va_list")] va_list var_args);
+               public void cell_get_valist (Gtk.CellRenderer renderer, string first_property_name, va_list 
var_args);
                public void cell_set (Gtk.CellRenderer renderer, ...);
                public void cell_set_property (Gtk.CellRenderer renderer, string property_name, GLib.Value 
value);
-               public void cell_set_valist (Gtk.CellRenderer renderer, string first_property_name, [CCode 
(type = "va_list")] va_list var_args);
+               public void cell_set_valist (Gtk.CellRenderer renderer, string first_property_name, va_list 
var_args);
                public virtual Gtk.CellAreaContext copy_context (Gtk.CellAreaContext context);
                public virtual Gtk.CellAreaContext create_context ();
                public virtual int event (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Event event, 
Gdk.Rectangle cell_area, Gtk.CellRendererState flags);
@@ -9220,7 +9220,7 @@ namespace Gtk {
                [CCode (sentinel = "-1")]
                public void @set (Gtk.TreeIter iter, ...);
                public void set_column_types ([CCode (array_length_cname = "n_columns", array_length_pos = 
0.5)] GLib.Type[] types);
-               public void set_valist (Gtk.TreeIter iter, [CCode (type = "va_list")] va_list var_args);
+               public void set_valist (Gtk.TreeIter iter, va_list var_args);
                public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
                public void set_valuesv (Gtk.TreeIter iter, [CCode (array_length_cname = "n_values", 
array_length_pos = 3.1)] int[] columns, [CCode (array_length_cname = "n_values", array_length_pos = 3.1)] 
GLib.Value[] values);
                public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
@@ -9315,7 +9315,7 @@ namespace Gtk {
        public abstract class MediaStream : GLib.Object, Gdk.Paintable {
                [CCode (has_construct_function = false)]
                protected MediaStream ();
-               public void error_valist (GLib.Quark domain, int code, string format, [CCode (type = 
"va_list")] va_list args);
+               public void error_valist (GLib.Quark domain, int code, string format, va_list args);
                public void gerror (owned GLib.Error error);
                public int64 get_duration ();
                public bool get_ended ();
@@ -11737,7 +11737,7 @@ namespace Gtk {
                [CCode (sentinel = "-1")]
                public void @set (Gtk.TreeIter iter, ...);
                public void set_column_types ([CCode (array_length_cname = "n_columns", array_length_pos = 
0.5)] GLib.Type[] types);
-               public void set_valist (Gtk.TreeIter iter, [CCode (type = "va_list")] va_list var_args);
+               public void set_valist (Gtk.TreeIter iter, va_list var_args);
                public void set_value (Gtk.TreeIter iter, int column, GLib.Value value);
                public void set_valuesv (Gtk.TreeIter iter, [CCode (array_length_cname = "n_values", 
array_length_pos = 3.1)] int[] columns, [CCode (array_length_cname = "n_values", array_length_pos = 3.1)] 
GLib.Value[] values);
                public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
@@ -12730,7 +12730,7 @@ namespace Gtk {
                public abstract int get_n_columns ();
                public abstract Gtk.TreePath? get_path (Gtk.TreeIter iter);
                public string? get_string_from_iter (Gtk.TreeIter iter);
-               public void get_valist (Gtk.TreeIter iter, [CCode (type = "va_list")] va_list var_args);
+               public void get_valist (Gtk.TreeIter iter, va_list var_args);
                public abstract void get_value (Gtk.TreeIter iter, int column, out GLib.Value value);
                public abstract bool iter_children (out Gtk.TreeIter iter, Gtk.TreeIter? parent);
                public abstract bool iter_has_child (Gtk.TreeIter iter);
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 3ba649d18..bff6f71cc 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -115,7 +115,6 @@ DBusMethodInvocation
   .get_user_data skip=false
   .return_error skip=false
   .return_error_valist skip=false
-  .return_error_valist.var_args type="va_list"
   .take_error skip=false
   .take_error.error owned
 DBusObjectManagerClient
diff --git a/vapi/metadata/Gtk-3.0.metadata b/vapi/metadata/Gtk-3.0.metadata
index 9010bba01..681f966c4 100644
--- a/vapi/metadata/Gtk-3.0.metadata
+++ b/vapi/metadata/Gtk-3.0.metadata
@@ -172,8 +172,6 @@ get_option_group skip=false
 
 // G-I cannot handle variadic functions
 *.*_valist skip=false
-*.*_valist.args type="va_list"
-*.*_valist.var_args type="va_list"
 Builder
   .add_callback_symbols skip=false
 CellArea
diff --git a/vapi/metadata/Gtk-4.0.metadata b/vapi/metadata/Gtk-4.0.metadata
index 9d5322c1f..7925963c3 100644
--- a/vapi/metadata/Gtk-4.0.metadata
+++ b/vapi/metadata/Gtk-4.0.metadata
@@ -66,8 +66,6 @@ ShortcutTrigger
 
 // G-I cannot handle variadic functions
 *.*_valist skip=false
-*.*_valist.args type="va_list"
-*.*_valist.var_args type="va_list"
 Accessible
   .* skip=false
 BuilderCScope


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]