Fix warnings and errors

rsubtil · rsubtil · commit 76f242034343 · 2023-11-03T16:12:43.000Z
diff --git a/project.godot b/project.godot
@@ -37,7 +37,8 @@ TTS="*res://addons/godot-tts/TTS.gd"
 
 [debug]
 
-gdscript/warnings/native_method_override=1
+gdscript/warnings/static_called_on_instance=0
+gdscript/warnings/native_method_override=0
 
 [editor_plugins]
 
diff --git a/scenes/config/ConfigPopup.gd b/scenes/config/ConfigPopup.gd
@@ -18,7 +18,7 @@ signal popup_hide
 	%AboutTab
 ]
 
-var last_tab : Control = null
+var last_tab : Button = null
 var should_reload_theme := false
 
 func _ready():
@@ -44,6 +44,8 @@ func _input(event: InputEvent):
 			if not last_tab:
 				last_tab = n_game_tab
 			last_tab.grab_focus()
+			last_tab.set_pressed_no_signal(false)
+			_handle_buttons()
 
 func open_config():
 	super.popup_centered_ratio(0.8)
diff --git a/scenes/config/GameSettings.gd b/scenes/config/GameSettings.gd
@@ -53,7 +53,7 @@ func _on_discard_pressed():
 	_on_reset_state()
 
 
-func _on_editor_tab_changed(tab_container, enter_tab):
+func _on_editor_tab_changed(_tab_container, _enter_tab):
 	self.grab_focus()
 
 
diff --git a/scenes/config/NoThemeSettings.tscn b/scenes/config/NoThemeSettings.tscn
@@ -6,6 +6,7 @@
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+focus_mode = 2
 text = "The current theme doesn't have any
 custom configuration screen."
 horizontal_alignment = 1
diff --git a/scenes/config/settings/GeneralSettings.tscn b/scenes/config/settings/GeneralSettings.tscn
@@ -281,7 +281,6 @@ vertical_alignment = 1
 [connection signal="pressed" from="ScrollContainer/VBoxContainer/User/SetupWizardButton" to="." method="_on_SetupWizardButton_pressed"]
 [connection signal="item_selected" from="ScrollContainer/VBoxContainer/Graphics/HBoxContainer/GraphicsMode" to="." method="_on_GraphicsMode_item_selected"]
 [connection signal="toggled" from="ScrollContainer/VBoxContainer/Graphics/HBoxContainer2/VSync" to="." method="_on_VSync_toggled"]
-[connection signal="drag_ended" from="ScrollContainer/VBoxContainer/Graphics/HBoxContainer3/RenderRes" to="." method="_on_RenderRes_drag_ended"]
 [connection signal="value_changed" from="ScrollContainer/VBoxContainer/Graphics/HBoxContainer3/RenderRes" to="." method="_on_RenderRes_value_changed"]
 [connection signal="toggled" from="ScrollContainer/VBoxContainer/Accessibility/HBoxContainer/ScreenReader" to="." method="_on_ScreenReader_toggled"]
 [connection signal="confirmed" from="FirstTimeWizardWarning" to="." method="_on_FirstTimeWizardWarning_confirmed"]
diff --git a/scenes/popups/first_time/CompatibilityDetails.gd b/scenes/popups/first_time/CompatibilityDetails.gd
@@ -49,7 +49,7 @@ func set_icon(node: TextureRect, level: int):
 		RetroHubImporter.CompatibilityLevel.SUPPORTED:
 			node.texture = preload("res://assets/icons/success.svg")
 
-func tts_text(focused: Control) -> String:
+func tts_text(_focused: Control) -> String:
 	var text := ""
 	# Game Metadata
 	text += "Game Metadata: "
diff --git a/scenes/popups/first_time/GenericEmulatorInfo.gd b/scenes/popups/first_time/GenericEmulatorInfo.gd
@@ -10,8 +10,8 @@ var found := false
 func _ready():
 	n_accessibility_focus._on_config_ready(RetroHubConfig.config)
 
-func set_name(name: String):
-	n_name.text = name
+func set_name(_name: String):
+	n_name.text = _name
 
 func set_logo(texture: Texture2D):
 	n_logo.texture = texture
@@ -21,6 +21,6 @@ func set_found(_found: bool, details: String):
 	n_path_section.set_found(found, details)
 	modulate.a = 1.0 if found else 0.5
 
-func tts_text(focused: Control):
+func tts_text(_focused: Control):
 	return n_name.text + ": " + ("supported" if found else "not supported") + ". " \
 		+ n_path_section.tts_prompt()
diff --git a/scenes/popups/first_time/ImportSettingsSection.gd b/scenes/popups/first_time/ImportSettingsSection.gd
@@ -63,7 +63,7 @@ func set_importer_buttons():
 	if not_found:
 		n_import_options.add_item("No systems found")
 	else:
