Do not use Gee namespace to avoid conflict with libgee

15 files changed, 27 insertions, 27 deletions

diff --git a/gee/Makefile.am b/gee/Makefile.am
index ece430c97..322ca63b6 100644
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -36,11 +36,11 @@ libgee_la_SOURCES = \
 geeincludedir = $(includedir)/vala-1.0
 
 geeinclude_HEADERS = \
-	gee.h \
+	valagee.h \
 	$(NULL)
 
 gee.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
-	$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 -H gee.h --library gee $^
+	$(VALAC) $(COVERAGE_VALAFLAGS) $(VALAFLAGS) -C --vapidir $(srcdir)/../vapi --pkg gobject-2.0 -H valagee.h --library gee $^
 	touch $@
 
 libgee_la_LIBADD = \
@@ -52,7 +52,7 @@ EXTRA_DIST = $(libgee_la_VALASOURCES) gee.vapi gee.vala.stamp
 
 MAINTAINERCLEANFILES = \
 	gee.vapi \
-	gee.h \
+	valagee.h \
 	$(libgee_la_VALASOURCES:.vala=.c) \
 	$(NULL)
 
diff --git a/gee/arraylist.vala b/gee/arraylist.vala
index 183119b26..b8dd48553 100644
--- a/gee/arraylist.vala
+++ b/gee/arraylist.vala
@@ -27,7 +27,7 @@ using GLib;
 /**
  * Arrays of arbitrary elements which grow automatically as elements are added.
  */
