1 files changed, 14 insertions, 14 deletions

diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp
index cc77c8fcd5..48f637fcfe 100644
--- a/platform/javascript/display_server_javascript.cpp
+++ b/platform/javascript/display_server_javascript.cpp
@@ -83,7 +83,7 @@ void DisplayServerJavaScript::drop_files_js_callback(char **p_filev, int p_filec
 	Variant *vp = &v;
 	Variant ret;
 	Callable::CallError ce;
-	ds->drop_files_callback.call((const Variant **)&vp, 1, ret, ce);
+	ds->drop_files_callback.callp((const Variant **)&vp, 1, ret, ce);
 }
 
 // JavaScript quit request callback.
@@ -94,7 +94,7 @@ void DisplayServerJavaScript::request_quit_callback() {
 		Variant *eventp = &event;
 		Variant ret;
 		Callable::CallError ce;
-		ds->window_event_callback.call((const Variant **)&eventp, 1, ret, ce);
+		ds->window_event_callback.callp((const Variant **)&eventp, 1, ret, ce);
 	}
 }
 
@@ -236,7 +236,7 @@ void DisplayServerJavaScript::mouse_move_callback(double p_x, double p_y, double
 const char *DisplayServerJavaScript::godot2dom_cursor(DisplayServer::CursorShape p_shape) {
 	switch (p_shape) {
 		case DisplayServer::CURSOR_ARROW:
-			return "auto";
+			return "default";
 		case DisplayServer::CURSOR_IBEAM:
 			return "text";
 		case DisplayServer::CURSOR_POINTING_HAND:
@@ -244,9 +244,9 @@ const char *DisplayServerJavaScript::godot2dom_cursor(DisplayServer::CursorShape
 		case DisplayServer::CURSOR_CROSS:
 			return "crosshair";
 		case DisplayServer::CURSOR_WAIT:
-			return "progress";
-		case DisplayServer::CURSOR_BUSY:
 			return "wait";
+		case DisplayServer::CURSOR_BUSY:
+			return "progress";
 		case DisplayServer::CURSOR_DRAG:
 			return "grab";
 		case DisplayServer::CURSOR_CAN_DROP:
@@ -270,7 +270,7 @@ const char *DisplayServerJavaScript::godot2dom_cursor(DisplayServer::CursorShape
 		case DisplayServer::CURSOR_HELP:
 			return "help";
 		default:
-			return "auto";
+			return "default";
 	}
 }
 
@@ -326,8 +326,8 @@ void DisplayServerJavaScript::tts_resume() {
 }
 
 void DisplayServerJavaScript::tts_stop() {
-	for (Map<int, CharString>::Element *E = utterance_ids.front(); E; E = E->next()) {
-		tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E->key());
+	for (const KeyValue<int, CharString> &E : utterance_ids) {
+		tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E.key);
 	}
 	utterance_ids.clear();
 	godot_js_tts_stop();
@@ -371,7 +371,7 @@ DisplayServer::CursorShape DisplayServerJavaScript::cursor_get_shape() const {
 	return cursor_shape;
 }
 
-void DisplayServerJavaScript::cursor_set_custom_image(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
+void DisplayServerJavaScript::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
 	if (p_cursor.is_valid()) {
 		Ref<Texture2D> texture = p_cursor;
 		Ref<AtlasTexture> atlas_texture = p_cursor;
@@ -586,7 +586,7 @@ void DisplayServerJavaScript::vk_input_text_callback(const char *p_text, int p_c
 	Variant *eventp = &event;
 	Variant ret;
 	Callable::CallError ce;
-	ds->input_text_callback.call((const Variant **)&eventp, 1, ret, ce);
+	ds->input_text_callback.callp((const Variant **)&eventp, 1, ret, ce);
 	// Insert key right to reach position.
 	Input *input = Input::get_singleton();
 	Ref<InputEventKey> k;
@@ -604,8 +604,8 @@ void DisplayServerJavaScript::vk_input_text_callback(const char *p_text, int p_c
 	}
 }
 
-void DisplayServerJavaScript::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, bool p_multiline, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
-	godot_js_display_vk_show(p_existing_text.utf8().get_data(), p_multiline, p_cursor_start, p_cursor_end);
+void DisplayServerJavaScript::virtual_keyboard_show(const String &p_existing_text, const Rect2 &p_screen_rect, VirtualKeyboardType p_type, int p_max_input_length, int p_cursor_start, int p_cursor_end) {
+	godot_js_display_vk_show(p_existing_text.utf8().get_data(), p_type, p_cursor_start, p_cursor_end);
 }
 
 void DisplayServerJavaScript::virtual_keyboard_hide() {
@@ -691,7 +691,7 @@ void DisplayServerJavaScript::send_window_event_callback(int p_notification) {
 		Variant *eventp = &event;
 		Variant ret;
 		Callable::CallError ce;
-		ds->window_event_callback.call((const Variant **)&eventp, 1, ret, ce);
+		ds->window_event_callback.callp((const Variant **)&eventp, 1, ret, ce);
 	}
 }
 
@@ -734,7 +734,7 @@ void DisplayServerJavaScript::_dispatch_input_event(const Ref<InputEvent> &p_eve
 		Variant *evp = &ev;
 		Variant ret;
 		Callable::CallError ce;
-		cb.call((const Variant **)&evp, 1, ret, ce);
+		cb.callp((const Variant **)&evp, 1, ret, ce);
 	}
 }