diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-01 22:46:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-01 22:46:43 +0200 |
| commit | 4e6c89dbce4f15dba35dccd7bc071c10df77f19d (patch) | |
| tree | 67a199f50b56383bf538c2b2ed23c4be65b6909b | |
| parent | ab6028379841183c8005792f83d6da5cb389d323 (diff) | |
| parent | cf183efbcfab9bee12e0f905dc3c2e3f05d93b8e (diff) | |
Merge pull request #21672 from YeldhamDev/gui_input_ev_rename
Change some instances of args named "ev" to "event"
| -rw-r--r-- | core/os/main_loop.cpp | 4 | ||||
| -rw-r--r-- | scene/gui/control.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp index c51801e3e2..6dba77ec9a 100644 --- a/core/os/main_loop.cpp +++ b/core/os/main_loop.cpp @@ -33,14 +33,14 @@ void MainLoop::_bind_methods() { - ClassDB::bind_method(D_METHOD("input_event", "ev"), &MainLoop::input_event); + ClassDB::bind_method(D_METHOD("input_event", "event"), &MainLoop::input_event); ClassDB::bind_method(D_METHOD("input_text", "text"), &MainLoop::input_text); ClassDB::bind_method(D_METHOD("init"), &MainLoop::init); ClassDB::bind_method(D_METHOD("iteration", "delta"), &MainLoop::iteration); ClassDB::bind_method(D_METHOD("idle", "delta"), &MainLoop::idle); ClassDB::bind_method(D_METHOD("finish"), &MainLoop::finish); - BIND_VMETHOD(MethodInfo("_input_event", PropertyInfo(Variant::OBJECT, "ev", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); + BIND_VMETHOD(MethodInfo("_input_event", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); BIND_VMETHOD(MethodInfo("_input_text", PropertyInfo(Variant::STRING, "text"))); BIND_VMETHOD(MethodInfo("_initialize")); BIND_VMETHOD(MethodInfo("_iteration", PropertyInfo(Variant::REAL, "delta"))); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index e094a063be..fad91c29cf 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2956,7 +2956,7 @@ void Control::_bind_methods() { BIND_ENUM_CONSTANT(ANCHOR_END); ADD_SIGNAL(MethodInfo("resized")); - ADD_SIGNAL(MethodInfo("gui_input", PropertyInfo(Variant::OBJECT, "ev", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); + ADD_SIGNAL(MethodInfo("gui_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); ADD_SIGNAL(MethodInfo("mouse_entered")); ADD_SIGNAL(MethodInfo("mouse_exited")); ADD_SIGNAL(MethodInfo("focus_entered")); |