1 files changed, 6 insertions, 6 deletions

diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp
index ab86face7e..595f0cbea7 100644
--- a/scene/gui/base_button.cpp
+++ b/scene/gui/base_button.cpp
@@ -43,7 +43,7 @@ void BaseButton::_unpress_group() {
 		status.pressed = true;
 	}
 
-	for (Set<BaseButton *>::Element *E = button_group->buttons.front(); E; E = E->next()) {
+	for (RBSet<BaseButton *>::Element *E = button_group->buttons.front(); E; E = E->next()) {
 		if (E->get() == this) {
 			continue;
 		}
@@ -339,14 +339,14 @@ bool BaseButton::is_keep_pressed_outside() const {
 
 void BaseButton::set_shortcut(const Ref<Shortcut> &p_shortcut) {
 	shortcut = p_shortcut;
-	set_process_unhandled_key_input(shortcut.is_valid());
+	set_process_shortcut_input(shortcut.is_valid());
 }
 
 Ref<Shortcut> BaseButton::get_shortcut() const {
 	return shortcut;
 }
 
-void BaseButton::unhandled_key_input(const Ref<InputEvent> &p_event) {
+void BaseButton::shortcut_input(const Ref<InputEvent> &p_event) {
 	ERR_FAIL_COND(p_event.is_null());
 
 	if (!_is_focus_owner_in_shortcut_context()) {
@@ -485,14 +485,14 @@ BaseButton::~BaseButton() {
 }
 
 void ButtonGroup::get_buttons(List<BaseButton *> *r_buttons) {
-	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
+	for (RBSet<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
 		r_buttons->push_back(E->get());
 	}
 }
 
 Array ButtonGroup::_get_buttons() {
 	Array btns;
-	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
+	for (RBSet<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
 		btns.push_back(E->get());
 	}
 
@@ -500,7 +500,7 @@ Array ButtonGroup::_get_buttons() {
 }
 
 BaseButton *ButtonGroup::get_pressed_button() {
-	for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
+	for (RBSet<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) {
 		if (E->get()->is_pressed()) {
 			return E->get();
 		}