summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-02-27 08:31:01 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-02-27 08:31:01 +0100
commitec8475af5eb61e988b389d032adc548f6ef39be6 (patch)
tree7253f6bce96aaea953d5212d56f7a169e8819450
parentb8e8572a1d650a68c3f6b711f2955f6f2798d72a (diff)
parentbd5ab9f9b42ba0ee5cdda0947c3743ade075eaac (diff)
Merge pull request #74028 from voidedWarranties/scriptlanguage_unused
Remove unused `ScriptLanguage` methods
-rw-r--r--core/object/script_language.h6
-rw-r--r--core/object/script_language_extension.cpp7
-rw-r--r--core/object/script_language_extension.h18
-rw-r--r--doc/classes/ScriptLanguageExtension.xml30
-rw-r--r--modules/gdscript/gdscript.cpp5
-rw-r--r--modules/gdscript/gdscript.h1
-rw-r--r--modules/mono/csharp_script.cpp5
-rw-r--r--modules/mono/csharp_script.h1
8 files changed, 0 insertions, 73 deletions
diff --git a/core/object/script_language.h b/core/object/script_language.h
index 3ef121a8e7..696c9a94a5 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -249,7 +249,6 @@ public:
virtual void init() = 0;
virtual String get_type() const = 0;
virtual String get_extension() const = 0;
- virtual Error execute_file(const String &p_path) = 0;
virtual void finish() = 0;
/* EDITOR FUNCTIONS */
@@ -428,11 +427,6 @@ public:
virtual int profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max) = 0;
virtual int profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max) = 0;
- virtual void *alloc_instance_binding_data(Object *p_object) { return nullptr; } //optional, not used by all languages
- virtual void free_instance_binding_data(void *p_data) {} //optional, not used by all languages
- virtual void refcount_incremented_instance_binding(Object *p_object) {} //optional, not used by all languages
- virtual bool refcount_decremented_instance_binding(Object *p_object) { return true; } //return true if it can die //optional, not used by all languages
-
virtual void frame();
virtual bool handles_global_class_type(const String &p_type) const { return false; }
diff --git a/core/object/script_language_extension.cpp b/core/object/script_language_extension.cpp
index c7eb32c020..0df9d58334 100644
--- a/core/object/script_language_extension.cpp
+++ b/core/object/script_language_extension.cpp
@@ -84,7 +84,6 @@ void ScriptLanguageExtension::_bind_methods() {
GDVIRTUAL_BIND(_init);
GDVIRTUAL_BIND(_get_type);
GDVIRTUAL_BIND(_get_extension);
- GDVIRTUAL_BIND(_execute_file, "path");
GDVIRTUAL_BIND(_finish);
GDVIRTUAL_BIND(_get_reserved_words);
@@ -144,12 +143,6 @@ void ScriptLanguageExtension::_bind_methods() {
GDVIRTUAL_BIND(_profiling_get_accumulated_data, "info_array", "info_max");
GDVIRTUAL_BIND(_profiling_get_frame_data, "info_array", "info_max");
- GDVIRTUAL_BIND(_alloc_instance_binding_data, "object");
- GDVIRTUAL_BIND(_free_instance_binding_data, "data");
-
- GDVIRTUAL_BIND(_refcount_incremented_instance_binding, "object");
- GDVIRTUAL_BIND(_refcount_decremented_instance_binding, "object");
-
GDVIRTUAL_BIND(_frame);
GDVIRTUAL_BIND(_handles_global_class_type, "type");
diff --git a/core/object/script_language_extension.h b/core/object/script_language_extension.h
index 8e162a1b0f..79cf712119 100644
--- a/core/object/script_language_extension.h
+++ b/core/object/script_language_extension.h
@@ -202,7 +202,6 @@ public:
EXBIND0(init)
EXBIND0RC(String, get_type)
EXBIND0RC(String, get_extension)
- EXBIND1R(Error, execute_file, const String &)
EXBIND0(finish)
/* EDITOR FUNCTIONS */
@@ -596,23 +595,6 @@ public:
return ret;
}
- GDVIRTUAL1R(GDExtensionPtr<void>, _alloc_instance_binding_data, Object *)
-
- virtual void *alloc_instance_binding_data(Object *p_object) override {
- GDExtensionPtr<void> ret = nullptr;
- GDVIRTUAL_REQUIRED_CALL(_alloc_instance_binding_data, p_object, ret);
- return ret.operator void *();
- }
-
- GDVIRTUAL1(_free_instance_binding_data, GDExtensionPtr<void>)
-
- virtual void free_instance_binding_data(void *p_data) override {
- GDVIRTUAL_REQUIRED_CALL(_free_instance_binding_data, p_data);
- }
-
- EXBIND1(refcount_incremented_instance_binding, Object *)
- EXBIND1R(bool, refcount_decremented_instance_binding, Object *)
-
EXBIND0(frame)
EXBIND1RC(bool, handles_global_class_type, const String &)
diff --git a/doc/classes/ScriptLanguageExtension.xml b/doc/classes/ScriptLanguageExtension.xml
index 2d41f8e880..d67fe5d255 100644
--- a/doc/classes/ScriptLanguageExtension.xml
+++ b/doc/classes/ScriptLanguageExtension.xml
@@ -21,12 +21,6 @@
<description>
</description>
</method>
- <method name="_alloc_instance_binding_data" qualifiers="virtual">
- <return type="void*" />
- <param index="0" name="object" type="Object" />
- <description>
- </description>
- </method>
<method name="_auto_indent_code" qualifiers="virtual const">
<return type="String" />
<param index="0" name="code" type="String" />
@@ -118,12 +112,6 @@
<description>
</description>
</method>
- <method name="_execute_file" qualifiers="virtual">
- <return type="int" enum="Error" />
- <param index="0" name="path" type="String" />
- <description>
- </description>
- </method>
<method name="_find_function" qualifiers="virtual const">
<return type="int" />
<param index="0" name="class_name" type="String" />
@@ -141,12 +129,6 @@
<description>
</description>
</method>
- <method name="_free_instance_binding_data" qualifiers="virtual">
- <return type="void" />
- <param index="0" name="data" type="void*" />
- <description>
- </description>
- </method>
<method name="_get_built_in_templates" qualifiers="virtual const">
<return type="Dictionary[]" />
<param index="0" name="object" type="StringName" />
@@ -298,18 +280,6 @@
<description>
</description>
</method>
- <method name="_refcount_decremented_instance_binding" qualifiers="virtual">
- <return type="bool" />
- <param index="0" name="object" type="Object" />
- <description>
- </description>
- </method>
- <method name="_refcount_incremented_instance_binding" qualifiers="virtual">
- <return type="void" />
- <param index="0" name="object" type="Object" />
- <description>
- </description>
- </method>
<method name="_reload_all_scripts" qualifiers="virtual">
<return type="void" />
<description>
diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp
index 00f8d2817a..b6caefbdb5 100644
--- a/modules/gdscript/gdscript.cpp
+++ b/modules/gdscript/gdscript.cpp
@@ -2027,11 +2027,6 @@ String GDScriptLanguage::get_extension() const {
return "gd";
}
-Error GDScriptLanguage::execute_file(const String &p_path) {
- // ??
- return OK;
-}
-
void GDScriptLanguage::finish() {
if (_call_stack) {
memdelete_arr(_call_stack);
diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h
index 82d04f641c..0117ed40ab 100644
--- a/modules/gdscript/gdscript.h
+++ b/modules/gdscript/gdscript.h
@@ -473,7 +473,6 @@ public:
virtual void init() override;
virtual String get_type() const override;
virtual String get_extension() const override;
- virtual Error execute_file(const String &p_path) override;
virtual void finish() override;
/* EDITOR FUNCTIONS */
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp
index 43d2779e41..872e803b9c 100644
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
@@ -92,11 +92,6 @@ String CSharpLanguage::get_extension() const {
return "cs";
}
-Error CSharpLanguage::execute_file(const String &p_path) {
- // ??
- return OK;
-}
-
void CSharpLanguage::init() {
#ifdef DEBUG_METHODS_ENABLED
if (OS::get_singleton()->get_cmdline_args().find("--class-db-json")) {
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h
index 6021555255..02c354f74e 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -413,7 +413,6 @@ public:
/* LANGUAGE FUNCTIONS */
String get_type() const override;
String get_extension() const override;
- Error execute_file(const String &p_path) override;
void init() override;
void finish() override;