valadoc: Rename FormalParameter to Parameter

5 files changed, 55 insertions, 55 deletions

diff --git a/valadoc/doclets/gtkdoc/generator.vala b/valadoc/doclets/gtkdoc/generator.vala
index 5be0b746f..365865d71 100644
--- a/valadoc/doclets/gtkdoc/generator.vala
+++ b/valadoc/doclets/gtkdoc/generator.vala
@@ -1245,7 +1245,7 @@ It is important that your <link linkend="GValue"><type>GValue</type></link> hold
 		}
 	}
 
-	public override void visit_formal_parameter (Api.FormalParameter param) {
+	public override void visit_formal_parameter (Api.Parameter param) {
 		var param_name = param.name ?? "...";
 		var annotations = new string[]{};
 		var direction = "in";
diff --git a/valadoc/doclets/gtkdoc/utils.vala b/valadoc/doclets/gtkdoc/utils.vala
index 21ddea664..33595bc2e 100644
--- a/valadoc/doclets/gtkdoc/utils.vala
+++ b/valadoc/doclets/gtkdoc/utils.vala
@@ -37,8 +37,8 @@ namespace Gtkdoc {
 	public string? get_cname (Api.Item item) {
 		if (item is Api.Method) {
 			return ((Api.Method)item).get_cname ();
-		} else if (item is Api.FormalParameter) {
-			return ((Api.FormalParameter)item).name;
+		} else if (item is Api.Parameter) {
+			return ((Api.Parameter)item).name;
 		} else if (item is Api.Constant) {
 			return ((Api.Constant)item).get_cname ();
 		} else if (item is Api.Property) {
@@ -132,8 +132,8 @@ namespace Gtkdoc {
 			}
 			return """<link linkend="%s%s"><function>%s()</function></link>"""
 				.printf (to_docbook_id (parent), to_docbook_id (name), name);
-		} else if (item is Api.FormalParameter) {
-			return "<parameter>%s</parameter>".printf (((Api.FormalParameter)item).name);
+		} else if (item is Api.Parameter) {
+			return "<parameter>%s</parameter>".printf (((Api.Parameter)item).name);
 		} else if (item is Api.Constant) {
 			var cname = ((Api.Constant)item).get_cname ();
 			return """<link linkend="%s:CAPS"><literal>%s</literal></link>"""
diff --git a/valadoc/symbolresolver.vala b/valadoc/symbolresolver.vala
index a297c5e02..94b2bc460 100644
--- a/valadoc/symbolresolver.vala
+++ b/valadoc/symbolresolver.vala
@@ -267,7 +267,7 @@ public class Valadoc.SymbolResolver : Visitor {
 	/**
 	 * {@inheritDoc}
 	 */
-	public override void visit_formal_parameter (FormalParameter item) {
+	public override void visit_formal_parameter (Api.Parameter item) {
 		if (item.ellipsis) {
 			return;
 		}
diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala
index 369076dd7..ced2bb6e6 100644
--- a/valadoc/tests/drivers/generic-api-test.vala
+++ b/valadoc/tests/drivers/generic-api-test.vala
@@ -1596,9 +1596,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_2":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -1631,9 +1631,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_3":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == true);
@@ -1666,9 +1666,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_3a":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == true);
@@ -1701,9 +1701,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_4":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == true);
 			assert (param.is_ref == false);
@@ -1736,9 +1736,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_4a":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == true);
 			assert (param.is_ref == false);
@@ -1771,9 +1771,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_5":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -1806,9 +1806,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_6":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -1841,9 +1841,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_7":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -1868,9 +1868,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_8":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value != null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -1903,9 +1903,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_9":
 			assert (params.size == 7);
 
-			Api.FormalParameter? param = params.get (0) as Api.FormalParameter;
+			Api.Parameter? param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -1934,9 +1934,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 
 
 
-			param = params.get (1) as Api.FormalParameter;
+			param = params.get (1) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == true);
@@ -1965,9 +1965,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 
 
 
-			param = params.get (2) as Api.FormalParameter;
+			param = params.get (2) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == true);
 			assert (param.is_ref == false);
@@ -1996,9 +1996,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 
 
 
-			param = params.get (3) as Api.FormalParameter;
+			param = params.get (3) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2027,9 +2027,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 
 
 
-			param = params.get (4) as Api.FormalParameter;
+			param = params.get (4) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2058,9 +2058,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 
 
 
-			param = params.get (5) as Api.FormalParameter;
+			param = params.get (5) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value != null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2089,9 +2089,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 
 
 
-			param = params.get (6) as Api.FormalParameter;
+			param = params.get (6) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2116,9 +2116,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_10":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2153,9 +2153,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_11":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2191,9 +2191,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_12":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2229,9 +2229,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_13":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
@@ -2267,9 +2267,9 @@ public static void param_test (Api.Namespace ns, Api.Package pkg) {
 		case "test_function_param_14":
 			assert (params.size == 1);
 
-			Api.FormalParameter param = params.get (0) as Api.FormalParameter;
+			Api.Parameter param = params.get (0) as Api.Parameter;
 			assert (param != null);
-			// (.FormalParameter)
+			// (.Parameter)
 			assert (param.default_value == null);
 			assert (param.is_out == false);
 			assert (param.is_ref == false);
diff --git a/valadoc/treebuilder.vala b/valadoc/treebuilder.vala
index a8f1d6263..ed6dced10 100644
--- a/valadoc/treebuilder.vala
+++ b/valadoc/treebuilder.vala
@@ -962,13 +962,13 @@ public class Valadoc.TreeBuilder : Vala.CodeVisitor {
 		Api.Node parent = get_parent_node_for (element);
 		SourceFile? file = get_source_file (element);
 
-		FormalParameter node = new FormalParameter (parent,
-													file,
-													element.name,
-													element.access,
-													element.direction,
-													element.ellipsis,
-													element);
+		Api.Parameter node = new Api.Parameter (parent,
+												file,
+												element.name,
+												element.access,
+												element.direction,
+												element.ellipsis,
+												element);
 		node.parameter_type = create_type_reference (element.variable_type, node, node);
 		parent.add_child (node);