From: Jürg Billeter Date: Wed, 15 Apr 2009 19:05:45 +0000 (+0200) Subject: Update code using deprecated # modifier or operator X-Git-Tag: 0.7.1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=424fbde066f66904aefa46167262e425d57feb83;p=thirdparty%2Fvala.git Update code using deprecated # modifier or operator --- diff --git a/gee/hashmap.vala b/gee/hashmap.vala index 7c4765263..740c40968 100644 --- a/gee/hashmap.vala +++ b/gee/hashmap.vala @@ -2,7 +2,7 @@ * * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1997-2000 GLib Team and others - * Copyright (C) 2007-2008 Jürg Billeter + * Copyright (C) 2007-2009 Jürg Billeter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -126,12 +126,12 @@ public class Gee.HashMap : CollectionObject, Map { public void clear () { for (int i = 0; i < _array_size; i++) { - Node node = #_nodes[i]; + Node node = (owned) _nodes[i]; while (node != null) { - Node next = #node.next; + Node next = (owned) node.next; node.key = null; node.value = null; - node = #next; + node = (owned) next; } } _nnodes = 0; @@ -149,14 +149,14 @@ public class Gee.HashMap : CollectionObject, Map { for (int i = 0; i < _array_size; i++) { Node node; Node next; - for (node = #_nodes[i]; node != null; node = #next) { - next = #node.next; + for (node = (owned) _nodes[i]; node != null; node = (owned) next) { + next = (owned) node.next; uint hash_val = node.key_hash % new_array_size; - node.next = #new_nodes[hash_val]; - new_nodes[hash_val] = #node; + node.next = (owned) new_nodes[hash_val]; + new_nodes[hash_val] = (owned) node; } } - _nodes = #new_nodes; + _nodes = (owned) new_nodes; _array_size = new_array_size; } } @@ -172,9 +172,9 @@ public class Gee.HashMap : CollectionObject, Map { public Node next; public uint key_hash; - public Node (K# k, V# v, uint hash) { - key = #k; - value = #v; + public Node (owned K k, owned V v, uint hash) { + key = (owned) k; + value = (owned) v; key_hash = hash; } } diff --git a/gee/hashset.vala b/gee/hashset.vala index af9c781fe..f042e7622 100644 --- a/gee/hashset.vala +++ b/gee/hashset.vala @@ -2,7 +2,7 @@ * * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald * Copyright (C) 1997-2000 GLib Team and others - * Copyright (C) 2007-2008 Jürg Billeter + * Copyright (C) 2007-2009 Jürg Billeter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -111,11 +111,11 @@ public class Gee.HashSet : CollectionObject, Iterable, Collection, Set< public void clear () { for (int i = 0; i < _array_size; i++) { - Node node = #_nodes[i]; + Node node = (owned) _nodes[i]; while (node != null) { - Node next = #node.next; + Node next = (owned) node.next; node.key = null; - node = #next; + node = (owned) next; } } _nnodes = 0; @@ -133,14 +133,14 @@ public class Gee.HashSet : CollectionObject, Iterable, Collection, Set< for (int i = 0; i < _array_size; i++) { Node node; Node next; - for (node = #_nodes[i]; node != null; node = #next) { - next = #node.next; + for (node = (owned) _nodes[i]; node != null; node = (owned) next) { + next = (owned) node.next; uint hash_val = node.key_hash % new_array_size; - node.next = #new_nodes[hash_val]; - new_nodes[hash_val] = #node; + node.next = (owned) new_nodes[hash_val]; + new_nodes[hash_val] = (owned) node; } } - _nodes = #new_nodes; + _nodes = (owned) new_nodes; _array_size = new_array_size; } } @@ -155,8 +155,8 @@ public class Gee.HashSet : CollectionObject, Iterable, Collection, Set< public Node next; public uint key_hash; - public Node (G# k, uint hash) { - key = #k; + public Node (owned G k, uint hash) { + key = (owned) k; key_hash = hash; } } diff --git a/vala/valadelegate.vala b/vala/valadelegate.vala index c283b6d2e..d141ed0fc 100644 --- a/vala/valadelegate.vala +++ b/vala/valadelegate.vala @@ -327,7 +327,11 @@ public class Vala.Delegate : TypeSymbol { str += ", "; } - if (param.direction != ParameterDirection.IN) { + if (param.direction == ParameterDirection.IN) { + if (param.parameter_type.value_owned) { + str += "owned "; + } + } else { if (param.direction == ParameterDirection.REF) { str += "ref "; } else if (param.direction == ParameterDirection.OUT) { @@ -340,10 +344,6 @@ public class Vala.Delegate : TypeSymbol { str += param.parameter_type.to_string (); - if (param.direction == ParameterDirection.IN && param.parameter_type.value_owned) { - str += "#"; - } - i++; } diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index c0669518d..b19118edf 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -1209,9 +1209,9 @@ namespace GLib { namespace Timeout { public static uint add (uint interval, SourceFunc function); - public static uint add_full (int priority, uint interval, SourceFunc# function); + public static uint add_full (int priority, uint interval, owned SourceFunc function); public static uint add_seconds (uint interval, SourceFunc function); - public static uint add_seconds_full (int priority, uint interval, SourceFunc# function); + public static uint add_seconds_full (int priority, uint interval, owned SourceFunc function); } [CCode (cname = "GSource")] @@ -1221,7 +1221,7 @@ namespace GLib { namespace Idle { public static uint add (SourceFunc function); - public static uint add_full (int priority, SourceFunc# function); + public static uint add_full (int priority, owned SourceFunc function); public static bool remove_by_data (void* data); } @@ -1238,7 +1238,7 @@ namespace GLib { namespace ChildWatch { public static uint add (Pid pid, ChildWatchFunc function); - public static uint add_full (int priority, Pid pid, ChildWatchFunc# function); + public static uint add_full (int priority, Pid pid, owned ChildWatchFunc function); } public struct PollFD { @@ -1261,7 +1261,7 @@ namespace GLib { public bool get_can_recurse (); public uint get_id (); public weak MainContext get_context (); - public void set_callback (SourceFunc# func); + public void set_callback (owned SourceFunc func); public void set_callback_indirect (void* callback_data, SourceCallbackFuncs callback_funcs); public void add_poll (ref PollFD fd); public void remove_poll (ref PollFD fd); @@ -1420,8 +1420,8 @@ namespace GLib { [CCode (ref_function = "g_async_queue_ref", unref_function = "g_async_queue_unref")] public class AsyncQueue { public AsyncQueue (); - public void push (G# data); - public void push_sorted (G# data, CompareDataFunc func); + public void push (owned G data); + public void push_sorted (owned G data, CompareDataFunc func); public G pop (); public G try_pop (); public G timed_pop (ref TimeVal end_time); @@ -1431,8 +1431,8 @@ namespace GLib { public void unlock (); public void ref_unlocked (); public void unref_and_unlock (); - public void push_unlocked (G# data); - public void push_sorted_unlocked (G# data, CompareDataFunc func); + public void push_unlocked (owned G data); + public void push_sorted_unlocked (owned G data, CompareDataFunc func); public G pop_unlocked (); public G try_pop_unlocked (); public G timed_pop_unlocked (ref TimeVal end_time); @@ -1502,7 +1502,7 @@ namespace GLib { [CCode (cname = "g_io_add_watch")] public uint add_watch (IOCondition condition, IOFunc func); [CCode (cname = "g_io_add_watch_full")] - public uint add_watch_full (int priority, IOCondition condition, IOFunc# func); + public uint add_watch_full (int priority, IOCondition condition, owned IOFunc func); public size_t get_buffer_size (); public void set_buffer_size (size_t size); public IOCondition get_buffer_condition (); @@ -2520,8 +2520,8 @@ namespace GLib { public string get_help (bool main_help, OptionGroup? group); [NoArrayLength] public void add_main_entries ([CCode (array_length = false)] OptionEntry[] entries, string? translation_domain); - public void add_group (OptionGroup# group); - public void set_main_group (OptionGroup# group); + public void add_group (owned OptionGroup group); + public void set_main_group (owned OptionGroup group); public weak OptionGroup get_main_group (); } @@ -2920,15 +2920,15 @@ namespace GLib { [CCode (dup_function = "g_list_copy", free_function = "g_list_free")] public class List { [ReturnsModifiedPointer ()] - public void append (G# data); + public void append (owned G data); [ReturnsModifiedPointer ()] - public void prepend (G# data); + public void prepend (owned G data); [ReturnsModifiedPointer ()] - public void insert (G# data, int position); + public void insert (owned G data, int position); [ReturnsModifiedPointer ()] - public void insert_before (List sibling, G# data); + public void insert_before (List sibling, owned G data); [ReturnsModifiedPointer ()] - public void insert_sorted (G# data, CompareFunc compare_func); + public void insert_sorted (owned G data, CompareFunc compare_func); [ReturnsModifiedPointer ()] public void remove (G data); [ReturnsModifiedPointer ()] @@ -2945,11 +2945,11 @@ namespace GLib { [ReturnsModifiedPointer ()] public void sort (CompareFunc compare_func); [ReturnsModifiedPointer ()] - public void insert_sorted_with_data (G# data, CompareDataFunc compare_func); + public void insert_sorted_with_data (owned G data, CompareDataFunc compare_func); [ReturnsModifiedPointer ()] public void sort_with_data (CompareDataFunc compare_func); [ReturnsModifiedPointer ()] - public void concat (List# list2); + public void concat (owned List list2); public void @foreach (Func func); public weak List first (); @@ -2974,15 +2974,15 @@ namespace GLib { [CCode (dup_function = "g_slist_copy", free_function = "g_slist_free")] public class SList { [ReturnsModifiedPointer ()] - public void append (G# data); + public void append (owned G data); [ReturnsModifiedPointer ()] - public void prepend (G# data); + public void prepend (owned G data); [ReturnsModifiedPointer ()] - public void insert (G# data, int position); + public void insert (owned G data, int position); [ReturnsModifiedPointer ()] - public void insert_before (SList sibling, G# data); + public void insert_before (SList sibling, owned G data); [ReturnsModifiedPointer ()] - public void insert_sorted (G# data, CompareFunc compare_func); + public void insert_sorted (owned G data, CompareFunc compare_func); [ReturnsModifiedPointer ()] public void remove (G data); [ReturnsModifiedPointer ()] @@ -2997,13 +2997,13 @@ namespace GLib { [ReturnsModifiedPointer ()] public void reverse (); [ReturnsModifiedPointer ()] - public void insert_sorted_with_data (G# data, CompareDataFunc compare_func); + public void insert_sorted_with_data (owned G data, CompareDataFunc compare_func); [ReturnsModifiedPointer ()] public void sort (CompareFunc compare_func); [ReturnsModifiedPointer ()] public void sort_with_data (CompareDataFunc compare_func); [ReturnsModifiedPointer ()] - public void concat (SList# list2); + public void concat (owned SList list2); public void @foreach (Func func); public weak SList last (); @@ -3046,9 +3046,9 @@ namespace GLib { public weak List find (G data); public weak List find_custom (G data, CompareFunc func); public void sort (CompareDataFunc compare_func, void* user_data); - public void push_head (G# data); - public void push_tail (G# data); - public void push_nth (G# data, int n); + public void push_head (owned G data); + public void push_tail (owned G data); + public void push_nth (owned G data, int n); public G pop_head (); public G pop_tail (); public G pop_nth (uint n); @@ -3058,9 +3058,9 @@ namespace GLib { public int index (G data); public void remove (G data); public void remove_all (G data); - public void insert_before (List sibling, G# data); - public void insert_after (List sibling, G# data); - public void insert_sorted (List sibling, G# data, CompareDataFunc func, void* user_data); + public void insert_before (List sibling, owned G data); + public void insert_after (List sibling, owned G data); + public void insert_sorted (List sibling, owned G data, CompareDataFunc func, void* user_data); } /* Sequences */ @@ -3077,13 +3077,13 @@ namespace GLib { public SequenceIter get_begin_iter (); public SequenceIter get_end_iter (); public SequenceIter get_iter_at_pos (int pos); - public SequenceIter append (G# data); - public SequenceIter prepend (G# data); - public static SequenceIter insert_before (SequenceIter iter, G# data); + public SequenceIter append (owned G data); + public SequenceIter prepend (owned G data); + public static SequenceIter insert_before (SequenceIter iter, owned G data); public static void move (SequenceIter src, SequenceIter dest); public static void swap (SequenceIter src, SequenceIter dest); - public SequenceIter insert_sorted (G# data, CompareDataFunc cmp_func); - public SequenceIter insert_sorted_iter (G# data, SequenceIterCompareFunc iter_cmp); + public SequenceIter insert_sorted (owned G data, CompareDataFunc cmp_func); + public SequenceIter insert_sorted_iter (owned G data, SequenceIterCompareFunc iter_cmp); public static void sort_changed (SequenceIter iter, CompareDataFunc cmp_func); public static void sort_changed_iter (SequenceIter iter, SequenceIterCompareFunc iter_cmp); public static void remove (SequenceIter iter); @@ -3092,7 +3092,7 @@ namespace GLib { public SequenceIter search (G data, CompareDataFunc cmp_func); public SequenceIter search_iter (G data, SequenceIterCompareFunc iter_cmp); public static weak G get (SequenceIter iter); - public static void set (SequenceIter iter, G# data); + public static void set (SequenceIter iter, owned G data); public static SequenceIter range_get_midpoint (SequenceIter begin, SequenceIter end); } @@ -3121,8 +3121,8 @@ namespace GLib { public class HashTable : Boxed { 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 (K# key, V# value); - public void replace (K# key, V# value); + public void insert (owned K key, owned V value); + public void replace (owned K key, owned V value); public weak V lookup (K key); public bool remove (K key); public void remove_all (); @@ -3275,15 +3275,15 @@ namespace GLib { public Datalist (); public void clear (); public weak G id_get_data (Quark key_id); - public void id_set_data (Quark key_id, G# data); - public void id_set_data_full (Quark key_id, G# data, DestroyNotify? destroy_func); + public void id_set_data (Quark key_id, owned G data); + public void id_set_data_full (Quark key_id, owned G data, DestroyNotify? destroy_func); public void id_remove_data (Quark key_id); public G id_remove_no_notify (Quark key_id); public void @foreach (DataForeachFunc func); public weak G get_data (string key); - public void set_data_full (string key, G# data, DestroyNotify? destry_func); + public void set_data_full (string key, owned G data, DestroyNotify? destry_func); public G remove_no_notify (string key); - public void set_data (string key, G# data); + public void set_data (string key, owned G data); public void remove_data (string key); } @@ -3332,8 +3332,8 @@ namespace GLib { public Tree (CompareFunc key_compare_func); public Tree.with_data (CompareDataFunc key_compare_func); public Tree.full (CompareDataFunc key_compare_func, DestroyNotify? key_destroy_func, DestroyNotify? value_destroy_func); - public void insert (K# key, V# value); - public void replace (K# key, V# value); + public void insert (owned K key, owned V value); + public void replace (owned K key, owned V value); public int nnodes (); public int height (); public weak V lookup (K key); diff --git a/vapi/gobject-2.0.vapi b/vapi/gobject-2.0.vapi index 8d3916b1d..54b53e033 100644 --- a/vapi/gobject-2.0.vapi +++ b/vapi/gobject-2.0.vapi @@ -309,7 +309,7 @@ namespace GLib { public uint get_flags (); public void set_string (string v_string); public void set_static_string (string v_string); - public void take_string (string# v_string); + public void take_string (owned string v_string); public weak string get_string (); public string dup_string (); public void set_pointer (void* v_pointer); @@ -318,7 +318,7 @@ namespace GLib { public weak Boxed get_boxed (); public Boxed dup_boxed (); public void set_object (Object v_object); - public void take_object (Object# v_object); + public void take_object (owned Object v_object); public weak Object get_object (); public Object dup_object (); public void set_gtype (Type v_gtype);