From 67a108b196191382cdd71252ba147e0430f293e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Fri, 31 Aug 2018 22:38:28 +0200
Subject: [PATCH] DocData: Fix return type listed as "var" instead of "Variant"

(cherry picked from commit f92b87e5f8025e8ac7de1eaaf8fafbaf10521e7b)
---
 doc/classes/Array.xml       | 32 ++++++++++++++++----------------
 doc/classes/Dictionary.xml  |  4 ++--
 doc/classes/String.xml      |  2 +-
 doc/classes/TileSet.xml     | 18 ++++++++++++++++++
 doc/classes/Transform.xml   |  8 ++++----
 doc/classes/Transform2D.xml |  8 ++++----
 editor/doc/doc_data.cpp     |  4 ++--
 editor/doc/doc_dump.cpp     |  2 +-
 8 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/doc/classes/Array.xml b/doc/classes/Array.xml
index 3096a1bf31c..5e4d71e19ca 100644
--- a/doc/classes/Array.xml
+++ b/doc/classes/Array.xml
@@ -84,14 +84,14 @@
 			</description>
 		</method>
 		<method name="append">
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
 				Append an element at the end of the array (alias of [method push_back]).
 			</description>
 		</method>
 		<method name="back">
-			<return type="var">
+			<return type="Variant">
 			</return>
 			<description>
 				Returns the last element of the array if the array is not empty (size&gt;0).
@@ -100,7 +100,7 @@
 		<method name="bsearch">
 			<return type="int">
 			</return>
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<argument index="1" name="before" type="bool" default="True">
 			</argument>
@@ -111,7 +111,7 @@
 		<method name="bsearch_custom">
 			<return type="int">
 			</return>
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<argument index="1" name="obj" type="Object">
 			</argument>
@@ -131,7 +131,7 @@
 		<method name="count">
 			<return type="int">
 			</return>
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
 				Return the amount of times an element is in the array.
@@ -152,7 +152,7 @@
 			</description>
 		</method>
 		<method name="erase">
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
 				Remove the first occurrence of a value from the array.
@@ -161,7 +161,7 @@
 		<method name="find">
 			<return type="int">
 			</return>
-			<argument index="0" name="what" type="var">
+			<argument index="0" name="what" type="Variant">
 			</argument>
 			<argument index="1" name="from" type="int" default="0">
 			</argument>
@@ -172,14 +172,14 @@
 		<method name="find_last">
 			<return type="int">
 			</return>
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
 				Searches the array in reverse order for a value and returns its index or -1 if not found.
 			</description>
 		</method>
 		<method name="front">
-			<return type="var">
+			<return type="Variant">
 			</return>
 			<description>
 				Returns the first element of the array if the array is not empty (size&gt;0).
@@ -188,7 +188,7 @@
 		<method name="has">
 			<return type="bool">
 			</return>
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
 				Return true if the array contains given value.
@@ -210,7 +210,7 @@
 		<method name="insert">
 			<argument index="0" name="position" type="int">
 			</argument>
-			<argument index="1" name="value" type="var">
+			<argument index="1" name="value" type="Variant">
 			</argument>
 			<description>
 				Insert a new element at a given position in the array. The position must be valid, or at the end of the array (pos==size()).
@@ -222,28 +222,28 @@
 			</description>
 		</method>
 		<method name="pop_back">
-			<return type="var">
+			<return type="Variant">
 			</return>
 			<description>
 				Remove the last element of the array.
 			</description>
 		</method>
 		<method name="pop_front">
-			<return type="var">
+			<return type="Variant">
 			</return>
 			<description>
 				Remove the first element of the array.
 			</description>
 		</method>
 		<method name="push_back">
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
 				Append an element at the end of the array.
 			</description>
 		</method>
 		<method name="push_front">
-			<argument index="0" name="value" type="var">
+			<argument index="0" name="value" type="Variant">
 			</argument>
 			<description>
 				Add an element at the beginning of the array.
@@ -266,7 +266,7 @@
 		<method name="rfind">
 			<return type="int">
 			</return>
-			<argument index="0" name="what" type="var">
+			<argument index="0" name="what" type="Variant">
 			</argument>
 			<argument index="1" name="from" type="int" default="-1">
 			</argument>
diff --git a/doc/classes/Dictionary.xml b/doc/classes/Dictionary.xml
index 0bd774b1d79..66c4eadfc1c 100644
--- a/doc/classes/Dictionary.xml
+++ b/doc/classes/Dictionary.xml
@@ -31,7 +31,7 @@
 			</description>
 		</method>
 		<method name="erase">
-			<argument index="0" name="key" type="var">
+			<argument index="0" name="key" type="Variant">
 			</argument>
 			<description>
 				Erase a dictionary key/value pair by key.
@@ -40,7 +40,7 @@
 		<method name="has">
 			<return type="bool">
 			</return>
-			<argument index="0" name="key" type="var">
+			<argument index="0" name="key" type="Variant">
 			</argument>
 			<description>
 				Return true if the dictionary has a given key.
