libgee r28 - in trunk: . gee

[juergbi svn gnome org]

Author: juergbi
Date: Sun Apr 13 17:15:41 2008
New Revision: 28
URL: http://svn.gnome.org/viewvc/libgee?rev=28&view=rev

Log:
2008-04-13  Juerg Billeter  <j bitron ch>

	* gee/arraylist.vala, gee/hashmap.vala, gee/hashset.vala,
	  gee/readonlycollection.vala, gee/readonlylist.vala,
	  gee/readonlymap.vala, gee/readonlyset.vala: remove deprecated
	  syntax for construct parameters


Modified:
   trunk/ChangeLog
   trunk/gee/arraylist.vala
   trunk/gee/hashmap.vala
   trunk/gee/hashset.vala
   trunk/gee/readonlycollection.vala
   trunk/gee/readonlylist.vala
   trunk/gee/readonlymap.vala
   trunk/gee/readonlyset.vala

Modified: trunk/gee/arraylist.vala
==============================================================================
--- trunk/gee/arraylist.vala	(original)
+++ trunk/gee/arraylist.vala	Sun Apr 13 17:15:41 2008
@@ -43,7 +43,8 @@
 	// 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 @@
 		// concurrent modification protection
 		public int _stamp = 0;
 
-		public Iterator (construct ArrayList list) {
+		public Iterator (ArrayList list) {
+			this.list = list;
 		}
 
 		public bool next () {

Modified: trunk/gee/hashmap.vala
==============================================================================
--- trunk/gee/hashmap.vala	(original)
+++ trunk/gee/hashmap.vala	Sun Apr 13 17:15:41 2008
@@ -58,7 +58,10 @@
 	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 @@
 
 		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 @@
 		// 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 @@
 
 		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 @@
 		// concurrent modification protection
 		private int _stamp;
 
-		public ValueIterator (construct HashMap map) {
+		public ValueIterator (HashMap map) {
+			this.map = map;
 		}
 
 		public bool next () {

Modified: trunk/gee/hashset.vala
==============================================================================
--- trunk/gee/hashset.vala	(original)
+++ trunk/gee/hashset.vala	Sun Apr 13 17:15:41 2008
@@ -53,7 +53,9 @@
 	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 @@
 		// concurrent modification protection
 		private int _stamp = 0;
 
-		public Iterator (construct HashSet set) {
+		public Iterator (HashSet set) {
+			this.set = set;
 		}
 
 		public bool next () {

Modified: trunk/gee/readonlycollection.vala
==============================================================================
--- trunk/gee/readonlycollection.vala	(original)
+++ trunk/gee/readonlycollection.vala	Sun Apr 13 17:15:41 2008
@@ -36,7 +36,8 @@
 
 	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 () {

Modified: trunk/gee/readonlylist.vala
==============================================================================
--- trunk/gee/readonlylist.vala	(original)
+++ trunk/gee/readonlylist.vala	Sun Apr 13 17:15:41 2008
@@ -36,7 +36,8 @@
 
 	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 () {

Modified: trunk/gee/readonlymap.vala
==============================================================================
--- trunk/gee/readonlymap.vala	(original)
+++ trunk/gee/readonlymap.vala	Sun Apr 13 17:15:41 2008
@@ -36,7 +36,8 @@
 
 	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 () {

Modified: trunk/gee/readonlyset.vala
==============================================================================
--- trunk/gee/readonlyset.vala	(original)
+++ trunk/gee/readonlyset.vala	Sun Apr 13 17:15:41 2008
@@ -36,7 +36,8 @@
 
 	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 () {