diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-09 13:01:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-09 13:01:50 +0100 |
commit | 114f97ff110aa0b5c54ea1c8279b21dc73c5efc8 (patch) | |
tree | 065ed6b74f7e0171c1bc9f8d94fcee2f01d7f7cb /core/object | |
parent | e48d1b3f518d24a5ff0cb7f636c07162873fa63e (diff) | |
parent | 2c048ea16429cfa4e6b200a4fe519ee9db7c3f99 (diff) | |
download | redot-engine-114f97ff110aa0b5c54ea1c8279b21dc73c5efc8.tar.gz |
Merge pull request #44128 from KoBeWi/🧹
Cleanup unused engine code
Diffstat (limited to 'core/object')
-rw-r--r-- | core/object/object.cpp | 4 | ||||
-rw-r--r-- | core/object/object.h | 2 | ||||
-rw-r--r-- | core/object/script_language.h | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index 3764316122..681e1188ff 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -823,10 +823,6 @@ void Object::property_list_changed_notify() { _change_notify(); } -void Object::cancel_delete() { - _predelete_ok = true; -} - void Object::set_script_and_instance(const Variant &p_script, ScriptInstance *p_instance) { //this function is not meant to be used in any of these ways ERR_FAIL_COND(p_script.is_null()); diff --git a/core/object/object.h b/core/object/object.h index 5bf9600c5a..dc004f38a9 100644 --- a/core/object/object.h +++ b/core/object/object.h @@ -525,8 +525,6 @@ protected: static void get_valid_parents_static(List<String> *p_parents); static void _get_valid_parents_static(List<String> *p_parents); - void cancel_delete(); - virtual void _changed_callback(Object *p_changed, const char *p_prop); //Variant _call_bind(const StringName& p_name, const Variant& p_arg1 = Variant(), const Variant& p_arg2 = Variant(), const Variant& p_arg3 = Variant(), const Variant& p_arg4 = Variant()); diff --git a/core/object/script_language.h b/core/object/script_language.h index ddd884a4f3..f5d65cf42d 100644 --- a/core/object/script_language.h +++ b/core/object/script_language.h @@ -274,8 +274,6 @@ class ScriptCodeCompletionCache { static ScriptCodeCompletionCache *singleton; public: - virtual RES get_cached_resource(const String &p_path) = 0; - static ScriptCodeCompletionCache *get_singleton() { return singleton; } ScriptCodeCompletionCache(); |