Refactor MethodBind to use variadic templates

Removed make_binders and the old style generated binders.

14 files changed, 4 insertions, 19 deletions

diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index 320b382676..402eac644f 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -30,12 +30,11 @@
 
 #include "physics_body_2d.h"
 
+#include "core/class_db.h"
 #include "core/core_string_names.h"
 #include "core/engine.h"
 #include "core/list.h"
 #include "core/math/math_funcs.h"
-#include "core/method_bind_ext.gen.inc"
-#include "core/object.h"
 #include "core/rid.h"
 #include "scene/scene_string_names.h"
 
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index c2951559a4..94ec0998fa 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -32,7 +32,6 @@
 
 #include "collision_object_2d.h"
 #include "core/io/marshalls.h"
-#include "core/method_bind_ext.gen.inc"
 #include "core/os/os.h"
 #include "scene/2d/area_2d.h"
 #include "servers/navigation_server_2d.h"
diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp
index ab30d2fec5..fd592012f8 100644
--- a/scene/3d/gi_probe.cpp
+++ b/scene/3d/gi_probe.cpp
@@ -32,7 +32,6 @@
 
 #include "core/os/os.h"
 
-#include "core/method_bind_ext.gen.inc"
 #include "mesh_instance_3d.h"
 #include "voxelizer.h"
 
diff --git a/scene/3d/physics_body_3d.cpp b/scene/3d/physics_body_3d.cpp
index aae81c6a34..579088b835 100644
--- a/scene/3d/physics_body_3d.cpp
+++ b/scene/3d/physics_body_3d.cpp
@@ -30,11 +30,10 @@
 
 #include "physics_body_3d.h"
 
+#include "core/class_db.h"
 #include "core/core_string_names.h"
 #include "core/engine.h"
 #include "core/list.h"
-#include "core/method_bind_ext.gen.inc"
-#include "core/object.h"
 #include "core/rid.h"
 #include "scene/3d/collision_shape_3d.h"
 #include "scene/scene_string_names.h"
diff --git a/scene/3d/soft_body_3d.cpp b/scene/3d/soft_body_3d.cpp
index 018a2a7a39..3b5c328e43 100644
--- a/scene/3d/soft_body_3d.cpp
+++ b/scene/3d/soft_body_3d.cpp
@@ -30,8 +30,8 @@
 
 #include "soft_body_3d.h"
 
+#include "core/class_db.h"
 #include "core/list.h"
-#include "core/object.h"
 #include "core/os/os.h"
 #include "core/rid.h"
 #include "scene/3d/collision_object_3d.h"
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index d7d55b468e..bb5d536600 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -32,7 +32,6 @@
 
 #include "animation_blend_tree.h"
 #include "core/engine.h"
-#include "core/method_bind_ext.gen.inc"
 #include "scene/scene_string_names.h"
 #include "servers/audio/audio_stream.h"
 
diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp
index bd4396d680..1a2a97ada8 100644
--- a/scene/animation/tween.cpp
+++ b/scene/animation/tween.cpp
@@ -30,8 +30,6 @@
 
 #include "tween.h"
 
-#include "core/method_bind_ext.gen.inc"
-
 void Tween::_add_pending_command(StringName p_key, const Variant &p_arg1, const Variant &p_arg2, const Variant &p_arg3, const Variant &p_arg4, const Variant &p_arg5, const Variant &p_arg6, const Variant &p_arg7, const Variant &p_arg8, const Variant &p_arg9, const Variant &p_arg10) {
 	// Add a new pending command and reference it
 	pending_commands.push_back(PendingCommand());
diff --git a/scene/debugger/scene_debugger.h b/scene/debugger/scene_debugger.h
index a2bafde039..80e329f1f2 100644
--- a/scene/debugger/scene_debugger.h
+++ b/scene/debugger/scene_debugger.h
@@ -32,7 +32,7 @@
 #define SCENE_DEBUGGER_H
 
 #include "core/array.h"
-#include "core/object.h"
+#include "core/class_db.h"
 #include "core/pair.h"
 #include "core/ustring.h"
 
diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp
index 38bf31830f..4454e87017 100644
--- a/scene/gui/graph_node.cpp
+++ b/scene/gui/graph_node.cpp
@@ -30,8 +30,6 @@
 
 #include "graph_node.h"
 
-#include "core/method_bind_ext.gen.inc"
-
 bool GraphNode::_set(const StringName &p_name, const Variant &p_value) {
 	if (!p_name.operator String().begins_with("slot/")) {
 		return false;
diff --git a/scene/main/canvas_item.cpp b/scene/main/canvas_item.cpp
index 0d9d9d6356..718d805bdd 100644
--- a/scene/main/canvas_item.cpp
+++ b/scene/main/canvas_item.cpp
@@ -32,7 +32,6 @@
 
 #include "core/input/input.h"
 #include "core/message_queue.h"
-#include "core/method_bind_ext.gen.inc"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
diff --git a/scene/main/node.h b/scene/main/node.h
index 2928466cd0..09943d0626 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -34,7 +34,6 @@
 #include "core/class_db.h"
 #include "core/map.h"
 #include "core/node_path.h"
-#include "core/object.h"
 #include "core/project_settings.h"
 #include "core/script_language.h"
 #include "core/typed_array.h"
diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp
index 7cc39f661d..b75657c2c2 100644
--- a/scene/resources/font.cpp
+++ b/scene/resources/font.cpp
@@ -31,7 +31,6 @@
 #include "font.h"
 
 #include "core/io/resource_loader.h"
-#include "core/method_bind_ext.gen.inc"
 #include "core/os/file_access.h"
 
 void Font::draw_halign(RID p_canvas_item, const Point2 &p_pos, HAlign p_align, float p_width, const String &p_text, const Color &p_modulate, const Color &p_outline_modulate) const {
diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp
index 1a2dcc84bb..ff14a5a292 100644
--- a/scene/resources/surface_tool.cpp
+++ b/scene/resources/surface_tool.cpp
@@ -30,8 +30,6 @@
 
 #include "surface_tool.h"
 
-#include "core/method_bind_ext.gen.inc"
-
 #define _VERTEX_SNAP 0.0001
 #define EQ_VERTEX_DIST 0.00001
 
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp
index 39237e1a33..6291d2dddb 100644
--- a/scene/resources/texture.cpp
+++ b/scene/resources/texture.cpp
@@ -32,7 +32,6 @@
 
 #include "core/core_string_names.h"
 #include "core/io/image_loader.h"
-#include "core/method_bind_ext.gen.inc"
 #include "core/os/os.h"
 #include "mesh.h"
 #include "scene/resources/bit_map.h"