diff options
Diffstat (limited to 'libvaladoc/api')
39 files changed, 115 insertions, 153 deletions
diff --git a/libvaladoc/api/array.vala b/libvaladoc/api/array.vala index cfbd64291..8e3cbe5fb 100644 --- a/libvaladoc/api/array.vala +++ b/libvaladoc/api/array.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents an array declaration. diff --git a/libvaladoc/api/attribute.vala b/libvaladoc/api/attribute.vala index 04fac9b18..da6591992 100644 --- a/libvaladoc/api/attribute.vala +++ b/libvaladoc/api/attribute.vala @@ -20,12 +20,11 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Valadoc.Content; -using Gee; +using Valadoc.Content; public class Valadoc.Api.Attribute : Item { - private ArrayList<AttributeArgument> args = new ArrayList<AttributeArgument> (); + private Vala.ArrayList<AttributeArgument> args = new Vala.ArrayList<AttributeArgument> (); private SourceFile file; public string name { diff --git a/libvaladoc/api/attributeargument.vala b/libvaladoc/api/attributeargument.vala index 7bcd0c6d8..1a3b01fab 100644 --- a/libvaladoc/api/attributeargument.vala +++ b/libvaladoc/api/attributeargument.vala @@ -22,9 +22,6 @@ using Valadoc.Content; -using Gee; - - public class Valadoc.Api.AttributeArgument : Item { public enum Type { diff --git a/libvaladoc/api/browsable.vala b/libvaladoc/api/browsable.vala index 498ba0dd8..7ae9b80fb 100644 --- a/libvaladoc/api/browsable.vala +++ b/libvaladoc/api/browsable.vala @@ -20,8 +20,6 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; - /** * Specifies whether users are able to browse the item. diff --git a/libvaladoc/api/callable.vala b/libvaladoc/api/callable.vala index 60515ee1b..29d965dd0 100644 --- a/libvaladoc/api/callable.vala +++ b/libvaladoc/api/callable.vala @@ -22,9 +22,6 @@ using Valadoc; -using GLib; -using Gee; - /** * Used to translate imported C-documentation diff --git a/libvaladoc/api/childsymbolregistrar.vala b/libvaladoc/api/childsymbolregistrar.vala index e044327b0..75b072d19 100644 --- a/libvaladoc/api/childsymbolregistrar.vala +++ b/libvaladoc/api/childsymbolregistrar.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Valadoc.Api; -using Gee; +using Valadoc.Api; public class Valadoc.Api.ChildSymbolRegistrar : Visitor { /** @@ -50,7 +49,7 @@ public class Valadoc.Api.ChildSymbolRegistrar : Visitor { * {@inheritDoc} */ public override void visit_interface (Interface item) { - Collection<TypeReference> interfaces = item.get_implemented_interface_list (); + Vala.Collection<TypeReference> interfaces = item.get_implemented_interface_list (); foreach (var type_ref in interfaces) { ((Interface) type_ref.data_type).register_related_interface (item); } @@ -66,7 +65,7 @@ public class Valadoc.Api.ChildSymbolRegistrar : Visitor { * {@inheritDoc} */ public override void visit_class (Class item) { - Collection<TypeReference> interfaces = item.get_implemented_interface_list (); + Vala.Collection<TypeReference> interfaces = item.get_implemented_interface_list (); foreach (TypeReference type_ref in interfaces) { ((Interface) type_ref.data_type).register_implementation (item); } diff --git a/libvaladoc/api/class.vala b/libvaladoc/api/class.vala index 8d792a75a..4ef99ea14 100644 --- a/libvaladoc/api/class.vala +++ b/libvaladoc/api/class.vala @@ -20,15 +20,14 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a class declaration. */ public class Valadoc.Api.Class : TypeSymbol { - private ArrayList<TypeReference> interfaces; + private Vala.ArrayList<TypeReference> interfaces; private string? dbus_name; private string? take_value_function_cname; @@ -58,7 +57,7 @@ public class Valadoc.Api.Class : TypeSymbol { base (parent, file, name, accessibility, comment, type_macro_name, is_type_macro_name, type_cast_macro_name, type_function_name, is_basic_type, data); - this.interfaces = new ArrayList<TypeReference> (); + this.interfaces = new Vala.ArrayList<TypeReference> (); this.is_class_type_macro_name = is_class_type_macro_name; this.class_type_macro_name = class_type_macro_name; @@ -215,20 +214,20 @@ public class Valadoc.Api.Class : TypeSymbol { * * @see get_full_implemented_interface_list */ - public Collection<TypeReference> get_implemented_interface_list () { + public Vala.Collection<TypeReference> get_implemented_interface_list () { return this.interfaces; } - private Collection<TypeReference> _full_implemented_interfaces = null; + private Vala.Collection<TypeReference> _full_implemented_interfaces = null; /** * Returns a list of all implemented interfaces. * * @see get_implemented_interface_list */ - public Collection<TypeReference> get_full_implemented_interface_list () { + public Vala.Collection<TypeReference> get_full_implemented_interface_list () { if (_full_implemented_interfaces == null) { - _full_implemented_interfaces = new LinkedList<TypeReference> (); + _full_implemented_interfaces = new Vala.ArrayList<TypeReference> (); _full_implemented_interfaces.add_all (this.interfaces); if (base_type != null) { @@ -277,21 +276,21 @@ public class Valadoc.Api.Class : TypeSymbol { visitor.visit_class (this); } - private Set<Interface> _known_derived_interfaces = new TreeSet<Interface> (); - private Set<Class> _known_child_classes = new TreeSet<Class> (); + private Vala.Set<Interface> _known_derived_interfaces = new Vala.HashSet<Interface> (); + private Vala.Set<Class> _known_child_classes = new Vala.HashSet<Class> (); /** * Returns a list of all known classes based on this class */ - public Collection<Class> get_known_child_classes () { - return _known_child_classes.read_only_view; + public Vala.Collection<Class> get_known_child_classes () { + return _known_child_classes; } /** * Returns a list of all known interfaces based on this class */ - public Collection<Interface> get_known_derived_interfaces () { - return _known_derived_interfaces.read_only_view; + public Vala.Collection<Interface> get_known_derived_interfaces () { + return _known_derived_interfaces; } public void register_derived_interface (Interface iface) { diff --git a/libvaladoc/api/constant.vala b/libvaladoc/api/constant.vala index 351584be4..0ff79f261 100644 --- a/libvaladoc/api/constant.vala +++ b/libvaladoc/api/constant.vala @@ -20,7 +20,7 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; + using Valadoc.Content; /** diff --git a/libvaladoc/api/delegate.vala b/libvaladoc/api/delegate.vala index cd7e7c552..9db4d9f10 100644 --- a/libvaladoc/api/delegate.vala +++ b/libvaladoc/api/delegate.vala @@ -20,7 +20,7 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; + using Valadoc.Content; diff --git a/libvaladoc/api/driver.vala b/libvaladoc/api/driver.vala index a43abcff0..dd09ed388 100644 --- a/libvaladoc/api/driver.vala +++ b/libvaladoc/api/driver.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Valadoc.Api; -using Gee; +using Valadoc.Api; /** * A plugin register function for drivers diff --git a/libvaladoc/api/enum.vala b/libvaladoc/api/enum.vala index 230c0bb64..cbadb1971 100644 --- a/libvaladoc/api/enum.vala +++ b/libvaladoc/api/enum.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents an enum declaration. diff --git a/libvaladoc/api/enumvalue.vala b/libvaladoc/api/enumvalue.vala index 34804ff55..e3ec568b9 100644 --- a/libvaladoc/api/enumvalue.vala +++ b/libvaladoc/api/enumvalue.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents an enum member. diff --git a/libvaladoc/api/errorcode.vala b/libvaladoc/api/errorcode.vala index d7cf55128..2d10fb6a1 100644 --- a/libvaladoc/api/errorcode.vala +++ b/libvaladoc/api/errorcode.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents an errordomain member in the source code. diff --git a/libvaladoc/api/errordomain.vala b/libvaladoc/api/errordomain.vala index 969f294a3..c469bf3a8 100644 --- a/libvaladoc/api/errordomain.vala +++ b/libvaladoc/api/errordomain.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents an error domain declaration. diff --git a/libvaladoc/api/field.vala b/libvaladoc/api/field.vala index a167c35b8..d7a87a24d 100644 --- a/libvaladoc/api/field.vala +++ b/libvaladoc/api/field.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a field. diff --git a/libvaladoc/api/formalparameter.vala b/libvaladoc/api/formalparameter.vala index 82ed872a2..58c4c42cd 100644 --- a/libvaladoc/api/formalparameter.vala +++ b/libvaladoc/api/formalparameter.vala @@ -20,7 +20,7 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; + using Valadoc.Content; /** diff --git a/libvaladoc/api/girsourcecomment.vala b/libvaladoc/api/girsourcecomment.vala index c935ba39e..d6ffa5ae6 100644 --- a/libvaladoc/api/girsourcecomment.vala +++ b/libvaladoc/api/girsourcecomment.vala @@ -21,14 +21,11 @@ */ -using Gee; - - /** * A documentation comment used by valadoc */ public class Valadoc.Api.GirSourceComment : SourceComment { - private Map<string, SourceComment> parameters = new HashMap<string, SourceComment> (); + private Vala.Map<string, SourceComment> parameters = new Vala.HashMap<string, SourceComment> (str_hash, str_equal); public string? instance_param_name { set; get; } public SourceComment? return_comment { set; get; } @@ -37,7 +34,7 @@ public class Valadoc.Api.GirSourceComment : SourceComment { public SourceComment? stability_comment { get; set; } - public MapIterator<string, SourceComment> parameter_iterator () { + public Vala.MapIterator<string, SourceComment> parameter_iterator () { return parameters.map_iterator (); } diff --git a/libvaladoc/api/interface.vala b/libvaladoc/api/interface.vala index c75846ed8..ede696cf9 100644 --- a/libvaladoc/api/interface.vala +++ b/libvaladoc/api/interface.vala @@ -20,10 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; - +using Valadoc.Content; /** * Represents a interface declaration in the source code. @@ -50,7 +48,7 @@ public class Valadoc.Api.Interface : TypeSymbol { /** * A list of preconditioned interfaces */ - private ArrayList<TypeReference> interfaces = new ArrayList<TypeReference> (); + private Vala.ArrayList<TypeReference> interfaces = new Vala.ArrayList<TypeReference> (); /** * Add a newpreconditioned interface to the list @@ -62,7 +60,7 @@ public class Valadoc.Api.Interface : TypeSymbol { /** * Returns a list of newly preconditioned interfaces */ - public Collection<TypeReference> get_implemented_interface_list () { + public Vala.Collection<TypeReference> get_implemented_interface_list () { return this.interfaces; } @@ -70,14 +68,14 @@ public class Valadoc.Api.Interface : TypeSymbol { /** * A list of all preconditioned interfaces */ - private Collection<TypeReference> _full_implemented_interfaces = null; + private Vala.Collection<TypeReference> _full_implemented_interfaces = null; /** * Returns a list of all preconditioned interfaces */ - public Collection<TypeReference> get_full_implemented_interface_list () { + public Vala.Collection<TypeReference> get_full_implemented_interface_list () { if (_full_implemented_interfaces == null) { - _full_implemented_interfaces = new LinkedList<TypeReference> (); + _full_implemented_interfaces = new Vala.ArrayList<TypeReference> (); _full_implemented_interfaces.add_all (this.interfaces); if (base_type != null) { @@ -134,24 +132,24 @@ public class Valadoc.Api.Interface : TypeSymbol { /** * A list of all known related (sub-)interfaces */ - private Set<Interface> _known_related_interfaces = new TreeSet<Interface> (); + private Vala.Set<Interface> _known_related_interfaces = new Vala.HashSet<Interface> (); /** * A list of all known implementations of this interface */ - private Set<Class> _known_implementations = new TreeSet<Class> (); + private Vala.Set<Class> _known_implementations = new Vala.HashSet<Class> (); /** * Returns a list of all known implementations of this interface */ - public Collection<Class> get_known_implementations () { + public Vala.Collection<Class> get_known_implementations () { return _known_implementations; } /** * Returns a list of all known related (sub-)interfaces */ - public Collection<Interface> get_known_related_interfaces () { + public Vala.Collection<Interface> get_known_related_interfaces () { return _known_related_interfaces; } diff --git a/libvaladoc/api/item.vala b/libvaladoc/api/item.vala index 63b994736..60967a7c1 100644 --- a/libvaladoc/api/item.vala +++ b/libvaladoc/api/item.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Valadoc.Content; -using Gee; +using Valadoc.Content; /** * Represents a node in the api tree. diff --git a/libvaladoc/api/member.vala b/libvaladoc/api/member.vala index b8271c37b..fcabbea6b 100644 --- a/libvaladoc/api/member.vala +++ b/libvaladoc/api/member.vala @@ -21,7 +21,6 @@ * Didier 'Ptitjes Villevalois <ptitjes@free.fr> */ -using Gee; public abstract class Valadoc.Api.Member : Symbol { private SourceComment? source_comment; diff --git a/libvaladoc/api/method.vala b/libvaladoc/api/method.vala index ce891e112..bccbac5fb 100644 --- a/libvaladoc/api/method.vala +++ b/libvaladoc/api/method.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Valadoc.Content; -using Gee; +using Valadoc.Content; /** * Represents a function or a method. diff --git a/libvaladoc/api/namespace.vala b/libvaladoc/api/namespace.vala index c2cba30d4..7e3516605 100644 --- a/libvaladoc/api/namespace.vala +++ b/libvaladoc/api/namespace.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a namespace declaration. diff --git a/libvaladoc/api/node.vala b/libvaladoc/api/node.vala index 580828ff6..f1bbd2c62 100644 --- a/libvaladoc/api/node.vala +++ b/libvaladoc/api/node.vala @@ -21,13 +21,11 @@ * Didier 'Ptitjes Villevalois <ptitjes@free.fr> */ -using Gee; - /** * Represents a node in the api tree. */ -public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Comparable<Node> { +public abstract class Valadoc.Api.Node : Item, Browsable, Documentation { protected bool do_document = false; private SourceFile file; @@ -48,15 +46,15 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara */ public abstract NodeType node_type { get; } - private Map<string, Node> per_name_children; - private Map<NodeType, Gee.List<Node>> per_type_children; + private Vala.Map<string, Node> per_name_children; + private Vala.Map<NodeType, Vala.List<Node>> per_type_children; public Node (Node? parent, SourceFile? file, string? name, void* data) { base (data); - per_name_children = new HashMap<string, Node> (); - per_type_children = new HashMap<NodeType, Gee.List<Node>> (); + per_name_children = new Vala.HashMap<string, Node> (str_hash, str_equal); + per_type_children = new Vala.HashMap<NodeType, Vala.List<Node>> (); if (name != null && (is_keyword (name) || name[0].isdigit ())) { this.name = "@" + name; @@ -104,9 +102,9 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara per_name_children.set ("", child); } - Gee.List<Node> children = per_type_children.get (child.node_type); + Vala.List<Node> children = per_type_children.get (child.node_type); if (children == null) { - children = new ArrayList<Node> (); + children = new Vala.ArrayList<Node> (); per_type_children.set (child.node_type, children); } @@ -119,7 +117,7 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara internal override void parse_comments (Settings settings, DocumentationParser parser) { do_document = true; - foreach (Node node in per_name_children.values) { + foreach (Node node in per_name_children.get_values ()) { if (node.is_browsable (settings)) { node.parse_comments (settings, parser); } @@ -131,7 +129,7 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara */ internal override void check_comments (Settings settings, DocumentationParser parser) { - foreach (Node node in per_name_children.values) { + foreach (Node node in per_name_children.get_values ()) { if (node.is_browsable (settings)) { node.check_comments (settings, parser); } @@ -145,7 +143,7 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara * @param type a node type */ public bool has_visible_children_by_type (NodeType type, Settings settings) { - Gee.List<Node>? all_children = per_type_children.get (type); + Vala.List<Node>? all_children = per_type_children.get (type); if (all_children != null) { foreach (Node node in all_children) { if (node.is_browsable (settings)) { @@ -176,7 +174,7 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara * Specifies whether this node has at least one visible child */ public bool has_visible_children (Settings settings) { - return has_visible_children_by_types (per_type_children.keys.to_array (), settings); + return has_visible_children_by_types (per_type_children.get_keys ().to_array (), settings); } /** @@ -185,7 +183,7 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara * @param type a node type */ public bool has_children_by_type (NodeType type) { - Gee.List<Node>? all_children = per_type_children.get (type); + Vala.List<Node>? all_children = per_type_children.get (type); return all_children != null && !all_children.is_empty; } @@ -209,10 +207,10 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara * @param type a node type * @param filtered specifies whether nodes which are not browsable should appear in the list */ - public Gee.List<Node> get_children_by_type (NodeType type, bool filtered = true) { - var children = new ArrayList<Node> (); + public Vala.List<Node> get_children_by_type (NodeType type, bool filtered = true) { + var children = new Vala.ArrayList<Node> (); - Gee.List<Node> all_children = per_type_children.get (type); + Vala.List<Node> all_children = per_type_children.get (type); if (all_children != null) { foreach (Node node in all_children) { if (node.do_document || !filtered) { @@ -230,8 +228,8 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara * @param types a list of node types * @param filtered specifies whether nodes which are not browsable should appear in the list */ - public Gee.List<Node> get_children_by_types (NodeType[] types, bool filtered = true) { - var children = new ArrayList<Node> (); + public Vala.List<Node> get_children_by_types (NodeType[] types, bool filtered = true) { + var children = new Vala.ArrayList<Node> (); foreach (NodeType type in types) { children.add_all (get_children_by_type (type, filtered)); @@ -248,7 +246,7 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara * @param filtered specifies whether nodes which are not browsable should appear in the list */ public void accept_children_by_type (NodeType type, Visitor visitor, bool filtered = true) { - Gee.List<Node> all_children = per_type_children.get (type); + Vala.List<Node> all_children = per_type_children.get (type); if (all_children != null) { foreach (Node node in all_children) { if (node.do_document || !filtered) { @@ -278,7 +276,7 @@ public abstract class Valadoc.Api.Node : Item, Browsable, Documentation, Compara * @param filtered specifies whether nodes which are not browsable should appear in the list */ public void accept_all_children (Visitor visitor, bool filtered = true) { - foreach (Gee.List<Node> children in per_type_children.values) { + foreach (Vala.List<Node> children in per_type_children.get_values ()) { foreach (Node node in children) { if (node.do_document || !filtered) { node.accept (visitor); diff --git a/libvaladoc/api/nodetype.vala b/libvaladoc/api/nodetype.vala index 1fbc22e66..dc515fa25 100644 --- a/libvaladoc/api/nodetype.vala +++ b/libvaladoc/api/nodetype.vala @@ -21,8 +21,6 @@ * Didier 'Ptitjes Villevalois <ptitjes@free.fr> */ -using Gee; - /** * Specifies the context of a node. diff --git a/libvaladoc/api/package.vala b/libvaladoc/api/package.vala index 8c2cad184..821230ecf 100644 --- a/libvaladoc/api/package.vala +++ b/libvaladoc/api/package.vala @@ -20,7 +20,7 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; + using Valadoc.Content; using Valadoc.Importer; @@ -34,20 +34,20 @@ public class Valadoc.Api.Package : Node { get; } - internal void set_dependency_list (ArrayList<Package> list) { + internal void set_dependency_list (Vala.ArrayList<Package> list) { this._dependencies = list; } - private ArrayList<Package> _dependencies; + private Vala.ArrayList<Package> _dependencies; /** * Returns a list with all dependencies */ - public Collection<Package> get_full_dependency_list () { - ArrayList<Package> list = new ArrayList<Package> (); + public Vala.Collection<Package> get_full_dependency_list () { + Vala.ArrayList<Package> list = new Vala.ArrayList<Package> (); if (this._dependencies == null) { - return list.read_only_view; + return list; } foreach (Package pkg in this._dependencies) { @@ -62,15 +62,15 @@ public class Valadoc.Api.Package : Node { } } } - return list.read_only_view; + return list; } - public Collection<Package> get_dependency_list () { + public Vala.Collection<Package> get_dependency_list () { if (this._dependencies == null) { - return Collection.empty<Package> (); + return new Vala.ArrayList<Package> (); } - return this._dependencies.read_only_view; + return this._dependencies; } public Package (string name, bool is_package, void* data) { @@ -81,25 +81,29 @@ public class Valadoc.Api.Package : Node { } // <version, symbols> - private HashMap<string?, ArrayList<Symbol>> deprecated; + private Vala.HashMap<string, Vala.ArrayList<Symbol>> deprecated; internal void register_deprecated_symbol (Symbol symbol, string? version) { if (deprecated == null) { - deprecated = new HashMap<string?, ArrayList<Symbol>> (); + deprecated = new Vala.HashMap<string, Vala.ArrayList<Symbol>> (str_hash, str_equal); + } + + if (version == null) { + version = "0xdeadbeef"; } - ArrayList<Symbol> list = deprecated.get (version); + Vala.ArrayList<Symbol> list = deprecated.get (version); if (list == null) { - list = new ArrayList<Symbol> (); + list = new Vala.ArrayList<Symbol> (); deprecated.set (version, list); } list.add (symbol); } - public Map<string?, Collection<Symbol>> get_deprecated_symbols () { + public Vala.Map<string, Vala.Collection<Symbol>> get_deprecated_symbols () { if (deprecated == null) { - return Map<string?, Collection<Symbol>>.empty<string?, Collection<Symbol>> (); + return new Vala.HashMap<string, Vala.Collection<Symbol>> (str_hash, str_equal); } return deprecated; diff --git a/libvaladoc/api/pointer.vala b/libvaladoc/api/pointer.vala index aec541bb8..954acd949 100644 --- a/libvaladoc/api/pointer.vala +++ b/libvaladoc/api/pointer.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a pointer declaration. diff --git a/libvaladoc/api/property.vala b/libvaladoc/api/property.vala index 556c7c9bf..235292f20 100644 --- a/libvaladoc/api/property.vala +++ b/libvaladoc/api/property.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a property declaration. @@ -105,12 +104,12 @@ public class Valadoc.Api.Property : Member { } public PropertyAccessor? setter { - internal set; + set; get; } public PropertyAccessor? getter { - internal set; + set; get; } diff --git a/libvaladoc/api/propertyaccessor.vala b/libvaladoc/api/propertyaccessor.vala index 0a79dd3fc..173edd89d 100644 --- a/libvaladoc/api/propertyaccessor.vala +++ b/libvaladoc/api/propertyaccessor.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a get or set accessor of a property. diff --git a/libvaladoc/api/propertyaccessortype.vala b/libvaladoc/api/propertyaccessortype.vala index 609815ae0..8453ca502 100644 --- a/libvaladoc/api/propertyaccessortype.vala +++ b/libvaladoc/api/propertyaccessortype.vala @@ -20,6 +20,7 @@ * Florian Brosch <flo.brosch@gmail.com> */ + public enum Valadoc.Api.PropertyAccessorType { CONSTRUCT = 1 << 0, SET = 1 << 1, diff --git a/libvaladoc/api/signal.vala b/libvaladoc/api/signal.vala index 4bbbb2320..6e6f8855f 100644 --- a/libvaladoc/api/signal.vala +++ b/libvaladoc/api/signal.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents an signal. diff --git a/libvaladoc/api/signaturebuilder.vala b/libvaladoc/api/signaturebuilder.vala index 158bd6e41..a897dae6b 100644 --- a/libvaladoc/api/signaturebuilder.vala +++ b/libvaladoc/api/signaturebuilder.vala @@ -20,8 +20,8 @@ * Didier 'Ptitjes Villevalois <ptitjes@free.fr> */ -using Valadoc.Content; +using Valadoc.Content; /** * Builds up a signature from the given items. diff --git a/libvaladoc/api/sourcecomment.vala b/libvaladoc/api/sourcecomment.vala index df6d1e1da..2d8eb1485 100644 --- a/libvaladoc/api/sourcecomment.vala +++ b/libvaladoc/api/sourcecomment.vala @@ -21,7 +21,6 @@ */ - /** * A documentation comment used by valadoc */ diff --git a/libvaladoc/api/sourcefile.vala b/libvaladoc/api/sourcefile.vala index 46d1801be..9c3401145 100644 --- a/libvaladoc/api/sourcefile.vala +++ b/libvaladoc/api/sourcefile.vala @@ -20,6 +20,7 @@ * Brosch Florian <flo.brosch@gmail.com> */ + /** * Represents a source file */ diff --git a/libvaladoc/api/struct.vala b/libvaladoc/api/struct.vala index e1df479c3..93bbce778 100644 --- a/libvaladoc/api/struct.vala +++ b/libvaladoc/api/struct.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a struct declaration. @@ -120,13 +119,13 @@ public class Valadoc.Api.Struct : TypeSymbol { } - private Set<Struct> _known_child_structs = new TreeSet<Struct> (); + private Vala.Set<Struct> _known_child_structs = new Vala.HashSet<Struct> (); /** * Returns a list of all known structs based on this struct */ - public Collection<Struct> get_known_child_structs () { - return _known_child_structs.read_only_view; + public Vala.Collection<Struct> get_known_child_structs () { + return _known_child_structs; } public void register_child_struct (Struct stru) { diff --git a/libvaladoc/api/symbol.vala b/libvaladoc/api/symbol.vala index aec2bdd75..020c28ab1 100644 --- a/libvaladoc/api/symbol.vala +++ b/libvaladoc/api/symbol.vala @@ -21,13 +21,12 @@ * Didier 'Ptitjes Villevalois <ptitjes@free.fr> */ -using Gee; /** * Represents a node in the symbol tree. */ public abstract class Valadoc.Api.Symbol : Node { - private ArrayList<Attribute> attributes; + private Vala.ArrayList<Attribute> attributes; public bool is_deprecated { default = false; @@ -45,7 +44,7 @@ public abstract class Valadoc.Api.Symbol : Node { public void add_attribute (Attribute att) { if (attributes == null) { - attributes = new ArrayList<Attribute> (); + attributes = new Vala.ArrayList<Attribute> (); } // register deprecated symbols: @@ -69,9 +68,9 @@ public abstract class Valadoc.Api.Symbol : Node { attributes.add (att); } - public Collection<Attribute> get_attributes () { + public Vala.Collection<Attribute> get_attributes () { if (attributes == null) { - return Collection<Attribute>.empty<Attribute> (); + return new Vala.ArrayList<Attribute> (); } else { return attributes; } diff --git a/libvaladoc/api/tree.vala b/libvaladoc/api/tree.vala index a5ae3c54b..4344c2e46 100644 --- a/libvaladoc/api/tree.vala +++ b/libvaladoc/api/tree.vala @@ -20,18 +20,16 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Valadoc.Importer; -using Gee; - +using Valadoc.Importer; /** * The root of the code tree. */ public class Valadoc.Api.Tree { - private Deque<InheritDocContainer> inheritdocs = new LinkedList<InheritDocContainer> (); - private ArrayList<string> external_c_files = new ArrayList<string>(); - private ArrayList<Package> packages = new ArrayList<Package>(); + private Vala.List<InheritDocContainer> inheritdocs = new Vala.ArrayList<InheritDocContainer> (); + private Vala.ArrayList<string> external_c_files = new Vala.ArrayList<string>(str_equal); + private Vala.ArrayList<Package> packages = new Vala.ArrayList<Package>(); private Package source_package = null; private Settings settings; private ErrorReporter reporter; @@ -83,8 +81,8 @@ public class Valadoc.Api.Tree { * * @return list of C source files */ - public Collection<string> get_external_c_files () { - return external_c_files.read_only_view; + public Vala.Collection<string> get_external_c_files () { + return external_c_files; } public void add_external_c_files (string name) { @@ -97,13 +95,13 @@ public class Valadoc.Api.Tree { * * @return list of all packages */ - public Collection<Package> get_package_list () { - return this.packages.read_only_view; + public Vala.Collection<Package> get_package_list () { + return this.packages; } private void add_dependencies_to_source_package () { if ( this.source_package != null ) { - ArrayList<Package> deplst = new ArrayList<Package> (); + Vala.ArrayList<Package> deplst = new Vala.ArrayList<Package> (); foreach (Package pkg in this.packages) { if (pkg != this.source_package) { deplst.add (pkg); @@ -307,7 +305,7 @@ public class Valadoc.Api.Tree { private void postprocess_inheritdoc (DocumentationParser docparser) { while (!this.inheritdocs.is_empty) { - InheritDocContainer container = this.inheritdocs.poll_head (); + InheritDocContainer container = this.inheritdocs.remove_at (0); docparser.transform_inheritdoc (container.taglet_container, container.taglet); } @@ -324,7 +322,7 @@ public class Valadoc.Api.Tree { public void import_comments (DocumentationImporter[] importers, string[] packages, string[] import_directories) { - HashSet<string> processed = new HashSet<string> (); + Vala.HashSet<string> processed = new Vala.HashSet<string> (); foreach (string pkg_name in packages) { bool imported = false; foreach (DocumentationImporter importer in importers) { diff --git a/libvaladoc/api/typeparameter.vala b/libvaladoc/api/typeparameter.vala index b5f33b860..9cfe86482 100644 --- a/libvaladoc/api/typeparameter.vala +++ b/libvaladoc/api/typeparameter.vala @@ -20,9 +20,8 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * Represents a generic type parameter in the source code. diff --git a/libvaladoc/api/typereference.vala b/libvaladoc/api/typereference.vala index 0d5bffc1f..3fd975c4b 100644 --- a/libvaladoc/api/typereference.vala +++ b/libvaladoc/api/typereference.vala @@ -20,15 +20,14 @@ * Florian Brosch <flo.brosch@gmail.com> */ -using Gee; -using Valadoc.Content; +using Valadoc.Content; /** * A reference to a data type. */ public class Valadoc.Api.TypeReference : Item { - private ArrayList<TypeReference> type_arguments = new ArrayList<TypeReference> (); + private Vala.ArrayList<TypeReference> type_arguments = new Vala.ArrayList<TypeReference> (); private string? dbus_type_signature; private Ownership ownership; @@ -50,8 +49,8 @@ public class Valadoc.Api.TypeReference : Item { * * @return type argument list */ - public Gee.Collection<TypeReference> get_type_arguments () { - return this.type_arguments.read_only_view; + public Vala.Collection<TypeReference> get_type_arguments () { + return this.type_arguments; } public void add_type_argument (TypeReference type_ref) { diff --git a/libvaladoc/api/typesymbol.vala b/libvaladoc/api/typesymbol.vala index 3574688e6..c7274ba01 100644 --- a/libvaladoc/api/typesymbol.vala +++ b/libvaladoc/api/typesymbol.vala @@ -21,8 +21,6 @@ * Didier 'Ptitjes Villevalois <ptitjes@free.fr> */ -using Gee; - /** * Represents a runtime data type. |