godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DocData: Fix return type listed as "var" instead of "Variant" 

(cherry picked from commit f92b87e5f8)
This commit is contained in:
Rémi Verschelde 2018-08-31 22:38:28 +02:00
parent d4e4c4f7e3
commit 67a108b196
8 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
doc/classes/Array.xml
View File

@ -84,14 +84,14 @@
</description> </description>
</method> </method>
<method name="append"> <method name="append">
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<description> <description>
Append an element at the end of the array (alias of [method push_back]). Append an element at the end of the array (alias of [method push_back]).
</description> </description>
</method> </method>
<method name="back"> <method name="back">
<return type="var"> <return type="Variant">
</return> </return>
<description> <description>
Returns the last element of the array if the array is not empty (size&gt;0). Returns the last element of the array if the array is not empty (size&gt;0).
@ -100,7 +100,7 @@
<method name="bsearch"> <method name="bsearch">
<return type="int"> <return type="int">
</return> </return>
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<argument index="1" name="before" type="bool" default="True"> <argument index="1" name="before" type="bool" default="True">
</argument> </argument>
@ -111,7 +111,7 @@
<method name="bsearch_custom"> <method name="bsearch_custom">
<return type="int"> <return type="int">
</return> </return>
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<argument index="1" name="obj" type="Object"> <argument index="1" name="obj" type="Object">
</argument> </argument>
@ -131,7 +131,7 @@
<method name="count"> <method name="count">
<return type="int"> <return type="int">
</return> </return>
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<description> <description>
Return the amount of times an element is in the array. Return the amount of times an element is in the array.
@ -152,7 +152,7 @@
</description> </description>
</method> </method>
<method name="erase"> <method name="erase">
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<description> <description>
Remove the first occurrence of a value from the array. Remove the first occurrence of a value from the array.
@ -161,7 +161,7 @@
<method name="find"> <method name="find">
<return type="int"> <return type="int">
</return> </return>
<argument index="0" name="what" type="var"> <argument index="0" name="what" type="Variant">
</argument> </argument>
<argument index="1" name="from" type="int" default="0"> <argument index="1" name="from" type="int" default="0">
</argument> </argument>
@ -172,14 +172,14 @@
<method name="find_last"> <method name="find_last">
<return type="int"> <return type="int">
</return> </return>
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<description> <description>
Searches the array in reverse order for a value and returns its index or -1 if not found. Searches the array in reverse order for a value and returns its index or -1 if not found.
</description> </description>
</method> </method>
<method name="front"> <method name="front">
<return type="var"> <return type="Variant">
</return> </return>
<description> <description>
Returns the first element of the array if the array is not empty (size&gt;0). Returns the first element of the array if the array is not empty (size&gt;0).
@ -188,7 +188,7 @@
<method name="has"> <method name="has">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<description> <description>
Return true if the array contains given value. Return true if the array contains given value.
@ -210,7 +210,7 @@
<method name="insert"> <method name="insert">
<argument index="0" name="position" type="int"> <argument index="0" name="position" type="int">
</argument> </argument>
<argument index="1" name="value" type="var"> <argument index="1" name="value" type="Variant">
</argument> </argument>
<description> <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()). 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> </description>
</method> </method>
<method name="pop_back"> <method name="pop_back">
<return type="var"> <return type="Variant">
</return> </return>
<description> <description>
Remove the last element of the array. Remove the last element of the array.
</description> </description>
</method> </method>
<method name="pop_front"> <method name="pop_front">
<return type="var"> <return type="Variant">
</return> </return>
<description> <description>
Remove the first element of the array. Remove the first element of the array.
</description> </description>
</method> </method>
<method name="push_back"> <method name="push_back">
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<description> <description>
Append an element at the end of the array. Append an element at the end of the array.
</description> </description>
</method> </method>
<method name="push_front"> <method name="push_front">
<argument index="0" name="value" type="var"> <argument index="0" name="value" type="Variant">
</argument> </argument>
<description> <description>
Add an element at the beginning of the array. Add an element at the beginning of the array.
@ -266,7 +266,7 @@
<method name="rfind"> <method name="rfind">
<return type="int"> <return type="int">
</return> </return>
<argument index="0" name="what" type="var"> <argument index="0" name="what" type="Variant">
</argument> </argument>
<argument index="1" name="from" type="int" default="-1"> <argument index="1" name="from" type="int" default="-1">
</argument> </argument>

4
doc/classes/Dictionary.xml
View File

@ -31,7 +31,7 @@
</description> </description>
</method> </method>
<method name="erase"> <method name="erase">
<argument index="0" name="key" type="var"> <argument index="0" name="key" type="Variant">
</argument> </argument>
<description> <description>
Erase a dictionary key/value pair by key. Erase a dictionary key/value pair by key.
@ -40,7 +40,7 @@
<method name="has"> <method name="has">
<return type="bool"> <return type="bool">
</return> </return>
<argument index="0" name="key" type="var"> <argument index="0" name="key" type="Variant">
</argument> </argument>
<description> <description>
Return true if the dictionary has a given key. Return true if the dictionary has a given key.

