Do not use Gee namespace to avoid conflict with libgee

14 files changed, 15 insertions, 29 deletions

diff --git a/ccode/valaccodeblock.vala b/ccode/valaccodeblock.vala
index cff8613fe..5c8f2c74d 100644
--- a/ccode/valaccodeblock.vala
+++ b/ccode/valaccodeblock.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a C code block.
@@ -33,7 +32,7 @@ public class Vala.CCodeBlock : CCodeStatement {
 	 */
 	public bool suppress_newline { get; set; }
 
-	private Gee.List<CCodeNode> statements = new ArrayList<CCodeNode> ();
+	private List<CCodeNode> statements = new ArrayList<CCodeNode> ();
 	
 	/**
 	 * Prepend the specified statement to the list of statements.
diff --git a/ccode/valaccodecasestatement.vala b/ccode/valaccodecasestatement.vala
index 8e892a8fd..82b85f45a 100644
--- a/ccode/valaccodecasestatement.vala
+++ b/ccode/valaccodecasestatement.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a case block in a switch statement in C code.
diff --git a/ccode/valaccodecommaexpression.vala b/ccode/valaccodecommaexpression.vala
index b5cafcb71..79f78ae5a 100644
--- a/ccode/valaccodecommaexpression.vala
+++ b/ccode/valaccodecommaexpression.vala
@@ -21,13 +21,12 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a comma separated expression list in the C code.
  */
 public class Vala.CCodeCommaExpression : CCodeExpression {
-	private Gee.List<CCodeExpression> inner = new ArrayList<CCodeExpression> ();
+	private List<CCodeExpression> inner = new ArrayList<CCodeExpression> ();
 	
 	/**
 	 * Appends the specified expression to the expression list.
@@ -38,7 +37,7 @@ public class Vala.CCodeCommaExpression : CCodeExpression {
 		inner.add (expr);
 	}
 
-	public Gee.List<CCodeExpression> get_inner () {
+	public List<CCodeExpression> get_inner () {
 		return new ReadOnlyList<CCodeExpression> (inner);
 	}
 
diff --git a/ccode/valaccodedeclaration.vala b/ccode/valaccodedeclaration.vala
index 22a37bcb9..79966f495 100644
--- a/ccode/valaccodedeclaration.vala
+++ b/ccode/valaccodedeclaration.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a local variable declaration in the C code.
@@ -37,7 +36,7 @@ public class Vala.CCodeDeclaration : CCodeStatement {
 	 */
 	public CCodeModifiers modifiers { get; set; }
 	
-	private Gee.List<CCodeDeclarator> declarators = new ArrayList<CCodeDeclarator> ();
+	private List<CCodeDeclarator> declarators = new ArrayList<CCodeDeclarator> ();
 	
 	public CCodeDeclaration (string type_name) {
 		this.type_name = type_name;
diff --git a/ccode/valaccodeenum.vala b/ccode/valaccodeenum.vala
index 6701d7ee7..c32664712 100644
--- a/ccode/valaccodeenum.vala
+++ b/ccode/valaccodeenum.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents an enum in the C code.
@@ -32,7 +31,7 @@ public class Vala.CCodeEnum : CCodeNode {
 	 */
 	public string name { get; set; }
 	
-	private Gee.List<CCodeEnumValue> values = new ArrayList<CCodeEnumValue> ();
+	private List<CCodeEnumValue> values = new ArrayList<CCodeEnumValue> ();
 	
 	public CCodeEnum (string? name = null) {
 		this.name = name;
diff --git a/ccode/valaccodeenumvalue.vala b/ccode/valaccodeenumvalue.vala
index c1d5aedb9..6dc784fd9 100644
--- a/ccode/valaccodeenumvalue.vala
+++ b/ccode/valaccodeenumvalue.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents an enum value in the C code.
diff --git a/ccode/valaccodeforstatement.vala b/ccode/valaccodeforstatement.vala
index 0710b4c95..c4d14be95 100644
--- a/ccode/valaccodeforstatement.vala
+++ b/ccode/valaccodeforstatement.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a for iteration statement in the C code.
@@ -37,8 +36,8 @@ public class Vala.CCodeForStatement : CCodeStatement {
 	 */
 	public CCodeStatement body { get; set; }
 	
-	private Gee.List<CCodeExpression> initializer = new ArrayList<CCodeExpression> ();
-	private Gee.List<CCodeExpression> iterator = new ArrayList<CCodeExpression> ();
+	private List<CCodeExpression> initializer = new ArrayList<CCodeExpression> ();
+	private List<CCodeExpression> iterator = new ArrayList<CCodeExpression> ();
 	
 	public CCodeForStatement (CCodeExpression? condition, CCodeStatement? body = null) {
 		this.condition = condition;
diff --git a/ccode/valaccodefragment.vala b/ccode/valaccodefragment.vala
index 1c6b266ad..e13c4e385 100644
--- a/ccode/valaccodefragment.vala
+++ b/ccode/valaccodefragment.vala
@@ -21,13 +21,12 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a container for C code nodes.
  */
 public class Vala.CCodeFragment : CCodeNode {
-	private Gee.List<CCodeNode> children = new ArrayList<CCodeNode> ();
+	private List<CCodeNode> children = new ArrayList<CCodeNode> ();
 	
 	/**
 	 * Appends the specified code node to this code fragment.
@@ -43,7 +42,7 @@ public class Vala.CCodeFragment : CCodeNode {
 	 *
 	 * @return children list
 	 */
-	public Gee.List<CCodeNode> get_children () {
+	public List<CCodeNode> get_children () {
 		return new ReadOnlyList<CCodeNode> (children);
 	}
 
diff --git a/ccode/valaccodefunction.vala b/ccode/valaccodefunction.vala
index 1a9d24072..1dfef1b29 100644
--- a/ccode/valaccodefunction.vala
+++ b/ccode/valaccodefunction.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a function declaration in the C code.
@@ -47,7 +46,7 @@ public class Vala.CCodeFunction : CCodeNode {
 	 */
 	public CCodeBlock block { get; set; }
 
-	private Gee.List<CCodeFormalParameter> parameters = new ArrayList<CCodeFormalParameter> ();
+	private List<CCodeFormalParameter> parameters = new ArrayList<CCodeFormalParameter> ();
 	
 	public CCodeFunction (string name, string return_type = "void") {
 		this.name = name;
diff --git a/ccode/valaccodefunctioncall.vala b/ccode/valaccodefunctioncall.vala
index a1961d7bb..ffa659501 100644
--- a/ccode/valaccodefunctioncall.vala
+++ b/ccode/valaccodefunctioncall.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a function call in the C code.
@@ -32,7 +31,7 @@ public class Vala.CCodeFunctionCall : CCodeExpression {
 	 */
 	public CCodeExpression? call { get; set; }
 	
-	private Gee.List<CCodeExpression> arguments = new ArrayList<CCodeExpression> ();
+	private List<CCodeExpression> arguments = new ArrayList<CCodeExpression> ();
 	
 	public CCodeFunctionCall (CCodeExpression? call = null) {
 		this.call = call;
@@ -56,7 +55,7 @@ public class Vala.CCodeFunctionCall : CCodeExpression {
 	 *
 	 * @return list of arguments
 	 */
-	public Gee.List<CCodeExpression> get_arguments () {
+	public List<CCodeExpression> get_arguments () {
 		return new ReadOnlyList<CCodeExpression> (arguments);
 	}
 
diff --git a/ccode/valaccodefunctiondeclarator.vala b/ccode/valaccodefunctiondeclarator.vala
index e3958e265..35a35904e 100644
--- a/ccode/valaccodefunctiondeclarator.vala
+++ b/ccode/valaccodefunctiondeclarator.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a function pointer declarator in the C code.
@@ -32,7 +31,7 @@ public class Vala.CCodeFunctionDeclarator : CCodeDeclarator {
 	 */
 	public string name { get; set; }
 	
-	private Gee.List<CCodeFormalParameter> parameters = new ArrayList<CCodeFormalParameter> ();
+	private List<CCodeFormalParameter> parameters = new ArrayList<CCodeFormalParameter> ();
 	
 	public CCodeFunctionDeclarator (string name) {
 		this.name = name;
diff --git a/ccode/valaccodeinitializerlist.vala b/ccode/valaccodeinitializerlist.vala
index 15689c09d..26cb56e1d 100644
--- a/ccode/valaccodeinitializerlist.vala
+++ b/ccode/valaccodeinitializerlist.vala
@@ -21,13 +21,12 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a struct or array initializer list in the C code.
  */
 public class Vala.CCodeInitializerList : CCodeExpression {
-	private Gee.List<CCodeExpression> initializers = new ArrayList<CCodeExpression> ();
+	private List<CCodeExpression> initializers = new ArrayList<CCodeExpression> ();
 	
 	/**
 	 * Appends the specified expression to this initializer list.
diff --git a/ccode/valaccodestruct.vala b/ccode/valaccodestruct.vala
index a5d5ce2af..ceef03e12 100644
--- a/ccode/valaccodestruct.vala
+++ b/ccode/valaccodestruct.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a struct declaration in the C code.
@@ -32,7 +31,7 @@ public class Vala.CCodeStruct : CCodeNode {
 	 */
 	public string name { get; set; }
 	
-	private Gee.List<CCodeDeclaration> declarations = new ArrayList<CCodeDeclaration> ();
+	private List<CCodeDeclaration> declarations = new ArrayList<CCodeDeclaration> ();
 	
 	public CCodeStruct (string name) {
 		this.name = name;
diff --git a/ccode/valaccodeswitchstatement.vala b/ccode/valaccodeswitchstatement.vala
index 9bf1d9d1a..04edaf5f7 100644
--- a/ccode/valaccodeswitchstatement.vala
+++ b/ccode/valaccodeswitchstatement.vala
@@ -21,7 +21,6 @@
  */
 
 using GLib;
-using Gee;
 
 /**
  * Represents a switch selection statement in the C code.