diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-08 13:59:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-08 13:59:46 +0100 |
| commit | edb3686ee2379ad28d1273797db8bd9ded38ff1e (patch) | |
| tree | 8ce43d22ff6d644a8b59b42b9f8d2003d03ef1a8 | |
| parent | 360cfeedacba971b255c68f7e061f2356bdb3135 (diff) | |
| parent | a2118129321e4e4868f0ef2dd2b21699a98a126e (diff) | |
Merge pull request #44190 from touilleMan/constify-ScriptLanguage.can_inherit_from_file
Constify ScriptLanguage.can_inherit_from_file
| -rw-r--r-- | core/object/script_language.h | 2 | ||||
| -rw-r--r-- | modules/gdnative/pluginscript/pluginscript_language.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/pluginscript/pluginscript_language.h | 2 | ||||
| -rw-r--r-- | modules/gdscript/gdscript.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/object/script_language.h b/core/object/script_language.h index 72586780ae..ddd884a4f3 100644 --- a/core/object/script_language.h +++ b/core/object/script_language.h @@ -316,7 +316,7 @@ public: virtual bool has_named_classes() const = 0; virtual bool supports_builtin_mode() const = 0; virtual bool supports_documentation() const { return false; } - virtual bool can_inherit_from_file() { return false; } + virtual bool can_inherit_from_file() const { return false; } virtual int find_function(const String &p_function, const String &p_code) const = 0; virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const = 0; virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) { return ERR_UNAVAILABLE; } diff --git a/modules/gdnative/pluginscript/pluginscript_language.cpp b/modules/gdnative/pluginscript/pluginscript_language.cpp index cef4f4358c..df685e716f 100644 --- a/modules/gdnative/pluginscript/pluginscript_language.cpp +++ b/modules/gdnative/pluginscript/pluginscript_language.cpp @@ -142,7 +142,7 @@ bool PluginScriptLanguage::supports_builtin_mode() const { return _desc.supports_builtin_mode; } -bool PluginScriptLanguage::can_inherit_from_file() { +bool PluginScriptLanguage::can_inherit_from_file() const { return _desc.can_inherit_from_file; } diff --git a/modules/gdnative/pluginscript/pluginscript_language.h b/modules/gdnative/pluginscript/pluginscript_language.h index bc9bbdea07..7548eba4a0 100644 --- a/modules/gdnative/pluginscript/pluginscript_language.h +++ b/modules/gdnative/pluginscript/pluginscript_language.h @@ -78,7 +78,7 @@ public: virtual Script *create_script() const; virtual bool has_named_classes() const; virtual bool supports_builtin_mode() const; - virtual bool can_inherit_from_file(); + virtual bool can_inherit_from_file() const; virtual int find_function(const String &p_function, const String &p_code) const; virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const; virtual Error complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptCodeCompletionOption> *r_options, bool &r_force, String &r_call_hint); diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h index 3eb260f95f..f949d26664 100644 --- a/modules/gdscript/gdscript.h +++ b/modules/gdscript/gdscript.h @@ -471,7 +471,7 @@ public: virtual bool has_named_classes() const; virtual bool supports_builtin_mode() const; virtual bool supports_documentation() const; - virtual bool can_inherit_from_file() { return true; } + virtual bool can_inherit_from_file() const { return true; } virtual int find_function(const String &p_function, const String &p_code) const; virtual String make_function(const String &p_class, const String &p_name, const PackedStringArray &p_args) const; virtual Error complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptCodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint); |