Skip to content

Commit e20acd3

Browse files
committed
Merge pull request #111289 from HolonProduction/rm-has-named-classes
Move deprecated `has_named_classes` from `ScriptLanguage` to `ScriptLanguageExtension`
2 parents 0091d30 + abeb9c6 commit e20acd3

File tree

5 files changed

+2
-11
lines changed

5 files changed

+2
-11
lines changed

core/object/script_language.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,6 @@ class ScriptLanguage : public Object {
273273
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;
274274
virtual String validate_path(const String &p_path) const { return ""; }
275275
virtual Script *create_script() const = 0;
276-
#ifndef DISABLE_DEPRECATED
277-
virtual bool has_named_classes() const = 0;
278-
#endif
279276
virtual bool supports_builtin_mode() const = 0;
280277
virtual bool supports_documentation() const { return false; }
281278
virtual bool can_inherit_from_file() const { return false; }

core/object/script_language_extension.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ class ScriptLanguageExtension : public ScriptLanguage {
370370
return Object::cast_to<Script>(ret);
371371
}
372372
#ifndef DISABLE_DEPRECATED
373-
EXBIND0RC(bool, has_named_classes)
373+
GDVIRTUAL0RC(bool, _has_named_classes)
374374
#endif
375375
EXBIND0RC(bool, supports_builtin_mode)
376376
EXBIND0RC(bool, supports_documentation)

doc/classes/ScriptLanguageExtension.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<description>
216216
</description>
217217
</method>
218-
<method name="_has_named_classes" qualifiers="virtual required const" deprecated="This method is not called by the engine.">
218+
<method name="_has_named_classes" qualifiers="virtual const" deprecated="This method is not called by the engine.">
219219
<return type="bool" />
220220
<description>
221221
</description>

modules/gdscript/gdscript.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,9 +608,6 @@ class GDScriptLanguage : public ScriptLanguage {
608608
virtual Vector<ScriptTemplate> get_built_in_templates(const StringName &p_object) override;
609609
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;
610610
virtual Script *create_script() const override;
611-
#ifndef DISABLE_DEPRECATED
612-
virtual bool has_named_classes() const override { return false; }
613-
#endif
614611
virtual bool supports_builtin_mode() const override;
615612
virtual bool supports_documentation() const override;
616613
virtual bool can_inherit_from_file() const override { return true; }

modules/mono/csharp_script.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,6 @@ class CSharpLanguage : public ScriptLanguage {
514514
}
515515
String validate_path(const String &p_path) const override;
516516
Script *create_script() const override;
517-
#ifndef DISABLE_DEPRECATED
518-
virtual bool has_named_classes() const override { return false; }
519-
#endif
520517
bool supports_builtin_mode() const override;
521518
/* TODO? */ int find_function(const String &p_function, const String &p_code) const override {
522519
return -1;

0 commit comments

Comments
 (0)