summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorTechnoPorg <jonah.janzen@gmail.com>2022-01-25 08:37:41 -0700
committerTechnoPorg <jonah.janzen@gmail.com>2022-01-25 09:03:36 -0700
commit051ef479c93c0c830b60059e3dabed6fc381cdd6 (patch)
tree7e934e5aaa141e00de5d4a45ee7d92f4b9f6eb02 /modules
parent2f4d76f068b29783bde653406b51909b29a082a3 (diff)
Allow method binds to take Object subclasses as arguments
This commit adds a condition to VariantCaster that casts Variants of type OBJECT to any type T, if T is derived from Object. This change enables a fair bit of code cleanup. First, the Variant implicit cast operators for Node and Control can be removed, which allows for some invalid includes to be removed. Second, helper methods in Tree whose sole purpose was to cast arguments to TreeItem * are no longer necessary. A few small changes also had to be made to other files, due to the changes cascading down all the includes.
Diffstat (limited to 'modules')
-rw-r--r--modules/gdscript/language_server/gdscript_workspace.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/language_server/gdscript_workspace.cpp b/modules/gdscript/language_server/gdscript_workspace.cpp
index a944844226..a627eca45d 100644
--- a/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -585,7 +585,7 @@ void GDScriptWorkspace::completion(const lsp::CompletionParams &p_params, List<S
stack.push_back(owner_scene_node);
while (!stack.is_empty()) {
- current = stack.pop_back();
+ current = Object::cast_to<Node>(stack.pop_back());
Ref<GDScript> script = current->get_script();
if (script.is_valid() && script->get_path() == path) {
break;