Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 07:53:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #111289 from HolonProduction/rm-has-named-classes

Browse source 
Move deprecated `has_named_classes` from `ScriptLanguage` to `ScriptLanguageExtension`
This commit is contained in:
Thaddeus Crews 2025-10-08 13:56:37 -05:00
commit e20acd3fe3
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
5 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/object/script_language.h
View file

@ -273,9 +273,6 @@ public:
virtual bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptError> *r_errors = nullptr, List<Warning> *r_warnings = nullptr, HashSet<int> *r_safe_lines = nullptr) const = 0; virtual bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptError> *r_errors = nullptr, List<Warning> *r_warnings = nullptr, HashSet<int> *r_safe_lines = nullptr) const = 0;
virtual String validate_path(const String &p_path) const { return ""; } virtual String validate_path(const String &p_path) const { return ""; }
virtual Script *create_script() const = 0; virtual Script *create_script() const = 0;
#ifndef DISABLE_DEPRECATED
virtual bool has_named_classes() const = 0;
#endif
virtual bool supports_builtin_mode() const = 0; virtual bool supports_builtin_mode() const = 0;
virtual bool supports_documentation() const { return false; } virtual bool supports_documentation() const { return false; }
virtual bool can_inherit_from_file() const { return false; } virtual bool can_inherit_from_file() const { return false; }

2
core/object/script_language_extension.h
View file

@ -370,7 +370,7 @@ public:
return Object::cast_to<Script>(ret); return Object::cast_to<Script>(ret);
} }
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
EXBIND0RC(bool, has_named_classes) GDVIRTUAL0RC(bool, _has_named_classes)
#endif #endif
EXBIND0RC(bool, supports_builtin_mode) EXBIND0RC(bool, supports_builtin_mode)
EXBIND0RC(bool, supports_documentation) EXBIND0RC(bool, supports_documentation)

2
doc/classes/ScriptLanguageExtension.xml
View file

@ -215,7 +215,7 @@
<description> <description>
</description> </description>
</method> </method>
<method name="_has_named_classes" qualifiers="virtual required const" deprecated="This method is not called by the engine."> <method name="_has_named_classes" qualifiers="virtual const" deprecated="This method is not called by the engine.">
<return type="bool" /> <return type="bool" />
<description> <description>
</description> </description>

3
modules/gdscript/gdscript.h
View file

@ -608,9 +608,6 @@ public:
virtual Vector<ScriptTemplate> get_built_in_templates(const StringName &p_object) override; virtual Vector<ScriptTemplate> get_built_in_templates(const StringName &p_object) override;
virtual bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptLanguage::ScriptError> *r_errors = nullptr, List<ScriptLanguage::Warning> *r_warnings = nullptr, HashSet<int> *r_safe_lines = nullptr) const override; virtual bool validate(const String &p_script, const String &p_path = "", List<String> *r_functions = nullptr, List<ScriptLanguage::ScriptError> *r_errors = nullptr, List<ScriptLanguage::Warning> *r_warnings = nullptr, HashSet<int> *r_safe_lines = nullptr) const override;
virtual Script *create_script() const override; virtual Script *create_script() const override;
#ifndef DISABLE_DEPRECATED
virtual bool has_named_classes() const override { return false; }
#endif
virtual bool supports_builtin_mode() const override; virtual bool supports_builtin_mode() const override;
virtual bool supports_documentation() const override; virtual bool supports_documentation() const override;
virtual bool can_inherit_from_file() const override { return true; } virtual bool can_inherit_from_file() const override { return true; }

3
modules/mono/csharp_script.h
View file

@ -514,9 +514,6 @@ public:
} }
String validate_path(const String &p_path) const override; String validate_path(const String &p_path) const override;
Script *create_script() const override; Script *create_script() const override;
#ifndef DISABLE_DEPRECATED
virtual bool has_named_classes() const override { return false; }
#endif
bool supports_builtin_mode() const override; bool supports_builtin_mode() const override;
/* TODO? */ int find_function(const String &p_function, const String &p_code) const override { /* TODO? */ int find_function(const String &p_function, const String &p_code) const override {
return -1; return -1;