summaryrefslogtreecommitdiffstats
path: root/tools/doc/doc_data.cpp
diff options
context:
space:
mode:
authorAren Villanueva <arenvillanueva@yomogi-soft.com>2015-11-18 22:33:29 +1100
committerAren Villanueva <arenvillanueva@yomogi-soft.com>2015-11-19 22:01:42 +1100
commit5c7e9e7e633088fae7e9c9e30c3814a1b2a7207c (patch)
tree7fde4da8bd507cb9b78e7e7f30255356cfb73067 /tools/doc/doc_data.cpp
parent36d620c633be55ac402892bce816d4a9b4d67bee (diff)
downloadredot-engine-5c7e9e7e633088fae7e9c9e30c3814a1b2a7207c.tar.gz
Fixes the make_doc.sh, <, > and & signs in descriptions that cause the parser to break.
Documentation for HTTPClient. Added a query_string_from_dict method to HTTPClient to create a x-www-form-urlencoded valid query string for GET and POST messages. String now has http_escape() and http_unescape() methods to help facilitate the above query_string_from_dict method.
Diffstat (limited to 'tools/doc/doc_data.cpp')
-rw-r--r--tools/doc/doc_data.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index 432f358627..c1d3e5e314 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -189,9 +189,11 @@ void DocData::generate(bool p_basic_types) {
arginfo=E->get().return_val;
if (arginfo.type==Variant::NIL)
continue;
+#ifdef DEBUG_METHODS_ENABLED
if (m && m->get_return_type()!=StringName())
method.return_type=m->get_return_type();
else
+#endif
method.return_type=(arginfo.hint==PROPERTY_HINT_RESOURCE_TYPE)?arginfo.hint_string:Variant::get_type_name(arginfo.type);
} else {