Merge pull request #12969 from akien-mga/refactor-gd-prefix

GDScript: Refactor "GD" class prefix to "GDScript"
godotengine · Nov 16, 2017 · ab3cd97 · ab3cd97
2 parents bb1d191 + 4cfc296
commit ab3cd97
Show file tree

Hide file tree

Showing 19 changed files with 1,330 additions and 1,327 deletions.
diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml
@@ -1103,14 +1103,14 @@
 			</description>
 		</method>
 		<method name="yield">
-			<return type="GDFunctionState">
+			<return type="GDScriptFunctionState">
 			</return>
 			<argument index="0" name="object" type="Object">
 			</argument>
 			<argument index="1" name="signal" type="String">
 			</argument>
 			<description>
-				Stops the function execution and returns the current state. Call [method GDFunctionState.resume] on the state to resume execution. This invalidates the state.
+				Stops the function execution and returns the current state. Call [method GDScriptFunctionState.resume] on the state to resume execution. This invalidates the state.
 				Returns anything that was passed to the resume function call. If passed an object and a signal, the execution is resumed when the object's signal is emitted.
 			</description>
 		</method>

diff --git a/main/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp
diff --git a/modules/gdscript/config.py b/modules/gdscript/config.py
@@ -6,9 +6,9 @@ def configure(env):
 
 def get_doc_classes():
     return [
-        "GDFunctionState",
-        "GDNativeClass",
         "GDScript",
+        "GDScriptFunctionState",
+        "GDScriptNativeClass",
     ]
 
 def get_doc_path():

diff --git a/.../gdscript/doc_classes/GDFunctionState.xml → ...ipt/doc_classes/GDScriptFunctionState.xml b/.../gdscript/doc_classes/GDFunctionState.xml → ...ipt/doc_classes/GDScriptFunctionState.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDFunctionState" inherits="Reference" category="Core" version="3.0-alpha">
+<class name="GDScriptFunctionState" inherits="Reference" category="Core" version="3.0-alpha">
 	<brief_description>
 		State of a function call after yielding.
 	</brief_description>
@@ -18,7 +18,7 @@
 			</argument>
 			<description>
 				Check whether the function call may be resumed. This is not the case if the function state was already resumed.
-				If [code]extended_check[/code] is enabled, it also checks if the associated script and object still exist. The extended check is done in debug mode as part of [method GDFunctionState.resume], but you can use this if you know you may be trying to resume without knowing for sure the object and/or script have survived up to that point.
+				If [code]extended_check[/code] is enabled, it also checks if the associated script and object still exist. The extended check is done in debug mode as part of [method GDScriptFunctionState.resume], but you can use this if you know you may be trying to resume without knowing for sure the object and/or script have survived up to that point.
 			</description>
 		</method>
 		<method name="resume">

diff --git a/...es/gdscript/doc_classes/GDNativeClass.xml → ...cript/doc_classes/GDScriptNativeClass.xml b/...es/gdscript/doc_classes/GDNativeClass.xml → ...cript/doc_classes/GDScriptNativeClass.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GDNativeClass" inherits="Reference" category="Core" version="3.0-alpha">
+<class name="GDScriptNativeClass" inherits="Reference" category="Core" version="3.0-alpha">
 	<brief_description>
 	</brief_description>
 	<description>