diff options
| -rw-r--r-- | libvaladoc/api/typereference.vala | 8 | ||||
| -rw-r--r-- | valadoc/initializerbuilder.vala | 4 | ||||
| -rw-r--r-- | valadoc/symbolresolver.vala | 6 | ||||
| -rw-r--r-- | valadoc/treebuilder.vala | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/libvaladoc/api/typereference.vala b/libvaladoc/api/typereference.vala index 47bf5efc4..285c7d734 100644 --- a/libvaladoc/api/typereference.vala +++ b/libvaladoc/api/typereference.vala @@ -74,8 +74,8 @@ public class Valadoc.Api.TypeReference : Item { } // non ref counted types are weak, not unowned - if (element.data_type is Vala.TypeSymbol - && is_reference_counting ((Vala.TypeSymbol) element.data_type) == true) + if (element.type_symbol is Vala.TypeSymbol + && is_reference_counting ((Vala.TypeSymbol) element.type_symbol) == true) { return false; } @@ -110,8 +110,8 @@ public class Valadoc.Api.TypeReference : Item { } // non ref counted types are unowned, not weak - if (element.data_type is Vala.TypeSymbol - && is_reference_counting ((Vala.TypeSymbol) element.data_type) == false) + if (element.type_symbol is Vala.TypeSymbol + && is_reference_counting ((Vala.TypeSymbol) element.type_symbol) == false) { return false; } diff --git a/valadoc/initializerbuilder.vala b/valadoc/initializerbuilder.vala index e4ecfb856..dddd5e353 100644 --- a/valadoc/initializerbuilder.vala +++ b/valadoc/initializerbuilder.vala @@ -36,8 +36,8 @@ private class Valadoc.Api.InitializerBuilder : Vala.CodeVisitor { } private void write_type (Vala.DataType vsymbol) { - if (vsymbol.data_type != null) { - write_node (vsymbol.data_type); + if (vsymbol.type_symbol != null) { + write_node (vsymbol.type_symbol); } else { signature.append_literal ("null"); } diff --git a/valadoc/symbolresolver.vala b/valadoc/symbolresolver.vala index d96b9ca72..a297c5e02 100644 --- a/valadoc/symbolresolver.vala +++ b/valadoc/symbolresolver.vala @@ -41,7 +41,7 @@ public class Valadoc.SymbolResolver : Visitor { var error_types = new Vala.ArrayList<Vala.DataType> (); vala_symbol.get_error_types (error_types); foreach (Vala.DataType type in error_types) { - Vala.ErrorDomain vala_edom = (Vala.ErrorDomain) type.data_type; + unowned Vala.ErrorDomain vala_edom = (Vala.ErrorDomain) type.type_symbol; Symbol? edom = symbol_map.get (vala_edom); symbol.add_child (edom ?? glib_error); } @@ -86,8 +86,8 @@ public class Valadoc.SymbolResolver : Visitor { reference.data_type = resolve (((Vala.DelegateType) vtyperef).delegate_symbol); } else if (vtyperef is Vala.GenericType) { reference.data_type = resolve (((Vala.GenericType) vtyperef).type_parameter); - } else if (vtyperef.data_type != null) { - reference.data_type = resolve (vtyperef.data_type); + } else if (vtyperef.type_symbol != null) { + reference.data_type = resolve (vtyperef.type_symbol); } // Type parameters: diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala index 66638d892..a8f1d6263 100644 --- a/valadoc/treebuilder.vala +++ b/valadoc/treebuilder.vala @@ -171,7 +171,7 @@ public class Valadoc.TreeBuilder : Vala.CodeVisitor { && !(vtyperef is Vala.GenericType) && !(vtyperef is Vala.PointerType); string? signature = (vtyperef != null - && vtyperef.data_type != null)? Vala.GVariantModule.get_dbus_signature (vtyperef.data_type) : null; + && vtyperef.type_symbol != null)? Vala.GVariantModule.get_dbus_signature (vtyperef.type_symbol) : null; bool is_dynamic = vtyperef != null && vtyperef.is_dynamic; TypeReference type_ref = new TypeReference (parent, @@ -605,9 +605,9 @@ public class Valadoc.TreeBuilder : Vala.CodeVisitor { foreach (Vala.DataType vala_type_ref in element.get_base_types ()) { var type_ref = create_type_reference (vala_type_ref, node, node); - if (vala_type_ref.data_type is Vala.Interface) { + if (vala_type_ref.type_symbol is Vala.Interface) { node.add_interface (type_ref); - } else if (vala_type_ref.data_type is Vala.Class) { + } else if (vala_type_ref.type_symbol is Vala.Class) { node.base_type = type_ref; } } @@ -641,7 +641,7 @@ public class Valadoc.TreeBuilder : Vala.CodeVisitor { // prerequisites: foreach (Vala.DataType vala_type_ref in element.get_prerequisites ()) { TypeReference type_ref = create_type_reference (vala_type_ref, node, node); - if (vala_type_ref.data_type is Vala.Interface) { + if (vala_type_ref.type_symbol is Vala.Interface) { node.add_interface (type_ref); } else { node.base_type = type_ref; |