-		n_import_options.add_item("Don't import settings", idx + 1)
+		n_import_options.add_item("Don't import settings", idx)
 		n_import_options.emit_signal("item_selected", n_import_options.selected)
 
 func _on_ImportOptions_item_selected(_index):
diff --git a/scenes/popups/first_time/RetroArchEmulatorInfo.gd b/scenes/popups/first_time/RetroArchEmulatorInfo.gd
@@ -22,6 +22,6 @@ func set_core_found(_found: bool, details: String):
 	n_core_section.set_found(found, details)
 	modulate.a = 1.0 if found else 0.5
 
-func tts_text(focused: Control):
+func tts_text(_focused: Control):
 	return n_name.text + ": " + ("supported" if found else "not supported") + ". " \
 		+ n_path_section.tts_prompt() + ". " + n_core_section.tts_prompt()
diff --git a/scenes/popups/first_time/SystemTrees.gd b/scenes/popups/first_time/SystemTrees.gd
@@ -102,9 +102,9 @@ func _on_item_edited(edited: TreeItem):
 func is_edit_valid(item: TreeItem):
 	if item.get_metadata(0):
 		var system : Dictionary = item.get_metadata(0)
-		var name : String = system["name"]
-		if RetroHubConfig.systems.has(name):
-			return RetroHubConfig.systems[name].num_games == 0
+		var system_name : String = system["name"]
+		if RetroHubConfig.systems.has(system_name):
+			return RetroHubConfig.systems[system_name].num_games == 0
 	return true
 
 func save():
diff --git a/scenes/root/Root.gd b/scenes/root/Root.gd
@@ -69,7 +69,8 @@ func _on_config_updated(key: String, _old, new):
 
 func setup_controller_remap(remap_str: String):
 	if not remap_str.is_empty():
-		Input.remove_joy_mapping(Input.get_joy_guid(0))
+		if Input.is_joy_known(0):
+			Input.remove_joy_mapping(Input.get_joy_guid(0))
 		Input.add_joy_mapping(remap_str, true)
 
 func show_first_time_popup():
@@ -103,7 +104,7 @@ func _on_theme_unload():
 	print("Unloaded theme")
 	RetroHub._theme_processing_done = true
 
-func _on_game_loaded(game_data: RetroHubGameData):
+func _on_game_loaded(_game_data: RetroHubGameData):
 	var game_launched_child : PackedScene = load("res://scenes/game_launched/GameLaunched.tscn")
 	n_viewport.clear_theme()
 	n_viewport.set_theme(game_launched_child)
diff --git a/source/Media.gd b/source/Media.gd
@@ -139,7 +139,7 @@ func _find_video_path(path: String) -> String:
 			return full_path
 	return ""
 
-func _load_media(media: RetroHubGameMediaData, game_data: RetroHubGameData, types: Type):
+func _load_media(media: RetroHubGameMediaData, game_data: RetroHubGameData, types: int):
 	var media_path := RetroHubConfig._get_gamemedia_dir().path_join(game_data.system_path)
 	var game_path := _get_game_path(game_data)
 	
diff --git a/source/RetroHub.gd b/source/RetroHub.gd
@@ -28,6 +28,7 @@ var launched_game_data : RetroHubGameData = null
 var launched_emulator : Dictionary = {}
 
 var _is_echo := false
+@warning_ignore("unused_private_class_variable")
 var _is_input_remap_utility := false
 var _theme_processing_done := false
 
diff --git a/source/importers/RetroArchImporter.gd b/source/importers/RetroArchImporter.gd
@@ -121,16 +121,16 @@ func import_metadata():
 		for child in gamelists[system]:
 			process_metadata(system, child)
 
-func guess_system_name(name: String) -> String:
+func guess_system_name(system_name: String) -> String:
 	# RetroArch saves system information in the file name as full name.
 	# We have to try and match it to known entries
-	if "Nintendo - Nintendo 64" in name:
+	if "Nintendo - Nintendo 64" in system_name:
 		return "n64"
-	elif "Nintendo - Nintendo Entertainment System" in name:
+	elif "Nintendo - Nintendo Entertainment System" in system_name:
 		return "nes"
-	elif "Nintendo - Super Nintendo Entertainment System" in name:
+	elif "Nintendo - Super Nintendo Entertainment System" in system_name:
 		return "snes"
-	elif "Nintendo - GameCube" in name:
+	elif "Nintendo - GameCube" in system_name:
 		return "gc"
 	# TODO: More names
 	return ""
@@ -149,8 +149,8 @@ func process_lpl_file(path: String) -> Array:
 		if file:
 			while not file.eof_reached():
 				var file_path := file.get_line()
