From: Jürg Billeter Date: Tue, 28 Jul 2009 16:45:49 +0000 (+0200) Subject: Removed Boxed pseudo-class X-Git-Tag: 0.7.5~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19d663a689b657b169fffebe012812ce0942f4b8;p=thirdparty%2Fvala.git Removed Boxed pseudo-class --- diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index 74a27a439..031471f69 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -1488,7 +1488,7 @@ namespace GLib { [Compact] [CCode (ref_function = "g_io_channel_ref", unref_function = "g_io_channel_unref")] - public class IOChannel : Boxed { + public class IOChannel { [CCode (cname = "g_io_channel_unix_new")] public IOChannel.unix_new (int fd); public int unix_get_fd (); @@ -2649,7 +2649,7 @@ namespace GLib { [Compact] [CCode (ref_function = "g_regex_ref", unref_function = "g_regex_unref")] - public class Regex : Boxed { + public class Regex { public Regex (string pattern, RegexCompileFlags compile_options = 0, RegexMatchFlags match_options = 0) throws RegexError; public string get_pattern (); public int get_max_backref (); @@ -3161,7 +3161,7 @@ namespace GLib { [Compact] [CCode (ref_function = "g_hash_table_ref", unref_function = "g_hash_table_unref", type_id = "G_TYPE_HASH_TABLE", type_signature = "a{%s}")] - public class HashTable : Boxed { + public class HashTable { public HashTable (HashFunc? hash_func, EqualFunc? key_equal_func); public HashTable.full (HashFunc? hash_func, EqualFunc? key_equal_func, DestroyNotify? key_destroy_func, DestroyNotify? value_destroy_func); public void insert (owned K key, owned V value); @@ -3218,7 +3218,7 @@ namespace GLib { [Compact] [CCode (cname = "GString", cprefix = "g_string_", free_function = "g_string_free", type_id = "G_TYPE_GSTRING")] - public class StringBuilder : Boxed { + public class StringBuilder { public StringBuilder (string init = ""); [CCode (cname = "g_string_sized_new")] public StringBuilder.sized (ulong dfl_size); diff --git a/vapi/gobject-2.0.vapi b/vapi/gobject-2.0.vapi index 54b53e033..fafb53c15 100644 --- a/vapi/gobject-2.0.vapi +++ b/vapi/gobject-2.0.vapi @@ -251,11 +251,6 @@ namespace GLib { public weak string value_nick; } - [Compact] - [CCode (cname = "gpointer", has_type_id = true, type_id = "G_TYPE_BOXED", marshaller_type_name = "BOXED", get_value_function = "g_value_get_boxed", set_value_function = "g_value_set_boxed")] - public abstract class Boxed { - } - public static delegate void ValueTransform (Value src_value, out Value dest_value); [CCode (copy_function = "g_value_copy", destroy_function = "g_value_unset", type_id = "G_TYPE_VALUE", marshaller_type_name = "BOXED", get_value_function = "g_value_get_boxed", set_value_function = "g_value_set_boxed", type_signature = "v")] @@ -315,8 +310,8 @@ namespace GLib { public void set_pointer (void* v_pointer); public void* get_pointer (); public void set_boxed (void* v_boxed); - public weak Boxed get_boxed (); - public Boxed dup_boxed (); + public void* get_boxed (); + public void* dup_boxed (); public void set_object (Object v_object); public void take_object (owned Object v_object); public weak Object get_object (); @@ -352,14 +347,14 @@ namespace GLib { public static delegate void Callback (); [Compact] - public class Closure : Boxed { + public class Closure { } public static delegate void ClosureNotify (void* data, Closure closure); [Compact] [CCode (type_id = "G_TYPE_VALUE_ARRAY")] - public class ValueArray : Boxed { + public class ValueArray { public uint n_values; public Value[] values; public ValueArray (uint n_prealloced);