mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12405 from Jerome67000/clean_getnodetype

Browse Source 
Removes Script::get_node_type()

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-10-26 08:49:38 +02:00 committed by GitHub
commit d135008acf
13 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/script_language.cpp
View File

@ -58,7 +58,6 @@ void Script::_bind_methods() {
ClassDB::bind_method(D_METHOD("has_script_signal", "signal_name"), &Script::has_script_signal);
ClassDB::bind_method(D_METHOD("is_tool"), &Script::is_tool);
ClassDB::bind_method(D_METHOD("get_node_type"), &Script::get_node_type);
}
void ScriptServer::set_scripting_enabled(bool p_enabled) {

2
core/script_language.h
View File

@ -107,8 +107,6 @@ public:
virtual bool is_tool() const = 0;
virtual String get_node_type() const = 0;
virtual ScriptLanguage *get_language() const = 0;
virtual bool has_script_signal(const StringName &p_signal) const = 0;

6
doc/classes/Script.xml
View File

@ -19,12 +19,6 @@
Returns true if the script can be instanced.
</description>
</method>
<method name="get_node_type" qualifiers="const">
<return type="String">
</return>
<description>
</description>
</method>
<method name="get_source_code" qualifiers="const">
<return type="String">
</return>

4
modules/gdnative/nativescript/nativescript.cpp
View File

@ -270,10 +270,6 @@ bool NativeScript::is_tool() const {
return false;
}
String NativeScript::get_node_type() const {
return ""; // NOTE(karroffel): uhm?
}
ScriptLanguage *NativeScript::get_language() const {
return NativeScriptLanguage::get_singleton();
}

2
modules/gdnative/nativescript/nativescript.h
View File

@ -142,8 +142,6 @@ public:
virtual bool is_tool() const;
virtual String get_node_type() const;
virtual ScriptLanguage *get_language() const;
virtual bool has_script_signal(const StringName &p_signal) const;

5
modules/gdnative/pluginscript/pluginscript_script.cpp
View File

@ -346,11 +346,6 @@ bool PluginScript::get_property_default_value(const StringName &p_property, Vari
return false;
}
String PluginScript::get_node_type() const {
// Even GDscript doesn't know what to put here !
return ""; // ?
}
ScriptLanguage *PluginScript::get_language() const {
return _language;
}

2
modules/gdnative/pluginscript/pluginscript_script.h
View File

@ -103,8 +103,6 @@ public:
bool is_tool() const { return _tool; }
virtual String get_node_type() const;
virtual ScriptLanguage *get_language() const;
virtual bool has_script_signal(const StringName &p_signal) const;

5
modules/gdscript/gd_script.cpp
View File

@ -609,11 +609,6 @@ Error GDScript::reload(bool p_keep_state) {
return OK;
}
String GDScript::get_node_type() const {
return ""; // ?
}
ScriptLanguage *GDScript::get_language() const {
return GDScriptLanguage::get_singleton();

1
modules/gdscript/gd_script.h
View File

@ -172,7 +172,6 @@ public:
virtual Error reload(bool p_keep_state = false);
virtual String get_node_type() const;
void set_script_path(const String &p_path) { path = p_path; } //because subclasses need a path too...
Error load_source_code(const String &p_path);
Error load_byte_code(const String &p_path);

5
modules/mono/csharp_script.cpp
View File

@ -1720,11 +1720,6 @@ Error CSharpScript::reload(bool p_keep_state) {
return ERR_FILE_MISSING_DEPENDENCIES;
}
String CSharpScript::get_node_type() const {
return ""; // ?
}
ScriptLanguage *CSharpScript::get_language() const {
return CSharpLanguage::get_singleton();

1
modules/mono/csharp_script.h
View File

@ -138,7 +138,6 @@ public:
virtual bool is_tool() const { return tool; }
virtual Ref<Script> get_base_script() const;
virtual String get_node_type() const;
virtual ScriptLanguage *get_language() const;
/* TODO */ virtual void get_script_method_list(List<MethodInfo> *p_list) const {}

5
modules/visual_script/visual_script.cpp
View File

@ -974,11 +974,6 @@ bool VisualScript::is_tool() const {
return false;
}
String VisualScript::get_node_type() const {
return String();
}
ScriptLanguage *VisualScript::get_language() const {
return VisualScriptLanguage::singleton;

2
modules/visual_script/visual_script.h
View File

@ -339,8 +339,6 @@ public:
virtual bool is_tool() const;
virtual String get_node_type() const;
virtual ScriptLanguage *get_language() const;
virtual bool has_script_signal(const StringName &p_signal) const;