-				var name := file.get_line()
-				names.push_back({"name": name, "path": file_path})
+				var file_name := file.get_line()
+				names.push_back({"name": file_name, "path": file_path})
 				for _i in range(4):
 					file.get_line()
 			file.close()
diff --git a/source/utils/TabContainerHandler.gd b/source/utils/TabContainerHandler.gd
@@ -65,7 +65,7 @@ func is_key_event_on_text(event: InputEvent):
 		return (control is LineEdit or control is TextEdit) and control.editable
 	return false
 
-func _on_tab_clicked(tab_idx: int):
+func _on_tab_clicked(_tab_idx: int):
 	handle_focus(not _focused)
 
 func handle_focus(enter_tab: bool):
diff --git a/source/utils/UIAudio.gd b/source/utils/UIAudio.gd
@@ -2,16 +2,13 @@ extends Node
 
 @export var theme_viewport : NodePath
 
-var node : Node
-
 func _enter_tree():
 	process_mode = Node.PROCESS_MODE_ALWAYS
 	get_tree().node_added.connect(_on_node_added)
 
 func _on_node_added(node: Node):
 	if node is Window:
-		self.node = node
-		connect_signals()
+		connect_signals(node)
 	if node is Viewport:
 		(node as Viewport).gui_focus_changed.connect(gui_focus_changed)
 
@@ -32,44 +29,43 @@ func _basebutton_pressed():
 	RetroHubUI.play_sound(RetroHubUI.AudioKeys.ACTIVATED)
 
 
-func _checkbox_or_checkbutton_toggled(checked, node):
+func _checkbox_or_checkbutton_toggled(checked: bool, node: Button):
 	if node.has_focus():
 		RetroHubUI.play_sound(RetroHubUI.AudioKeys.CHECK_BUTTON_ON if checked else RetroHubUI.AudioKeys.CHECK_BUTTON_OFF)
 
-func popup_menu_item_id_focused(index, node):
+func popup_menu_item_id_focused(_index: int, _node: PopupMenu):
 	RetroHubUI.play_sound(RetroHubUI.AudioKeys.NAVIGATION)
 
-func popup_menu_item_id_pressed(index, node):
-	if node.is_item_checkable(index):
+func popup_menu_item_id_pressed(index: int, node: PopupMenu):
+	if node.is_item_checkable(index) and not node.is_item_radio_checkable(index):
 		if node.is_item_checked(index):
 			RetroHubUI.play_sound(RetroHubUI.AudioKeys.CHECK_BUTTON_ON)
 		else:
 			RetroHubUI.play_sound(RetroHubUI.AudioKeys.CHECK_BUTTON_OFF)
 	else:
 		RetroHubUI.play_sound(RetroHubUI.AudioKeys.ACTIVATED)
 
-func range_value_changed(value, node):
+func range_value_changed(_value, _node):
 	RetroHubUI.play_sound(RetroHubUI.AudioKeys.SLIDER_TICK)
 
-func _tree_item_or_cell_selected(node):
+func _tree_item_or_cell_selected(_node):
 	RetroHubUI.play_sound(RetroHubUI.AudioKeys.ACTIVATED)
 
-func tab_container_tab_changed(tab, node):
+func tab_container_tab_changed(_tab, _node):
 	await get_tree().process_frame
 	RetroHubUI.play_sound(RetroHubUI.AudioKeys.SLIDE)
 
-func tab_container_handler_changed(tab, enter_tab, node):
+func tab_container_handler_changed(_tab, enter_tab, _node):
 	if not enter_tab:
 		await get_tree().process_frame
 		RetroHubUI.play_sound(RetroHubUI.AudioKeys.SLIDE)
 
-func gui_focus_changed(_node):
-	node = _node
-	connect_signals()
+func gui_focus_changed(node: Control):
+	connect_signals(node)
 	if not node.is_in_group("rh_no_sound"):
 		RetroHubUI.play_sound(RetroHubUI.AudioKeys.NAVIGATION, false)
 
-func connect_signals():
+func connect_signals(node: Node):
 	if node.is_in_group("rh_no_sound") or node.is_in_group("rh_sound_connected"):
 		return
 	# Re-use group to mark nodes with connected signals already
@@ -79,8 +75,8 @@ func connect_signals():
 	elif node is BaseButton:
 		node.pressed.connect(_basebutton_pressed)
 	elif node is PopupMenu:
-		var callable = func(node):
-			popup_menu_item_id_focused(node.get_focused_item(), node)
+		var callable = func(n):
+			popup_menu_item_id_focused(n.get_focused_item(), n)
 
 		node.about_to_popup.connect(callable.bind(node))
 		node.id_focused.connect(popup_menu_item_id_focused.bind(node))
