diff options
Diffstat (limited to 'vala')
33 files changed, 147 insertions, 147 deletions
diff --git a/vala/valablock.vala b/vala/valablock.vala index 66e44aff2..839a86d36 100644 --- a/vala/valablock.vala +++ b/vala/valablock.vala @@ -59,8 +59,8 @@ public class Vala.Block : Symbol, Statement { * * @return statement list */ - public Collection<Statement> get_statements () { - return new ReadOnlyCollection<Statement> (statement_list); + public Gee.List<Statement> get_statements () { + return new ReadOnlyList<Statement> (statement_list); } /** @@ -77,8 +77,8 @@ public class Vala.Block : Symbol, Statement { * * @return variable declarator list */ - public Collection<LocalVariable> get_local_variables () { - return new ReadOnlyCollection<LocalVariable> (local_variables); + public Gee.List<LocalVariable> get_local_variables () { + return new ReadOnlyList<LocalVariable> (local_variables); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valaclass.vala b/vala/valaclass.vala index f817e4f06..1e0d779cf 100644 --- a/vala/valaclass.vala +++ b/vala/valaclass.vala @@ -185,8 +185,8 @@ public class Vala.Class : ObjectTypeSymbol { * * @return list of base types */ - public Collection<DataType> get_base_types () { - return new ReadOnlyCollection<DataType> (base_types); + public Gee.List<DataType> get_base_types () { + return new ReadOnlyList<DataType> (base_types); } /** @@ -205,8 +205,8 @@ public class Vala.Class : ObjectTypeSymbol { * * @return list of type parameters */ - public Collection<TypeParameter> get_type_parameters () { - return new ReadOnlyCollection<TypeParameter> (type_parameters); + public Gee.List<TypeParameter> get_type_parameters () { + return new ReadOnlyList<TypeParameter> (type_parameters); } /** @@ -237,8 +237,8 @@ public class Vala.Class : ObjectTypeSymbol { * * @return list of fields */ - public Collection<Field> get_fields () { - return new ReadOnlyCollection<Field> (fields); + public Gee.List<Field> get_fields () { + return new ReadOnlyList<Field> (fields); } /** @@ -287,8 +287,8 @@ public class Vala.Class : ObjectTypeSymbol { * * @return list of methods */ - public override Collection<Method> get_methods () { - return new ReadOnlyCollection<Method> (methods); + public override Gee.List<Method> get_methods () { + return new ReadOnlyList<Method> (methods); } /** @@ -313,8 +313,8 @@ public class Vala.Class : ObjectTypeSymbol { * * @return list of properties */ - public override Collection<Property> get_properties () { - return new ReadOnlyCollection<Property> (properties); + public override Gee.List<Property> get_properties () { + return new ReadOnlyList<Property> (properties); } /** @@ -332,8 +332,8 @@ public class Vala.Class : ObjectTypeSymbol { * * @return list of signals */ - public override Collection<Signal> get_signals () { - return new ReadOnlyCollection<Signal> (signals); + public override Gee.List<Signal> get_signals () { + return new ReadOnlyList<Signal> (signals); } /** diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala index e884aaa4d..f3f563f36 100644 --- a/vala/valacodecontext.vala +++ b/vala/valacodecontext.vala @@ -154,8 +154,8 @@ public class Vala.CodeContext : Object { * * @return list of source files */ - public Collection<SourceFile> get_source_files () { - return new ReadOnlyCollection<SourceFile> (source_files); + public Gee.List<SourceFile> get_source_files () { + return new ReadOnlyList<SourceFile> (source_files); } /** @@ -163,8 +163,8 @@ public class Vala.CodeContext : Object { * * @return list of C source files */ - public Collection<string> get_c_source_files () { - return new ReadOnlyCollection<string> (c_source_files); + public Gee.List<string> get_c_source_files () { + return new ReadOnlyList<string> (c_source_files); } /** @@ -190,8 +190,8 @@ public class Vala.CodeContext : Object { * * @return list of used packages */ - public Collection<string> get_packages () { - return new ReadOnlyCollection<string> (packages); + public Gee.List<string> get_packages () { + return new ReadOnlyList<string> (packages); } /** @@ -294,7 +294,7 @@ public class Vala.CodeContext : Object { return file; } - private void visit (SourceFile file, Collection<SourceFile> chain) { + private void visit (SourceFile file, Gee.List<SourceFile> chain) { Gee.List<SourceFile> l = new ArrayList<SourceFile> (); foreach (SourceFile chain_file in chain) { l.add (chain_file); diff --git a/vala/valacodenode.vala b/vala/valacodenode.vala index d92232e1c..d924f4d77 100644 --- a/vala/valacodenode.vala +++ b/vala/valacodenode.vala @@ -98,7 +98,7 @@ public abstract class Vala.CodeNode : Object { * Adds a collection of error types to the exceptions that can be thrown by this node * or a child node */ - public void add_error_types (Gee.Collection<DataType> error_types) { + public void add_error_types (Gee.List<DataType> error_types) { foreach (DataType error_type in error_types) { _error_types.add (error_type); error_type.parent_node = this; diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala index 5a1d3dd0e..3a1372537 100644 --- a/vala/valadatatype.vala +++ b/vala/valadatatype.vala @@ -371,7 +371,7 @@ public abstract class Vala.DataType : CodeNode { * * @return parameter list */ - public virtual Collection<FormalParameter>? get_parameters () { + public virtual Gee.List<FormalParameter>? get_parameters () { return null; } @@ -390,7 +390,7 @@ public abstract class Vala.DataType : CodeNode { * * @return symbol list */ - public virtual Collection<Symbol> get_symbols () { + public virtual Gee.List<Symbol> get_symbols () { var symbols = new ArrayList<Symbol> (); if (data_type != null) { symbols.add (data_type); diff --git a/vala/valadelegatetype.vala b/vala/valadelegatetype.vala index adfc0dfe2..3b113473c 100644 --- a/vala/valadelegatetype.vala +++ b/vala/valadelegatetype.vala @@ -41,7 +41,7 @@ public class Vala.DelegateType : DataType { return delegate_symbol.return_type; } - public override Collection<FormalParameter>? get_parameters () { + public override Gee.List<FormalParameter>? get_parameters () { return delegate_symbol.get_parameters (); } @@ -61,7 +61,7 @@ public class Vala.DelegateType : DataType { return delegate_symbol.get_cname (); } - public override Collection<Symbol> get_symbols () { + public override Gee.List<Symbol> get_symbols () { var symbols = new ArrayList<Symbol> (); symbols.add (delegate_symbol); return symbols; diff --git a/vala/valadynamicmethod.vala b/vala/valadynamicmethod.vala index 054ba1e79..3c1355536 100644 --- a/vala/valadynamicmethod.vala +++ b/vala/valadynamicmethod.vala @@ -41,8 +41,8 @@ public class Vala.DynamicMethod : Method { this.source_reference = source_reference; } - public override Collection<string> get_cheader_filenames () { - return new ReadOnlyCollection<string> (); + public override Gee.List<string> get_cheader_filenames () { + return new ReadOnlyList<string> (); } public override string get_default_cname () { diff --git a/vala/valadynamicproperty.vala b/vala/valadynamicproperty.vala index ea76ca57d..a2f36e6ec 100644 --- a/vala/valadynamicproperty.vala +++ b/vala/valadynamicproperty.vala @@ -37,8 +37,8 @@ public class Vala.DynamicProperty : Property { this.source_reference = source_reference; } - public override Collection<string> get_cheader_filenames () { - return new ReadOnlyCollection<string> (); + public override Gee.List<string> get_cheader_filenames () { + return new ReadOnlyList<string> (); } public override CodeBinding? create_code_binding (CodeGenerator codegen) { diff --git a/vala/valaenum.vala b/vala/valaenum.vala index f20ed75f7..09e3e48d6 100644 --- a/vala/valaenum.vala +++ b/vala/valaenum.vala @@ -93,8 +93,8 @@ public class Vala.Enum : TypeSymbol { * * @return list of enum values */ - public Collection<EnumValue> get_values () { - return new ReadOnlyCollection<EnumValue> (values); + public Gee.List<EnumValue> get_values () { + return new ReadOnlyList<EnumValue> (values); } /** @@ -102,8 +102,8 @@ public class Vala.Enum : TypeSymbol { * * @return list of methods */ - public Collection<Method> get_methods () { - return new ReadOnlyCollection<Method> (methods); + public Gee.List<Method> get_methods () { + return new ReadOnlyList<Method> (methods); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valaerrordomain.vala b/vala/valaerrordomain.vala index 0b5086f81..a68087c7c 100644 --- a/vala/valaerrordomain.vala +++ b/vala/valaerrordomain.vala @@ -82,8 +82,8 @@ public class Vala.ErrorDomain : TypeSymbol { * * @return list of error codes */ - public Collection<ErrorCode> get_codes () { - return new ReadOnlyCollection<ErrorCode> (codes); + public Gee.List<ErrorCode> get_codes () { + return new ReadOnlyList<ErrorCode> (codes); } /** @@ -91,8 +91,8 @@ public class Vala.ErrorDomain : TypeSymbol { * * @return list of methods */ - public Collection<Method> get_methods () { - return new ReadOnlyCollection<Method> (methods); + public Gee.List<Method> get_methods () { + return new ReadOnlyList<Method> (methods); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valaforstatement.vala b/vala/valaforstatement.vala index b9979fbdc..521a66474 100644 --- a/vala/valaforstatement.vala +++ b/vala/valaforstatement.vala @@ -90,8 +90,8 @@ public class Vala.ForStatement : CodeNode, Statement { * * @return initializer list */ - public Collection<Expression> get_initializer () { - return new ReadOnlyCollection<Expression> (initializer); + public Gee.List<Expression> get_initializer () { + return new ReadOnlyList<Expression> (initializer); } /** @@ -109,8 +109,8 @@ public class Vala.ForStatement : CodeNode, Statement { * * @return iterator */ - public Collection<Expression> get_iterator () { - return new ReadOnlyCollection<Expression> (iterator); + public Gee.List<Expression> get_iterator () { + return new ReadOnlyList<Expression> (iterator); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valainitializerlist.vala b/vala/valainitializerlist.vala index a87671652..35f9ce3f4 100644 --- a/vala/valainitializerlist.vala +++ b/vala/valainitializerlist.vala @@ -45,8 +45,8 @@ public class Vala.InitializerList : Expression { * * @return expression list */ - public Collection<Expression> get_initializers () { - return new ReadOnlyCollection<Expression> (initializers); + public Gee.List<Expression> get_initializers () { + return new ReadOnlyList<Expression> (initializers); } /** diff --git a/vala/valainterface.vala b/vala/valainterface.vala index 95cf53f54..2211c69c0 100644 --- a/vala/valainterface.vala +++ b/vala/valainterface.vala @@ -81,8 +81,8 @@ public class Vala.Interface : ObjectTypeSymbol { * * @return list of type parameters */ - public Collection<TypeParameter> get_type_parameters () { - return new ReadOnlyCollection<TypeParameter> (type_parameters); + public Gee.List<TypeParameter> get_type_parameters () { + return new ReadOnlyList<TypeParameter> (type_parameters); } /** @@ -111,8 +111,8 @@ public class Vala.Interface : ObjectTypeSymbol { * * @return list of base types */ - public Collection<DataType> get_prerequisites () { - return new ReadOnlyCollection<DataType> (prerequisites); + public Gee.List<DataType> get_prerequisites () { + return new ReadOnlyList<DataType> (prerequisites); } /** @@ -145,8 +145,8 @@ public class Vala.Interface : ObjectTypeSymbol { * * @return list of methods */ - public override Collection<Method> get_methods () { - return new ReadOnlyCollection<Method> (methods); + public override Gee.List<Method> get_methods () { + return new ReadOnlyList<Method> (methods); } /** @@ -165,8 +165,8 @@ public class Vala.Interface : ObjectTypeSymbol { * * @return list of fields */ - public Collection<Field> get_fields () { - return new ReadOnlyCollection<Field> (fields); + public Gee.List<Field> get_fields () { + return new ReadOnlyList<Field> (fields); } /** @@ -187,8 +187,8 @@ public class Vala.Interface : ObjectTypeSymbol { * * @return list of properties */ - public override Collection<Property> get_properties () { - return new ReadOnlyCollection<Property> (properties); + public override Gee.List<Property> get_properties () { + return new ReadOnlyList<Property> (properties); } /** @@ -206,8 +206,8 @@ public class Vala.Interface : ObjectTypeSymbol { * * @return list of signals */ - public override Collection<Signal> get_signals () { - return new ReadOnlyCollection<Signal> (signals); + public override Gee.List<Signal> get_signals () { + return new ReadOnlyList<Signal> (signals); } /** diff --git a/vala/valainterfacewriter.vala b/vala/valainterfacewriter.vala index d6ec3a7e7..c5003633e 100644 --- a/vala/valainterfacewriter.vala +++ b/vala/valainterfacewriter.vala @@ -556,7 +556,7 @@ public class Vala.InterfaceWriter : CodeVisitor { write_newline (); } - private void write_error_domains (Collection<DataType> error_domains) { + private void write_error_domains (Gee.List<DataType> error_domains) { if (error_domains.size > 0) { write_string (" throws "); @@ -578,7 +578,7 @@ public class Vala.InterfaceWriter : CodeVisitor { return ((int) (d1 * 1000)) == ((int) (d2 * 1000)); } - private void write_params (Collection<FormalParameter> params) { + private void write_params (Gee.List<FormalParameter> params) { write_string ("("); int i = 1; diff --git a/vala/valainvocationexpression.vala b/vala/valainvocationexpression.vala index d0ec2e06e..0da84d4ea 100644 --- a/vala/valainvocationexpression.vala +++ b/vala/valainvocationexpression.vala @@ -72,8 +72,8 @@ public class Vala.InvocationExpression : Expression { * * @return argument list */ - public Collection<Expression> get_argument_list () { - return new ReadOnlyCollection<Expression> (argument_list); + public Gee.List<Expression> get_argument_list () { + return new ReadOnlyList<Expression> (argument_list); } /** diff --git a/vala/valalambdaexpression.vala b/vala/valalambdaexpression.vala index a3fe69b9b..9af274766 100644 --- a/vala/valalambdaexpression.vala +++ b/vala/valalambdaexpression.vala @@ -85,8 +85,8 @@ public class Vala.LambdaExpression : Expression { * * @return parameter list */ - public Collection<string> get_parameters () { - return new ReadOnlyCollection<string> (parameters); + public Gee.List<string> get_parameters () { + return new ReadOnlyList<string> (parameters); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valamember.vala b/vala/valamember.vala index 480885659..5e5234b41 100644 --- a/vala/valamember.vala +++ b/vala/valamember.vala @@ -33,7 +33,7 @@ public class Vala.Member : Symbol { visitor.visit_member (this); } - public override Collection<string> get_cheader_filenames () { + public override Gee.List<string> get_cheader_filenames () { if (cheader_filenames.size == 0 && parent_symbol != null) { /* default to header filenames of the namespace */ foreach (string filename in parent_symbol.get_cheader_filenames ()) { @@ -45,7 +45,7 @@ public class Vala.Member : Symbol { cheader_filenames.add (source_reference.file.get_cinclude_filename ()); } } - return new ReadOnlyCollection<string> (cheader_filenames); + return new ReadOnlyList<string> (cheader_filenames); } diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala index 96ef59178..e5b8540c4 100644 --- a/vala/valamemberaccess.vala +++ b/vala/valamemberaccess.vala @@ -112,8 +112,8 @@ public class Vala.MemberAccess : Expression { * * @return type argument list */ - public Collection<DataType> get_type_arguments () { - return new ReadOnlyCollection<DataType> (type_argument_list); + public Gee.List<DataType> get_type_arguments () { + return new ReadOnlyList<DataType> (type_argument_list); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valamethod.vala b/vala/valamethod.vala index a4ef92392..7f591a32b 100644 --- a/vala/valamethod.vala +++ b/vala/valamethod.vala @@ -247,8 +247,8 @@ public class Vala.Method : Member { } } - public Collection<FormalParameter> get_parameters () { - return new ReadOnlyCollection<FormalParameter> (parameters); + public Gee.List<FormalParameter> get_parameters () { + return new ReadOnlyList<FormalParameter> (parameters); } /** @@ -465,8 +465,8 @@ public class Vala.Method : Member { * * @return list of preconditions */ - public Collection<Expression> get_preconditions () { - return new ReadOnlyCollection<Expression> (preconditions); + public Gee.List<Expression> get_preconditions () { + return new ReadOnlyList<Expression> (preconditions); } /** @@ -484,8 +484,8 @@ public class Vala.Method : Member { * * @return list of postconditions */ - public Collection<Expression> get_postconditions () { - return new ReadOnlyCollection<Expression> (postconditions); + public Gee.List<Expression> get_postconditions () { + return new ReadOnlyList<Expression> (postconditions); } public override void replace_type (DataType old_type, DataType new_type) { diff --git a/vala/valamethodtype.vala b/vala/valamethodtype.vala index be1b65785..6ef17c5c0 100644 --- a/vala/valamethodtype.vala +++ b/vala/valamethodtype.vala @@ -41,7 +41,7 @@ public class Vala.MethodType : DataType { return method_symbol.return_type; } - public override Collection<FormalParameter>? get_parameters () { + public override Gee.List<FormalParameter>? get_parameters () { return method_symbol.get_parameters (); } diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala index 2f9255a25..55bae5899 100644 --- a/vala/valanamespace.vala +++ b/vala/valanamespace.vala @@ -110,8 +110,8 @@ public class Vala.Namespace : Symbol { * * @return namespace list */ - public Collection<Namespace> get_namespaces () { - return new ReadOnlyCollection<Namespace> (namespaces); + public Gee.List<Namespace> get_namespaces () { + return new ReadOnlyList<Namespace> (namespaces); } /** @@ -201,8 +201,8 @@ public class Vala.Namespace : Symbol { * * @return struct list */ - public Collection<Struct> get_structs () { - return new ReadOnlyCollection<Struct> (structs); + public Gee.List<Struct> get_structs () { + return new ReadOnlyList<Struct> (structs); } /** @@ -210,8 +210,8 @@ public class Vala.Namespace : Symbol { * * @return class list */ - public Collection<Class> get_classes () { - return new ReadOnlyCollection<Class> (classes); + public Gee.List<Class> get_classes () { + return new ReadOnlyList<Class> (classes); } /** @@ -219,8 +219,8 @@ public class Vala.Namespace : Symbol { * * @return interface list */ - public Collection<Interface> get_interfaces () { - return new ReadOnlyCollection<Interface> (interfaces); + public Gee.List<Interface> get_interfaces () { + return new ReadOnlyList<Interface> (interfaces); } /** @@ -228,8 +228,8 @@ public class Vala.Namespace : Symbol { * * @return enum list */ - public Collection<Enum> get_enums () { - return new ReadOnlyCollection<Enum> (enums); + public Gee.List<Enum> get_enums () { + return new ReadOnlyList<Enum> (enums); } /** @@ -237,8 +237,8 @@ public class Vala.Namespace : Symbol { * * @return error domain list */ - public Collection<ErrorDomain> get_error_types () { - return new ReadOnlyCollection<ErrorDomain> (error_domains); + public Gee.List<ErrorDomain> get_error_types () { + return new ReadOnlyList<ErrorDomain> (error_domains); } /** @@ -246,8 +246,8 @@ public class Vala.Namespace : Symbol { * * @return field list */ - public Collection<Field> get_fields () { - return new ReadOnlyCollection<Field> (fields); + public Gee.List<Field> get_fields () { + return new ReadOnlyList<Field> (fields); } /** @@ -255,8 +255,8 @@ public class Vala.Namespace : Symbol { * * @return constant list */ - public Collection<Constant> get_constants () { - return new ReadOnlyCollection<Constant> (constants); + public Gee.List<Constant> get_constants () { + return new ReadOnlyList<Constant> (constants); } /** @@ -264,8 +264,8 @@ public class Vala.Namespace : Symbol { * * @return delegate list */ - public Collection<Delegate> get_delegates () { - return new ReadOnlyCollection<Delegate> (delegates); + public Gee.List<Delegate> get_delegates () { + return new ReadOnlyList<Delegate> (delegates); } /** @@ -273,8 +273,8 @@ public class Vala.Namespace : Symbol { * * @return method list */ - public Collection<Method> get_methods () { - return new ReadOnlyCollection<Method> (methods); + public Gee.List<Method> get_methods () { + return new ReadOnlyList<Method> (methods); } /** @@ -446,8 +446,8 @@ public class Vala.Namespace : Symbol { this.lower_case_cprefix = cprefix; } - public override Collection<string> get_cheader_filenames () { - return new ReadOnlyCollection<string> (cheader_filenames); + public override Gee.List<string> get_cheader_filenames () { + return new ReadOnlyList<string> (cheader_filenames); } /** diff --git a/vala/valaobjectcreationexpression.vala b/vala/valaobjectcreationexpression.vala index 0de7b6600..063f81a85 100644 --- a/vala/valaobjectcreationexpression.vala +++ b/vala/valaobjectcreationexpression.vala @@ -85,8 +85,8 @@ public class Vala.ObjectCreationExpression : Expression { * * @return argument list */ - public Collection<Expression> get_argument_list () { - return new ReadOnlyCollection<Expression> (argument_list); + public Gee.List<Expression> get_argument_list () { + return new ReadOnlyList<Expression> (argument_list); } /** @@ -104,8 +104,8 @@ public class Vala.ObjectCreationExpression : Expression { * * @return member initializer list */ - public Collection<MemberInitializer> get_object_initializer () { - return new ReadOnlyCollection<MemberInitializer> (object_initializer); + public Gee.List<MemberInitializer> get_object_initializer () { + return new ReadOnlyList<MemberInitializer> (object_initializer); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valaobjecttypesymbol.vala b/vala/valaobjecttypesymbol.vala index 345fe2478..4bc7e3294 100644 --- a/vala/valaobjecttypesymbol.vala +++ b/vala/valaobjecttypesymbol.vala @@ -29,7 +29,7 @@ using Gee; * Vala API file. */ public abstract class Vala.ObjectTypeSymbol : TypeSymbol { - public abstract Collection<Method> get_methods (); - public abstract Collection<Signal> get_signals (); - public abstract Collection<Property> get_properties (); + public abstract Gee.List<Method> get_methods (); + public abstract Gee.List<Signal> get_signals (); + public abstract Gee.List<Property> get_properties (); } diff --git a/vala/valapointertype.vala b/vala/valapointertype.vala index 3c6b79244..38c17aa35 100644 --- a/vala/valapointertype.vala +++ b/vala/valapointertype.vala @@ -90,7 +90,7 @@ public class Vala.PointerType : DataType { return SemanticAnalyzer.symbol_lookup_inherited (base_symbol, member_name); } - public override Collection<Symbol> get_symbols () { + public override Gee.List<Symbol> get_symbols () { return base_type.get_symbols (); } diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala index 3eb625fb4..ff2068a84 100644 --- a/vala/valasemanticanalyzer.vala +++ b/vala/valasemanticanalyzer.vala @@ -37,7 +37,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { Class current_class; Struct current_struct; - Collection<NamespaceReference> current_using_directives; + Gee.List<NamespaceReference> current_using_directives; DataType bool_type; DataType string_type; @@ -232,7 +232,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { current_class = null; } - private void get_all_prerequisites (Interface iface, Collection<TypeSymbol> list) { + private void get_all_prerequisites (Interface iface, Gee.List<TypeSymbol> list) { foreach (DataType prereq in iface.get_prerequisites ()) { TypeSymbol type = prereq.data_type; /* skip on previous errors */ @@ -1053,7 +1053,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { } } else { stmt.error = true; - Report.error (stmt.source_reference, "Collection not iterable"); + Report.error (stmt.source_reference, "Gee.List not iterable"); return; } @@ -1263,7 +1263,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { * @param expr an array creation expression */ public override void visit_array_creation_expression (ArrayCreationExpression expr) { - Collection<Expression> size = expr.get_sizes (); + Gee.List<Expression> size = expr.get_sizes (); var initlist = expr.initializer_list; if (expr.element_type != null) { @@ -1869,7 +1869,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { return; } - Collection<FormalParameter> params; + Gee.List<FormalParameter> params; if (mtype != null && mtype.is_invokable ()) { params = mtype.get_parameters (); @@ -1964,7 +1964,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { check_arguments (expr, mtype, params, expr.get_argument_list ()); } - private bool check_arguments (Expression expr, DataType mtype, Collection<FormalParameter> params, Collection<Expression> args) { + private bool check_arguments (Expression expr, DataType mtype, Gee.List<FormalParameter> params, Gee.List<Expression> args) { Expression prev_arg = null; Iterator<Expression> arg_it = args.iterator (); @@ -2254,7 +2254,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { expr.value_type = unichar_type; } else if (container_type != null && list_type != null && map_type != null && (container_type.is_subtype_of (list_type) || container_type.is_subtype_of (map_type))) { - Collection<Expression> indices = expr.get_indices (); + Gee.List<Expression> indices = expr.get_indices (); if (indices.size != 1) { expr.error = true; Report.error (expr.source_reference, "Element access with more than one dimension is not supported for the specified type"); @@ -2273,7 +2273,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor { get_sym = map_type.scope.lookup ("get"); } var get_method = (Method) get_sym; - Collection<FormalParameter> get_params = get_method.get_parameters (); + Gee.List<FormalParameter> get_params = get_method.get_parameters (); Iterator<FormalParameter> get_params_it = get_params.iterator (); get_params_it.next (); var get_param = get_params_it.get (); diff --git a/vala/valasignaltype.vala b/vala/valasignaltype.vala index fd53530c4..3157a64b2 100644 --- a/vala/valasignaltype.vala +++ b/vala/valasignaltype.vala @@ -41,7 +41,7 @@ public class Vala.SignalType : DataType { return signal_symbol.return_type; } - public override Collection<FormalParameter>? get_parameters () { + public override Gee.List<FormalParameter>? get_parameters () { return signal_symbol.get_parameters (); } diff --git a/vala/valasourcefile.vala b/vala/valasourcefile.vala index 3b07d699d..b9db1efe5 100644 --- a/vala/valasourcefile.vala +++ b/vala/valasourcefile.vala @@ -116,8 +116,8 @@ public class Vala.SourceFile : Object { * * @return using directive list */ - public Collection<NamespaceReference> get_using_directives () { - return new ReadOnlyCollection<NamespaceReference> (using_directives); + public Gee.List<NamespaceReference> get_using_directives () { + return new ReadOnlyList<NamespaceReference> (using_directives); } /** @@ -138,8 +138,8 @@ public class Vala.SourceFile : Object { * * @return code node list */ - public Collection<CodeNode> get_nodes () { - return new ReadOnlyCollection<CodeNode> (nodes); + public Gee.List<CodeNode> get_nodes () { + return new ReadOnlyList<CodeNode> (nodes); } public void accept (CodeVisitor visitor) { @@ -307,8 +307,8 @@ public class Vala.SourceFile : Object { * * @return external include list for C header file */ - public Collection<string> get_header_external_includes () { - return new ReadOnlyCollection<string> (header_external_includes); + public Gee.List<string> get_header_external_includes () { + return new ReadOnlyList<string> (header_external_includes); } /** @@ -330,8 +330,8 @@ public class Vala.SourceFile : Object { * * @return internal include list for C header file */ - public Collection<string> get_header_internal_includes () { - return new ReadOnlyCollection<string> (header_internal_includes); + public Gee.List<string> get_header_internal_includes () { + return new ReadOnlyList<string> (header_internal_includes); } /** @@ -340,8 +340,8 @@ public class Vala.SourceFile : Object { * * @return include list for C source file */ - public Collection<string> get_source_external_includes () { - return new ReadOnlyCollection<string> (source_external_includes); + public Gee.List<string> get_source_external_includes () { + return new ReadOnlyList<string> (source_external_includes); } /** @@ -350,8 +350,8 @@ public class Vala.SourceFile : Object { * * @return include list for C source file */ - public Collection<string> get_source_internal_includes () { - return new ReadOnlyCollection<string> (source_internal_includes); + public Gee.List<string> get_source_internal_includes () { + return new ReadOnlyList<string> (source_internal_includes); } /** @@ -360,8 +360,8 @@ public class Vala.SourceFile : Object { * * @return definite source file dependencies */ - public Collection<weak SourceFile> get_header_internal_full_dependencies () { - return new ReadOnlyCollection<weak SourceFile> (header_internal_full_dependencies); + public Gee.List<weak SourceFile> get_header_internal_full_dependencies () { + return new ReadOnlyList<weak SourceFile> (header_internal_full_dependencies); } /** @@ -370,8 +370,8 @@ public class Vala.SourceFile : Object { * * @return loose source file dependencies */ - public Collection<weak SourceFile> get_header_internal_dependencies () { - return new ReadOnlyCollection<weak SourceFile> (header_internal_dependencies); + public Gee.List<weak SourceFile> get_header_internal_dependencies () { + return new ReadOnlyList<weak SourceFile> (header_internal_dependencies); } /** diff --git a/vala/valastruct.vala b/vala/valastruct.vala index d30241f14..389aa82dd 100644 --- a/vala/valastruct.vala +++ b/vala/valastruct.vala @@ -84,8 +84,8 @@ public class Vala.Struct : TypeSymbol { * * @return list of type parameters */ - public Collection<TypeParameter> get_type_parameters () { - return new ReadOnlyCollection<TypeParameter> (type_parameters); + public Gee.List<TypeParameter> get_type_parameters () { + return new ReadOnlyList<TypeParameter> (type_parameters); } /** @@ -113,8 +113,8 @@ public class Vala.Struct : TypeSymbol { * * @return list of fields */ - public Collection<Field> get_fields () { - return new ReadOnlyCollection<Field> (fields); + public Gee.List<Field> get_fields () { + return new ReadOnlyList<Field> (fields); } /** @@ -159,8 +159,8 @@ public class Vala.Struct : TypeSymbol { * * @return list of methods */ - public Collection<Method> get_methods () { - return new ReadOnlyCollection<Method> (methods); + public Gee.List<Method> get_methods () { + return new ReadOnlyList<Method> (methods); } public override void accept (CodeVisitor visitor) { @@ -474,8 +474,8 @@ public class Vala.Struct : TypeSymbol { * * @return list of base types */ - public Collection<DataType> get_base_types () { - return new ReadOnlyCollection<DataType> (base_types); + public Gee.List<DataType> get_base_types () { + return new ReadOnlyList<DataType> (base_types); } public override int get_type_parameter_index (string name) { diff --git a/vala/valaswitchsection.vala b/vala/valaswitchsection.vala index 970369f12..ee5dd2c53 100644 --- a/vala/valaswitchsection.vala +++ b/vala/valaswitchsection.vala @@ -53,8 +53,8 @@ public class Vala.SwitchSection : Block { * * @return switch label list */ - public Collection<SwitchLabel> get_labels () { - return new ReadOnlyCollection<SwitchLabel> (labels); + public Gee.List<SwitchLabel> get_labels () { + return new ReadOnlyList<SwitchLabel> (labels); } public bool has_default_label () { diff --git a/vala/valaswitchstatement.vala b/vala/valaswitchstatement.vala index ddfbed191..83cec8398 100644 --- a/vala/valaswitchstatement.vala +++ b/vala/valaswitchstatement.vala @@ -70,8 +70,8 @@ public class Vala.SwitchStatement : CodeNode, Statement { * * @return section list */ - public Collection<SwitchSection> get_sections () { - return new ReadOnlyCollection<SwitchSection> (sections); + public Gee.List<SwitchSection> get_sections () { + return new ReadOnlyList<SwitchSection> (sections); } public override void accept (CodeVisitor visitor) { diff --git a/vala/valasymbol.vala b/vala/valasymbol.vala index 07c6cecd6..f916732b8 100644 --- a/vala/valasymbol.vala +++ b/vala/valasymbol.vala @@ -191,8 +191,8 @@ public abstract class Vala.Symbol : CodeNode { * * @return list of C header filenames for this symbol */ - public virtual Collection<string> get_cheader_filenames () { - return new ReadOnlyCollection<string> (); + public virtual Gee.List<string> get_cheader_filenames () { + return new ReadOnlyList<string> (); } /** diff --git a/vala/valasymbolresolver.vala b/vala/valasymbolresolver.vala index c0cab1756..50cb091a8 100644 --- a/vala/valasymbolresolver.vala +++ b/vala/valasymbolresolver.vala @@ -30,7 +30,7 @@ using Gee; public class Vala.SymbolResolver : CodeVisitor { Symbol root_symbol; Scope current_scope; - Collection<NamespaceReference> current_using_directives; + Gee.List<NamespaceReference> current_using_directives; /** * Resolve symbol names in the specified code context. diff --git a/vala/valatypesymbol.vala b/vala/valatypesymbol.vala index ed233c38d..fdbc9c850 100644 --- a/vala/valatypesymbol.vala +++ b/vala/valatypesymbol.vala @@ -191,7 +191,7 @@ public abstract class Vala.TypeSymbol : Symbol { return null; } - public override Collection<string> get_cheader_filenames () { + public override Gee.List<string> get_cheader_filenames () { if (cheader_filenames.size == 0) { /* default to header filenames of the namespace */ foreach (string filename in parent_symbol.get_cheader_filenames ()) { @@ -203,7 +203,7 @@ public abstract class Vala.TypeSymbol : Symbol { cheader_filenames.add (source_reference.file.get_cinclude_filename ()); } } - return new ReadOnlyCollection<string> (cheader_filenames); + return new ReadOnlyList<string> (cheader_filenames); } /** |