diff --git a/doc/classes/String.xml b/doc/classes/String.xml
index 8a4220edf16..9ac4936f94a 100644
--- a/doc/classes/String.xml
+++ b/doc/classes/String.xml
@@ -339,7 +339,7 @@
 		<method name="format">
 			<return type="String">
 			</return>
-			<argument index="0" name="values" type="var">
+			<argument index="0" name="values" type="Variant">
 			</argument>
 			<argument index="1" name="placeholder" type="String" default="{_}">
 			</argument>
diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml
index d3703c02f93..4ae2ccd7f17 100644
--- a/doc/classes/TileSet.xml
+++ b/doc/classes/TileSet.xml
@@ -44,6 +44,14 @@
 			<description>
 			</description>
 		</method>
+		<method name="autotile_get_size" qualifiers="const">
+			<return type="Vector2">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="autotile_set_bitmask_mode">
 			<return type="void">
 			</return>
@@ -54,6 +62,16 @@
 			<description>
 			</description>
 		</method>
+		<method name="autotile_set_size">
+			<return type="void">
+			</return>
+			<argument index="0" name="id" type="int">
+			</argument>
+			<argument index="1" name="size" type="Vector2">
+			</argument>
+			<description>
+			</description>
+		</method>
 		<method name="clear">
 			<return type="void">
 			</return>
diff --git a/doc/classes/Transform.xml b/doc/classes/Transform.xml
index 79e89b1b512..90a488c23e5 100644
--- a/doc/classes/Transform.xml
+++ b/doc/classes/Transform.xml
@@ -141,18 +141,18 @@
 			</description>
 		</method>
 		<method name="xform">
-			<return type="var">
+			<return type="Variant">
 			</return>
-			<argument index="0" name="v" type="var">
+			<argument index="0" name="v" type="Variant">
 			</argument>
 			<description>
 				Transforms the given vector "v" by this transform.
 			</description>
 		</method>
 		<method name="xform_inv">
-			<return type="var">
+			<return type="Variant">
 			</return>
-			<argument index="0" name="v" type="var">
+			<argument index="0" name="v" type="Variant">
 			</argument>
 			<description>
 				Inverse-transforms the given vector "v" by this transform.
diff --git a/doc/classes/Transform2D.xml b/doc/classes/Transform2D.xml
index 096295f869b..954892963a7 100644
--- a/doc/classes/Transform2D.xml
+++ b/doc/classes/Transform2D.xml
@@ -54,7 +54,7 @@
 		<method name="basis_xform">
 			<return type="Transform2D">
 			</return>
-			<argument index="0" name="v" type="var">
+			<argument index="0" name="v" type="Variant">
 			</argument>
 			<description>
 				Transforms the given vector by this transform's basis (no translation).
@@ -63,7 +63,7 @@
 		<method name="basis_xform_inv">
 			<return type="Transform2D">
 			</return>
-			<argument index="0" name="v" type="var">
+			<argument index="0" name="v" type="Variant">
 			</argument>
 			<description>
 				Inverse-transforms the given vector by this transform's basis (no translation).
@@ -145,7 +145,7 @@
 		<method name="xform">
 			<return type="Transform2D">
 			</return>
-			<argument index="0" name="v" type="var">
+			<argument index="0" name="v" type="Variant">
 			</argument>
 			<description>
 				Transforms the given vector "v" by this transform.
@@ -154,7 +154,7 @@
 		<method name="xform_inv">
 			<return type="Transform2D">
 			</return>
-			<argument index="0" name="v" type="var">
+			<argument index="0" name="v" type="Variant">
 			</argument>
 			<description>
 				Inverse-transforms the given vector "v" by this transform.
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index c992ac5f161..4bfd82206a6 100644
--- a/editor/doc/doc_data.cpp
+++ b/editor/doc/doc_data.cpp
@@ -496,7 +496,7 @@ void DocData::generate(bool p_basic_types) {
 				ad.name = arginfo.name;
 
 				if (arginfo.type == Variant::NIL)
-					ad.type = "var";
+					ad.type = "Variant";
 				else
 					ad.type = Variant::get_type_name(arginfo.type);
 
@@ -509,7 +509,7 @@ void DocData::generate(bool p_basic_types) {
 
 			if (mi.return_val.type == Variant::NIL) {
 				if (mi.return_val.name != "")
-					method.return_type = "var";
+					method.return_type = "Variant";
 			} else {
 				method.return_type = Variant::get_type_name(mi.return_val.type);
 			}
diff --git a/editor/doc/doc_dump.cpp b/editor/doc/doc_dump.cpp
index adbe23dcd5f..06d35c4d3af 100644
--- a/editor/doc/doc_dump.cpp
+++ b/editor/doc/doc_dump.cpp
@@ -142,7 +142,7 @@ void DocDump::dump(const String &p_file) {
 					if (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE)
 						type_name = arginfo.hint_string;
 					else if (arginfo.type == Variant::NIL)
-						type_name = "var";
+						type_name = "Variant";
 					else
 						type_name = Variant::get_type_name(arginfo.type);