1 files changed, 8 insertions, 8 deletions

diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index c96dd4ad35..0185a5f865 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -1505,7 +1505,7 @@ String Viewport::_gui_get_tooltip(Control *p_control, const Vector2 &p_pos, Cont
 		}
 
 		// If we found a tooltip, we stop here.
-		if (!tooltip.empty()) {
+		if (!tooltip.is_empty()) {
 			break;
 		}
 
@@ -1539,7 +1539,7 @@ void Viewport::_gui_show_tooltip() {
 			gui.tooltip_control->get_global_transform().xform_inv(gui.last_mouse_pos),
 			&tooltip_owner);
 	tooltip_text.strip_edges();
-	if (tooltip_text.empty()) {
+	if (tooltip_text.is_empty()) {
 		return; // Nothing to show.
 	}
 
@@ -1565,7 +1565,7 @@ void Viewport::_gui_show_tooltip() {
 		base_tooltip = gui.tooltip_label;
 	}
 
-	base_tooltip->set_anchors_and_margins_preset(Control::PRESET_WIDE);
+	base_tooltip->set_anchors_and_offsets_preset(Control::PRESET_WIDE);
 
 	TooltipPanel *panel = memnew(TooltipPanel);
 	panel->set_transient(false);
@@ -2392,19 +2392,19 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 			}
 
 			if (!mods && p_event->is_action_pressed("ui_up") && input->is_action_just_pressed("ui_up")) {
-				next = from->_get_focus_neighbor(MARGIN_TOP);
+				next = from->_get_focus_neighbor(SIDE_TOP);
 			}
 
 			if (!mods && p_event->is_action_pressed("ui_left") && input->is_action_just_pressed("ui_left")) {
-				next = from->_get_focus_neighbor(MARGIN_LEFT);
+				next = from->_get_focus_neighbor(SIDE_LEFT);
 			}
 
 			if (!mods && p_event->is_action_pressed("ui_right") && input->is_action_just_pressed("ui_right")) {
-				next = from->_get_focus_neighbor(MARGIN_RIGHT);
+				next = from->_get_focus_neighbor(SIDE_RIGHT);
 			}
 
 			if (!mods && p_event->is_action_pressed("ui_down") && input->is_action_just_pressed("ui_down")) {
-				next = from->_get_focus_neighbor(MARGIN_BOTTOM);
+				next = from->_get_focus_neighbor(SIDE_BOTTOM);
 			}
 
 			if (next) {
@@ -3139,7 +3139,7 @@ String Viewport::get_configuration_warning() const {
 	String warning = Node::get_configuration_warning();
 
 	if (size.x == 0 || size.y == 0) {
-		if (!warning.empty()) {
+		if (!warning.is_empty()) {
 			warning += "\n\n";
 		}
 		warning += TTR("Viewport size must be greater than 0 to render anything.");