summaryrefslogtreecommitdiff
path: root/gee
diff options
context:
space:
mode:
authorJuerg Billeter <j@bitron.ch>2008-04-13 16:17:00 +0000
committerJürg Billeter <juergbi@src.gnome.org>2008-04-13 16:17:00 +0000
commit85cfd74faae12e90275990b2b887adc9a1f71d1d (patch)
tree2cce940835212c7cd7c0854482abe9a74cbbd120 /gee
parent206cd6716043d886c6531ca358f5b442c5ea991e (diff)
downloadvala-85cfd74faae12e90275990b2b887adc9a1f71d1d.tar.gz
deprecate construct as parameter modifier, fixes bug 524138
2008-04-13 Juerg Billeter <j@bitron.ch> * vala/valaparser.vala: deprecate construct as parameter modifier, fixes bug 524138 * */*.vala: port to new syntax svn path=/trunk/; revision=1209
Diffstat (limited to 'gee')
-rw-r--r--gee/arraylist.vala6
-rw-r--r--gee/hashmap.vala17
-rw-r--r--gee/hashset.vala7
-rw-r--r--gee/readonlycollection.vala3
-rw-r--r--gee/readonlylist.vala3
-rw-r--r--gee/readonlymap.vala3
-rw-r--r--gee/readonlyset.vala3
7 files changed, 29 insertions, 13 deletions
diff --git a/gee/arraylist.vala b/gee/arraylist.vala
index 08fdcdc81..c0a42e605 100644
--- a/gee/arraylist.vala
+++ b/gee/arraylist.vala
@@ -43,7 +43,8 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
// concurrent modification protection
private int _stamp = 0;
- public ArrayList (construct EqualFunc equal_func = GLib.direct_equal) {
+ public ArrayList (EqualFunc equal_func = GLib.direct_equal) {
+ this.equal_func = equal_func;
}
public Type get_element_type () {
@@ -165,7 +166,8 @@ public class Gee.ArrayList<G> : Object, Iterable<G>, Collection<G>, List<G> {
// concurrent modification protection
public int _stamp = 0;
- public Iterator (construct ArrayList list) {
+ public Iterator (ArrayList list) {
+ this.list = list;
}
public bool next () {
diff --git a/gee/hashmap.vala b/gee/hashmap.vala
index 737e3f637..c4847ea02 100644
--- a/gee/hashmap.vala
+++ b/gee/hashmap.vala
@@ -58,7 +58,10 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
private const int MIN_SIZE = 11;
private const int MAX_SIZE = 13845163;
- public HashMap (construct HashFunc key_hash_func = GLib.direct_hash, construct EqualFunc key_equal_func = GLib.direct_equal, construct EqualFunc value_equal_func = GLib.direct_equal) {
+ public HashMap (HashFunc key_hash_func = GLib.direct_hash, EqualFunc key_equal_func = GLib.direct_equal, EqualFunc value_equal_func = GLib.direct_equal) {
+ this.key_hash_func = key_hash_func;
+ this.key_equal_func = key_equal_func;
+ this.value_equal_func = value_equal_func;
}
construct {
@@ -185,7 +188,8 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
private HashMap<K,V> _map;
- public KeySet (construct HashMap map) {
+ public KeySet (HashMap map) {
+ this.map = map;
}
public Type get_element_type () {
@@ -232,7 +236,8 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
// concurrent modification protection
private int _stamp;
- public KeyIterator (construct HashMap map) {
+ public KeyIterator (HashMap map) {
+ this.map = map;
}
public bool next () {
@@ -260,7 +265,8 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
private HashMap<K,V> _map;
- public ValueCollection (construct HashMap map) {
+ public ValueCollection (HashMap map) {
+ this.map = map;
}
public Type get_element_type () {
@@ -313,7 +319,8 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
// concurrent modification protection
private int _stamp;
- public ValueIterator (construct HashMap map) {
+ public ValueIterator (HashMap map) {
+ this.map = map;
}
public bool next () {
diff --git a/gee/hashset.vala b/gee/hashset.vala
index 4cfdfd3ce..aed8cadc0 100644
--- a/gee/hashset.vala
+++ b/gee/hashset.vala
@@ -53,7 +53,9 @@ public class Gee.HashSet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
private const int MIN_SIZE = 11;
private const int MAX_SIZE = 13845163;
- public HashSet (construct HashFunc hash_func = GLib.direct_hash, construct EqualFunc equal_func = GLib.direct_equal) {
+ public HashSet (HashFunc hash_func = GLib.direct_hash, EqualFunc equal_func = GLib.direct_equal) {
+ this.hash_func = hash_func;
+ this.equal_func = equal_func;
}
construct {
@@ -176,7 +178,8 @@ public class Gee.HashSet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
// concurrent modification protection
private int _stamp = 0;
- public Iterator (construct HashSet set) {
+ public Iterator (HashSet set) {
+ this.set = set;
}
public bool next () {
diff --git a/gee/readonlycollection.vala b/gee/readonlycollection.vala
index 8dad8f8cd..c54226e42 100644
--- a/gee/readonlycollection.vala
+++ b/gee/readonlycollection.vala
@@ -36,7 +36,8 @@ public class Gee.ReadOnlyCollection<G> : Object, Iterable<G>, Collection<G> {
private Collection<G> _collection;
- public ReadOnlyCollection (construct Collection<G> collection = null) {
+ public ReadOnlyCollection (Collection<G> collection = null) {
+ this.collection = collection;
}
public Type get_element_type () {
diff --git a/gee/readonlylist.vala b/gee/readonlylist.vala
index 2e995d795..83efd6f1b 100644
--- a/gee/readonlylist.vala
+++ b/gee/readonlylist.vala
@@ -36,7 +36,8 @@ public class Gee.ReadOnlyList<G> : Object, Iterable<G>, Collection<G>, List<G> {
private List<G> _list;
- public ReadOnlyList (construct List<G> list = null) {
+ public ReadOnlyList (List<G> list = null) {
+ this.list = list;
}
public Type get_element_type () {
diff --git a/gee/readonlymap.vala b/gee/readonlymap.vala
index c038e7dee..cba3a2d21 100644
--- a/gee/readonlymap.vala
+++ b/gee/readonlymap.vala
@@ -36,7 +36,8 @@ public class Gee.ReadOnlyMap<K,V> : Object, Map<K,V> {
private Map<K,V> _map;
- public ReadOnlyMap (construct Map<K,V> map = null) {
+ public ReadOnlyMap (Map<K,V> map = null) {
+ this.map = map;
}
public Set<K> get_keys () {
diff --git a/gee/readonlyset.vala b/gee/readonlyset.vala
index 460518351..ecf64d933 100644
--- a/gee/readonlyset.vala
+++ b/gee/readonlyset.vala
@@ -36,7 +36,8 @@ public class Gee.ReadOnlySet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
private Set<G> _set;
- public ReadOnlySet (construct Set<G> set = null) {
+ public ReadOnlySet (Set<G> set = null) {
+ this.set = set;
}
public Type get_element_type () {