-public class Gee.ArrayList<G> : CollectionObject, Iterable<G>, Collection<G>, List<G> {
+public class Vala.ArrayList<G> : CollectionObject, Iterable<G>, Collection<G>, List<G> {
 	public int size {
 		get { return _size; }
 	}
@@ -51,7 +51,7 @@ public class Gee.ArrayList<G> : CollectionObject, Iterable<G>, Collection<G>, Li
 		return typeof (G);
 	}
 
-	public Gee.Iterator<G> iterator () {
+	public Vala.Iterator<G> iterator () {
 		return new Iterator<G> (this);
 	}
 
@@ -152,7 +152,7 @@ public class Gee.ArrayList<G> : CollectionObject, Iterable<G>, Collection<G>, Li
 		_items.resize (value);
 	}
 
-	private class Iterator<G> : CollectionObject, Gee.Iterator<G> {
+	private class Iterator<G> : CollectionObject, Vala.Iterator<G> {
 		public ArrayList<G> list {
 			set {
 				_list = value;
diff --git a/gee/collection.vala b/gee/collection.vala
index 6e5cc7b70..11ea97aa8 100644
--- a/gee/collection.vala
+++ b/gee/collection.vala
@@ -24,7 +24,7 @@
  * Serves as the base interface for implementing collection classes. Defines
  * size, iteration, and modification methods.
  */
-public interface Gee.Collection<G> : Iterable<G> {
+public interface Vala.Collection<G> : Iterable<G> {
 	/**
 	 * The number of items in this collection.
 	 */
diff --git a/gee/collectionobject.vala b/gee/collectionobject.vala
index 08398e266..5a7a624b9 100644
--- a/gee/collectionobject.vala
+++ b/gee/collectionobject.vala
@@ -25,6 +25,6 @@ using GLib;
 /**
  * Base class for all collections.
  */
-public class Gee.CollectionObject {
+public class Vala.CollectionObject {
 }
 
diff --git a/gee/hashmap.vala b/gee/hashmap.vala
index c152b7b74..79bcf1c4d 100644
--- a/gee/hashmap.vala
+++ b/gee/hashmap.vala
@@ -27,7 +27,7 @@ using GLib;
 /**
  * Hashtable implementation of the Map interface.
  */
-public class Gee.HashMap<K,V> : CollectionObject, Map<K,V> {
+public class Vala.HashMap<K,V> : CollectionObject, Map<K,V> {
 	public int size {
 		get { return _nnodes; }
 	}
diff --git a/gee/hashset.vala b/gee/hashset.vala
index 712fd8d9a..7f188e18a 100644
--- a/gee/hashset.vala
+++ b/gee/hashset.vala
@@ -27,7 +27,7 @@ using GLib;
 /**
  * Hashtable implementation of the Set interface.
  */
-public class Gee.HashSet<G> : CollectionObject, Iterable<G>, Collection<G>, Set<G> {
+public class Vala.HashSet<G> : CollectionObject, Iterable<G>, Collection<G>, Set<G> {
 	public int size {
 		get { return _nnodes; }
 	}
@@ -78,7 +78,7 @@ public class Gee.HashSet<G> : CollectionObject, Iterable<G>, Collection<G>, Set<
 		return typeof (G);
 	}
 
-	public Gee.Iterator<G> iterator () {
+	public Vala.Iterator<G> iterator () {
 		return new Iterator<G> (this);
 	}
 
@@ -166,7 +166,7 @@ public class Gee.HashSet<G> : CollectionObject, Iterable<G>, Collection<G>, Set<
 		}
 	}
 
-	private class Iterator<G> : CollectionObject, Gee.Iterator<G> {
+	private class Iterator<G> : CollectionObject, Vala.Iterator<G> {
 		public HashSet<G> set {
 			set {
 				_set = value;
diff --git a/gee/iterable.vala b/gee/iterable.vala
index 998f59860..a95bd735d 100644
--- a/gee/iterable.vala
+++ b/gee/iterable.vala
@@ -26,7 +26,7 @@ using GLib;
  * Implemented by classes that support a simple iteration over instances of the
  * collection.
  */
-public interface Gee.Iterable<G> : CollectionObject {
+public interface Vala.Iterable<G> : CollectionObject {
 	public abstract Type get_element_type ();
 
 	/**
diff --git a/gee/iterator.vala b/gee/iterator.vala
index fddee817d..9677e8832 100644
--- a/gee/iterator.vala
+++ b/gee/iterator.vala
@@ -24,7 +24,7 @@
  * Implemented by classes that support a simple iteration over instances of the
  * collection.
  */
-public interface Gee.Iterator<G> : CollectionObject {
+public interface Vala.Iterator<G> : CollectionObject {
 	/**
 	 * Advances to the next element in the iteration.
 	 *
diff --git a/gee/list.vala b/gee/list.vala
index d034a9107..3f1357628 100644
--- a/gee/list.vala
+++ b/gee/list.vala
@@ -23,7 +23,7 @@
 /**
  * Represents a collection of items in a well-defined order.
  */
-public interface Gee.List<G> : Collection<G> {
+public interface Vala.List<G> : Collection<G> {
 	/**
 	 * Returns the item at the specified index in this list.
 	 *
diff --git a/gee/map.vala b/gee/map.vala
index e56a7b5b6..c98eeb4d2 100644
--- a/gee/map.vala
+++ b/gee/map.vala
@@ -23,7 +23,7 @@
 /**
  * A map is a generic collection of key/value pairs.
  */
-public interface Gee.Map<K,V> : CollectionObject {
+public interface Vala.Map<K,V> : CollectionObject {
 	/**
 	 * The number of items in this map.
 	 */
diff --git a/gee/readonlycollection.vala b/gee/readonlycollection.vala
index c1c7165cd..d0e34584c 100644
--- a/gee/readonlycollection.vala
+++ b/gee/readonlycollection.vala
@@ -25,7 +25,7 @@ using GLib;
 /**
  * Represents a read-only collection of items.
  */
-public class Gee.ReadOnlyCollection<G> : CollectionObject, Iterable<G>, Collection<G> {
+public class Vala.ReadOnlyCollection<G> : CollectionObject, Iterable<G>, Collection<G> {
 	public int size {
 		get { return _collection.size; }
 	}
@@ -44,7 +44,7 @@ public class Gee.ReadOnlyCollection<G> : CollectionObject, Iterable<G>, Collecti
 		return typeof (G);
 	}
 
-	public Gee.Iterator<G> iterator () {
+	public Vala.Iterator<G> iterator () {
 		if (_collection == null) {
 			return new Iterator<G> ();
 		}
@@ -72,7 +72,7 @@ public class Gee.ReadOnlyCollection<G> : CollectionObject, Iterable<G>, Collecti
 		assert_not_reached ();
 	}
 
-	private class Iterator<G> : CollectionObject, Gee.Iterator<G> {
+	private class Iterator<G> : CollectionObject, Vala.Iterator<G> {
 		public bool next () {
 			return false;
 		}
diff --git a/gee/readonlylist.vala b/gee/readonlylist.vala
index d03eb4d7e..d3793bf9a 100644
--- a/gee/readonlylist.vala
+++ b/gee/readonlylist.vala
@@ -25,7 +25,7 @@ using GLib;
 /**
  * Represents a read-only collection of items in a well-defined order.
  */
-public class Gee.ReadOnlyList<G> : CollectionObject, Iterable<G>, Collection<G>, List<G> {
+public class Vala.ReadOnlyList<G> : CollectionObject, Iterable<G>, Collection<G>, List<G> {
 	public int size {
 		get { return _list.size; }
 	}
@@ -44,7 +44,7 @@ public class Gee.ReadOnlyList<G> : CollectionObject, Iterable<G>, Collection<G>,
 		return typeof (G);
 	}
 
-	public Gee.Iterator<G> iterator () {
+	public Vala.Iterator<G> iterator () {
 		if (_list == null) {
 			return new Iterator<G> ();
 		}
@@ -100,7 +100,7 @@ public class Gee.ReadOnlyList<G> : CollectionObject, Iterable<G>, Collection<G>,
 		assert_not_reached ();
 	}
 
-	class Iterator<G> : CollectionObject, Gee.Iterator<G> {
+	class Iterator<G> : CollectionObject, Vala.Iterator<G> {
 		public bool next () {
 			return false;
 		}
diff --git a/gee/readonlymap.vala b/gee/readonlymap.vala
index c8e352cfb..264cbee3e 100644
--- a/gee/readonlymap.vala
+++ b/gee/readonlymap.vala
@@ -25,7 +25,7 @@ using GLib;
 /**
  * Represents a read-only collection of key/value pairs.
  */
-public class Gee.ReadOnlyMap<K,V> : CollectionObject, Map<K,V> {
+public class Vala.ReadOnlyMap<K,V> : CollectionObject, Map<K,V> {
 	public int size {
 		get { return _map.size; }
 	}
diff --git a/gee/readonlyset.vala b/gee/readonlyset.vala
index 54600dcc8..3d8034373 100644
--- a/gee/readonlyset.vala
+++ b/gee/readonlyset.vala
@@ -25,7 +25,7 @@ using GLib;
 /**
  * Represents a read-only collection of items without duplicates.
  */
-public class Gee.ReadOnlySet<G> : CollectionObject, Iterable<G>, Collection<G>, Set<G> {
+public class Vala.ReadOnlySet<G> : CollectionObject, Iterable<G>, Collection<G>, Set<G> {
 	public int size {
 		get { return _set.size; }
 	}
@@ -44,7 +44,7 @@ public class Gee.ReadOnlySet<G> : CollectionObject, Iterable<G>, Collection<G>,
 		return typeof (G);
 	}
 
-	public Gee.Iterator<G> iterator () {
+	public Vala.Iterator<G> iterator () {
 		if (_set == null) {
 			return new Iterator<G> ();
 		}
@@ -72,7 +72,7 @@ public class Gee.ReadOnlySet<G> : CollectionObject, Iterable<G>, Collection<G>,
 		assert_not_reached ();
 	}
 
-	private class Iterator<G> : CollectionObject, Gee.Iterator<G> {
+	private class Iterator<G> : CollectionObject, Vala.Iterator<G> {
 		public bool next () {
 			return false;
 		}
diff --git a/gee/set.vala b/gee/set.vala
index 57b69e385..03c28da20 100644
--- a/gee/set.vala
+++ b/gee/set.vala
@@ -23,6 +23,6 @@
 /**
  * A set is a collection without duplicates.
  */
-public interface Gee.Set<G> : Collection<G> {
+public interface Vala.Set<G> : Collection<G> {
 }