2
doc/classes/String.xml
View File

@ -339,7 +339,7 @@
<method name="format"> <method name="format">
<return type="String"> <return type="String">
</return> </return>
<argument index="0" name="values" type="var"> <argument index="0" name="values" type="Variant">
</argument> </argument>
<argument index="1" name="placeholder" type="String" default="{_}"> <argument index="1" name="placeholder" type="String" default="{_}">
</argument> </argument>

18
doc/classes/TileSet.xml
View File

@ -44,6 +44,14 @@
<description> <description>
</description> </description>
</method> </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"> <method name="autotile_set_bitmask_mode">
<return type="void"> <return type="void">
</return> </return>
@ -54,6 +62,16 @@
<description> <description>
</description> </description>
</method> </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"> <method name="clear">
<return type="void"> <return type="void">
</return> </return>

8
doc/classes/Transform.xml
View File

@ -141,18 +141,18 @@
</description> </description>
</method> </method>
<method name="xform"> <method name="xform">
<return type="var"> <return type="Variant">
</return> </return>
<argument index="0" name="v" type="var"> <argument index="0" name="v" type="Variant">
</argument> </argument>
<description> <description>
Transforms the given vector "v" by this transform. Transforms the given vector "v" by this transform.
</description> </description>
</method> </method>
<method name="xform_inv"> <method name="xform_inv">
<return type="var"> <return type="Variant">
</return> </return>
<argument index="0" name="v" type="var"> <argument index="0" name="v" type="Variant">
</argument> </argument>
<description> <description>
Inverse-transforms the given vector "v" by this transform. Inverse-transforms the given vector "v" by this transform.

8
doc/classes/Transform2D.xml
View File

@ -54,7 +54,7 @@
<method name="basis_xform"> <method name="basis_xform">
<return type="Transform2D"> <return type="Transform2D">
</return> </return>
<argument index="0" name="v" type="var"> <argument index="0" name="v" type="Variant">
</argument> </argument>
<description> <description>
Transforms the given vector by this transform's basis (no translation). Transforms the given vector by this transform's basis (no translation).
@ -63,7 +63,7 @@
<method name="basis_xform_inv"> <method name="basis_xform_inv">
<return type="Transform2D"> <return type="Transform2D">
</return> </return>
<argument index="0" name="v" type="var"> <argument index="0" name="v" type="Variant">
</argument> </argument>
<description> <description>
Inverse-transforms the given vector by this transform's basis (no translation). Inverse-transforms the given vector by this transform's basis (no translation).
@ -145,7 +145,7 @@
<method name="xform"> <method name="xform">
<return type="Transform2D"> <return type="Transform2D">
</return> </return>
<argument index="0" name="v" type="var"> <argument index="0" name="v" type="Variant">
</argument> </argument>
<description> <description>
Transforms the given vector "v" by this transform. Transforms the given vector "v" by this transform.
@ -154,7 +154,7 @@
<method name="xform_inv"> <method name="xform_inv">
<return type="Transform2D"> <return type="Transform2D">
</return> </return>
<argument index="0" name="v" type="var"> <argument index="0" name="v" type="Variant">
</argument> </argument>
<description> <description>
Inverse-transforms the given vector "v" by this transform. Inverse-transforms the given vector "v" by this transform.

4
editor/doc/doc_data.cpp
View File

@ -496,7 +496,7 @@ void DocData::generate(bool p_basic_types) {
ad.name = arginfo.name; ad.name = arginfo.name;
if (arginfo.type == Variant::NIL) if (arginfo.type == Variant::NIL)
ad.type = "var"; ad.type = "Variant";
else else
ad.type = Variant::get_type_name(arginfo.type); 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.type == Variant::NIL) {
if (mi.return_val.name != "") if (mi.return_val.name != "")
method.return_type = "var"; method.return_type = "Variant";
} else { } else {
method.return_type = Variant::get_type_name(mi.return_val.type); method.return_type = Variant::get_type_name(mi.return_val.type);
} }

2
editor/doc/doc_dump.cpp
View File

@ -142,7 +142,7 @@ void DocDump::dump(const String &p_file) {
if (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE) if (arginfo.hint == PROPERTY_HINT_RESOURCE_TYPE)
type_name = arginfo.hint_string; type_name = arginfo.hint_string;
else if (arginfo.type == Variant::NIL) else if (arginfo.type == Variant::NIL)
type_name = "var"; type_name = "Variant";
else else
type_name = Variant::get_type_name(arginfo.type); type_name = Variant::get_type_name(arginfo.type);