From 3f6529fecbacdf90aa556ae0fd39b478ae28c27f Mon Sep 17 00:00:00 2001 From: oltolm Date: Mon, 1 Dec 2025 22:22:29 +0100 Subject: [PATCH] UI: remove unnecessary QOverloads --- rpcs3/rpcs3qt/camera_settings_dialog.cpp | 4 ++-- rpcs3/rpcs3qt/debugger_frame.cpp | 6 ++--- rpcs3/rpcs3qt/dimensions_dialog.cpp | 4 ++-- rpcs3/rpcs3qt/emu_settings.cpp | 2 +- .../rpcs3qt/emulated_pad_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/game_list_frame.cpp | 8 +++---- rpcs3/rpcs3qt/infinity_dialog.cpp | 8 +++---- rpcs3/rpcs3qt/kamen_rider_dialog.cpp | 4 ++-- rpcs3/rpcs3qt/memory_viewer_panel.cpp | 6 ++--- rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp | 4 ++-- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 6 ++--- rpcs3/rpcs3qt/patch_creator_dialog.cpp | 2 +- rpcs3/rpcs3qt/patch_manager_dialog.cpp | 4 ++-- rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/rpcn_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/settings_dialog.cpp | 22 +++++++++---------- rpcs3/rpcs3qt/skylander_dialog.cpp | 4 ++-- 17 files changed, 45 insertions(+), 45 deletions(-) diff --git a/rpcs3/rpcs3qt/camera_settings_dialog.cpp b/rpcs3/rpcs3qt/camera_settings_dialog.cpp index 0cc5843595..da3576183a 100644 --- a/rpcs3/rpcs3qt/camera_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/camera_settings_dialog.cpp @@ -70,8 +70,8 @@ camera_settings_dialog::camera_settings_dialog(QWidget* parent) camera_log.notice("Found camera: '%s'", camera_info.description()); } - connect(ui->combo_camera, QOverload::of(&QComboBox::currentIndexChanged), this, &camera_settings_dialog::handle_camera_change); - connect(ui->combo_settings, QOverload::of(&QComboBox::currentIndexChanged), this, &camera_settings_dialog::handle_settings_change); + connect(ui->combo_camera, &QComboBox::currentIndexChanged, this, &camera_settings_dialog::handle_camera_change); + connect(ui->combo_settings, &QComboBox::currentIndexChanged, this, &camera_settings_dialog::handle_settings_change); connect(ui->buttonBox, &QDialogButtonBox::clicked, [this](QAbstractButton* button) { if (button == ui->buttonBox->button(QDialogButtonBox::Save)) diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index 8eb4bce3fa..7ffe1b32a2 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -126,7 +126,7 @@ debugger_frame::debugger_frame(std::shared_ptr gui_settings, QWidg m_regs->setLineWrapMode(QPlainTextEdit::NoWrap); m_regs->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); m_regs->setContextMenuPolicy(Qt::CustomContextMenu); - + m_debugger_list->setFont(m_mono); m_misc_state->setFont(m_mono); m_regs->setFont(m_mono); @@ -180,7 +180,7 @@ debugger_frame::debugger_frame(std::shared_ptr gui_settings, QWidg m_choice_units->clearFocus(); }); - connect(m_choice_units, QOverload::of(&QComboBox::currentIndexChanged), this, [&](){ m_is_spu_disasm_mode = false; OnSelectUnit(); }); + connect(m_choice_units, &QComboBox::currentIndexChanged, this, [&](){ m_is_spu_disasm_mode = false; OnSelectUnit(); }); connect(this, &QDockWidget::visibilityChanged, this, &debugger_frame::EnableUpdateTimer); connect(m_debugger_list, &debugger_list::BreakpointRequested, m_breakpoint_list, &breakpoint_list::HandleBreakpointRequest); @@ -1082,7 +1082,7 @@ void debugger_frame::UpdateUnitList() if (reselected_index != umax) { - // Include no-thread at index 0 + // Include no-thread at index 0 m_choice_units->setCurrentIndex(::narrow(reselected_index + 1)); } } diff --git a/rpcs3/rpcs3qt/dimensions_dialog.cpp b/rpcs3/rpcs3qt/dimensions_dialog.cpp index a6eb07018e..4ea4c7dc19 100644 --- a/rpcs3/rpcs3qt/dimensions_dialog.cpp +++ b/rpcs3/rpcs3qt/dimensions_dialog.cpp @@ -433,7 +433,7 @@ minifig_creator_dialog::minifig_creator_dialog(QWidget* parent) setLayout(vbox_panel); - connect(combo_figlist, QOverload::of(&QComboBox::currentIndexChanged), [=](int index) + connect(combo_figlist, &QComboBox::currentIndexChanged, [=](int index) { const u16 fig_info = combo_figlist->itemData(index).toUInt(); if (fig_info != 0xFFFF) @@ -486,7 +486,7 @@ minifig_creator_dialog::minifig_creator_dialog(QWidget* parent) connect(btn_cancel, &QAbstractButton::clicked, this, &QDialog::reject); - connect(co_compl, QOverload::of(&QCompleter::activated), [=](const QString& text) + connect(co_compl, qOverload(&QCompleter::activated), [=](const QString& text) { combo_figlist->setCurrentIndex(combo_figlist->findText(text)); }); diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index 37692423a3..769c843a66 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -375,7 +375,7 @@ void emu_settings::EnhanceComboBox(QComboBox* combobox, emu_settings_type type, combobox->setCurrentIndex(index); - connect(combobox, QOverload::of(&QComboBox::currentIndexChanged), combobox, [this, is_ranged, combobox, type](int index) + connect(combobox, &QComboBox::currentIndexChanged, combobox, [this, is_ranged, combobox, type](int index) { if (index < 0) return; diff --git a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp b/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp index aee4c44c77..c0abb6e5e1 100644 --- a/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/emulated_pad_settings_dialog.cpp @@ -302,7 +302,7 @@ void emulated_pad_settings_dialog::add_tabs(QTabWidget* tabs) combo->setCurrentIndex(combo->findData(static_cast(saved_btn_id))); - connect(combo, QOverload::of(&QComboBox::currentIndexChanged), this, [this, player, id, combo](int index) + connect(combo, &QComboBox::currentIndexChanged, this, [this, player, id, combo](int index) { if (index < 0 || !combo) return; diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 7bf27c4695..f68bc44896 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -185,13 +185,13 @@ game_list_frame::game_list_frame(std::shared_ptr gui_settings, std connect(m_game_list, &QTableWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu); connect(m_game_list, &QTableWidget::itemSelectionChanged, this, &game_list_frame::ItemSelectionChangedSlot); - connect(m_game_list, &QTableWidget::itemDoubleClicked, this, QOverload::of(&game_list_frame::doubleClickedSlot)); + connect(m_game_list, &QTableWidget::itemDoubleClicked, this, qOverload(&game_list_frame::doubleClickedSlot)); connect(m_game_list->horizontalHeader(), &QHeaderView::sectionClicked, this, &game_list_frame::OnColClicked); connect(m_game_grid, &QWidget::customContextMenuRequested, this, &game_list_frame::ShowContextMenu); connect(m_game_grid, &game_list_grid::ItemSelectionChanged, this, &game_list_frame::NotifyGameSelection); - connect(m_game_grid, &game_list_grid::ItemDoubleClicked, this, QOverload::of(&game_list_frame::doubleClickedSlot)); + connect(m_game_grid, &game_list_grid::ItemDoubleClicked, this, qOverload(&game_list_frame::doubleClickedSlot)); connect(m_game_compat, &game_compatibility::DownloadStarted, this, [this]() { @@ -1383,7 +1383,7 @@ void game_list_frame::ShowContextMenu(const QPoint& pos) const std::string hdd1_cache_base_dir = rpcs3::utils::get_hdd1_dir() + "caches/"; const bool has_hdd1_cache_dir = !GetDirListBySerial(hdd1_cache_base_dir, current_game.serial).empty(); - + if (has_hdd1_cache_dir) { QAction* remove_hdd1_cache = remove_menu->addAction(tr("&Remove HDD1 Cache")); @@ -1856,7 +1856,7 @@ void game_list_frame::ShowContextMenu(const QPoint& pos) { text += tr("\nCurrent free disk space: %0\n").arg(gui::utils::format_byte_size(stat.avail_free)); } - + if (has_data_dir) { text += tr("\nPermanently remove %0 and selected (optional) contents from drive?\n").arg(is_disc_game ? tr("Game Data") : gameinfo->localized_category); diff --git a/rpcs3/rpcs3qt/infinity_dialog.cpp b/rpcs3/rpcs3qt/infinity_dialog.cpp index 223a753c15..7aa00e5819 100644 --- a/rpcs3/rpcs3qt/infinity_dialog.cpp +++ b/rpcs3/rpcs3qt/infinity_dialog.cpp @@ -448,7 +448,7 @@ figure_creator_dialog::figure_creator_dialog(QWidget* parent, u8 slot) for (const auto& [figure, entry] : list_figures) { const auto& [num, figure_name] = entry; - + // Apply series filter (0 = all, 1-3 = specific series) if (series_filter != 0 && num != series_filter) continue; @@ -486,7 +486,7 @@ figure_creator_dialog::figure_creator_dialog(QWidget* parent, u8 slot) co_compl->setFilterMode(Qt::MatchContains); combo_figlist->setCompleter(co_compl); - connect(co_compl, QOverload::of(&QCompleter::activated), [=](const QString& text) + connect(co_compl, qOverload(&QCompleter::activated), [=](const QString& text) { combo_figlist->setCurrentIndex(combo_figlist->findText(text)); }); @@ -536,12 +536,12 @@ figure_creator_dialog::figure_creator_dialog(QWidget* parent, u8 slot) filter_group->addButton(btn_series2, 2); // ID 2 for series 2 filter_group->addButton(btn_series3, 3); // ID 3 for series 3 - connect(filter_group, QOverload::of(&QButtonGroup::idClicked), [=](int id) + connect(filter_group, &QButtonGroup::idClicked, [=](int id) { populate_combo(id); }); - connect(combo_figlist, QOverload::of(&QComboBox::currentIndexChanged), [=](int index) + connect(combo_figlist, &QComboBox::currentIndexChanged, [=](int index) { const u32 fig_info = combo_figlist->itemData(index).toUInt(); if (fig_info != 0xFFFFFFFF) diff --git a/rpcs3/rpcs3qt/kamen_rider_dialog.cpp b/rpcs3/rpcs3qt/kamen_rider_dialog.cpp index 71a8bd3f88..61932f4cd1 100644 --- a/rpcs3/rpcs3qt/kamen_rider_dialog.cpp +++ b/rpcs3/rpcs3qt/kamen_rider_dialog.cpp @@ -160,7 +160,7 @@ kamen_rider_creator_dialog::kamen_rider_creator_dialog(QWidget* parent) setLayout(vbox_panel); - connect(combo_figlist, QOverload::of(&QComboBox::currentIndexChanged), [=](int index) + connect(combo_figlist, &QComboBox::currentIndexChanged, [=](int index) { const u16 fig_info = combo_figlist->itemData(index).toUInt(); if (fig_info != 0xFFFF) @@ -243,7 +243,7 @@ kamen_rider_creator_dialog::kamen_rider_creator_dialog(QWidget* parent) connect(btn_cancel, &QAbstractButton::clicked, this, &QDialog::reject); - connect(co_compl, QOverload::of(&QCompleter::activated), [=](const QString& text) + connect(co_compl, qOverload(&QCompleter::activated), [=](const QString& text) { combo_figlist->setCurrentText(text); combo_figlist->setCurrentIndex(combo_figlist->findText(text)); diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp index 2a8b6c29b1..bcaa6537ef 100644 --- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp +++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp @@ -290,7 +290,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr(u8"Ʌ"), group_search); button_collapse_viewer->setFixedWidth(QLabel(button_collapse_viewer->text()).sizeHint().width() * 3); button_collapse_viewer->setAutoDefault(false); - + m_search_line = new QLineEdit(group_search); m_search_line->setFixedWidth(QLabel(QString("This is the very length of the lineedit due to hidpi reasons.").chopped(4)).sizeHint().width()); m_search_line->setPlaceholderText(tr("Search...")); @@ -328,7 +328,7 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr::of(&QComboBox::currentIndexChanged), group_search, [this, button_search](int index) + connect(m_cbox_input_mode, &QComboBox::currentIndexChanged, group_search, [this, button_search](int index) { if (index < 1 || m_rsx) { @@ -1305,7 +1305,7 @@ void memory_viewer_panel::ShowAtPC(u32 pc, std::function func) if (!panel->isVisible()) panel->show(); - + panel->raise(); return; diff --git a/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp index 0899096c95..13ee4bc092 100644 --- a/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_motion_settings_dialog.cpp @@ -70,7 +70,7 @@ pad_motion_settings_dialog::pad_motion_settings_dialog(QDialog* parent, std::sha } } - connect(ui->cb_choose_device, QOverload::of(&QComboBox::currentIndexChanged), this, &pad_motion_settings_dialog::change_device); + connect(ui->cb_choose_device, &QComboBox::currentIndexChanged, this, &pad_motion_settings_dialog::change_device); // Combobox: Configure Axis m_motion_axis_list = m_handler->get_motion_axis_list(); @@ -111,7 +111,7 @@ pad_motion_settings_dialog::pad_motion_settings_dialog(QDialog* parent, std::sha m_config_entries[i]->shift.set(value); }); - connect(m_axis_names[i], QOverload::of(&QComboBox::currentIndexChanged), this, [this, i](int index) + connect(m_axis_names[i], &QComboBox::currentIndexChanged, this, [this, i](int index) { std::lock_guard lock(m_config_mutex); if (!m_config_entries[i]->axis.from_string(m_axis_names[i]->itemText(index).toStdString())) diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index 8075577b95..36ece3b0ec 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -124,7 +124,7 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr gui_setti connect(ui->chooseHandler, &QComboBox::currentTextChanged, this, &pad_settings_dialog::ChangeHandler); // Combobox: Devices - connect(ui->chooseDevice, QOverload::of(&QComboBox::currentIndexChanged), this, &pad_settings_dialog::ChangeDevice); + connect(ui->chooseDevice, &QComboBox::currentIndexChanged, this, &pad_settings_dialog::ChangeDevice); // Combobox: Configs connect(ui->chooseConfig, &QComboBox::currentTextChanged, this, &pad_settings_dialog::ChangeConfig); @@ -179,7 +179,7 @@ pad_settings_dialog::pad_settings_dialog(std::shared_ptr gui_setti ui->chooseClass->addItem(tr("Copilot for Player 6"), u32{CELL_PAD_FAKE_TYPE_COPILOT_6}); ui->chooseClass->addItem(tr("Copilot for Player 7"), u32{CELL_PAD_FAKE_TYPE_COPILOT_7}); - connect(ui->chooseClass, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) + connect(ui->chooseClass, &QComboBox::currentIndexChanged, this, [this](int index) { if (index < 0) return; HandleDeviceClassChange(ui->chooseClass->currentData().toUInt()); @@ -2196,7 +2196,7 @@ void pad_settings_dialog::SubscribeTooltips() SubscribeTooltip(ui->gb_mouse_accel, tooltips.gamepad_settings.mouse_acceleration); SubscribeTooltip(ui->gb_mouse_dz, tooltips.gamepad_settings.mouse_deadzones); SubscribeTooltip(ui->gb_mouse_movement, tooltips.gamepad_settings.mouse_movement); - + for (int i = button_ids::id_pad_begin + 1; i < button_ids::id_pad_end; i++) { SubscribeTooltip(m_pad_buttons->button(i), tooltips.gamepad_settings.button_assignment); diff --git a/rpcs3/rpcs3qt/patch_creator_dialog.cpp b/rpcs3/rpcs3qt/patch_creator_dialog.cpp index b94fd65421..539a2e0f82 100644 --- a/rpcs3/rpcs3qt/patch_creator_dialog.cpp +++ b/rpcs3/rpcs3qt/patch_creator_dialog.cpp @@ -72,7 +72,7 @@ patch_creator_dialog::patch_creator_dialog(QWidget* parent) connect(ui->addPatchButton, &QAbstractButton::clicked, this, [this]() { add_instruction(ui->instructionTable->rowCount()); }); init_patch_type_bombo_box(ui->addPatchTypeComboBox, patch_type::be32, false); - connect(ui->addPatchTypeComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index){ update_validator(index, ui->addPatchTypeComboBox, ui->addPatchOffsetEdit); }); + connect(ui->addPatchTypeComboBox, &QComboBox::currentIndexChanged, this, [this](int index){ update_validator(index, ui->addPatchTypeComboBox, ui->addPatchOffsetEdit); }); update_validator(ui->addPatchTypeComboBox->currentIndex(), ui->addPatchTypeComboBox, ui->addPatchOffsetEdit); generate_yml(); diff --git a/rpcs3/rpcs3qt/patch_manager_dialog.cpp b/rpcs3/rpcs3qt/patch_manager_dialog.cpp index 0df58fb35e..04c8906e9b 100644 --- a/rpcs3/rpcs3qt/patch_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/patch_manager_dialog.cpp @@ -107,7 +107,7 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr gui_set connect(ui->patch_tree, &QTreeWidget::itemChanged, this, &patch_manager_dialog::handle_item_changed); connect(ui->patch_tree, &QTreeWidget::customContextMenuRequested, this, &patch_manager_dialog::handle_custom_context_menu_requested); connect(ui->cb_owned_games_only, &QCheckBox::checkStateChanged, this, &patch_manager_dialog::handle_show_owned_games_only); - connect(ui->configurable_selector, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) + connect(ui->configurable_selector, &QComboBox::currentIndexChanged, this, [this](int index) { if (index >= 0) { @@ -116,7 +116,7 @@ patch_manager_dialog::patch_manager_dialog(std::shared_ptr gui_set handle_item_selected(item, item); } }); - connect(ui->configurable_combo_box, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) + connect(ui->configurable_combo_box, &QComboBox::currentIndexChanged, this, [this](int index) { if (index >= 0) { diff --git a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp index 57b4f70d02..c64391c021 100644 --- a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp @@ -225,7 +225,7 @@ void raw_mouse_settings_dialog::add_tabs(QTabWidget* tabs) update_combo_box(player); - connect(combo, QOverload::of(&QComboBox::currentIndexChanged), this, [this, player, combo](int index) + connect(combo, &QComboBox::currentIndexChanged, this, [this, player, combo](int index) { if (index < 0 || !combo) return; diff --git a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp index 7cc819521a..74d5b14e6a 100644 --- a/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/rpcn_settings_dialog.cpp @@ -196,7 +196,7 @@ rpcn_account_dialog::rpcn_account_dialog(QWidget* parent) setLayout(vbox_global); - connect(cbx_servers, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) + connect(cbx_servers, &QComboBox::currentIndexChanged, this, [this](int index) { if (index < 0) return; diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 2e3964bbe7..902da72cff 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -553,7 +553,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std reset_zcull_options(); connect(this, &settings_dialog::signal_restore_dependant_defaults, this, reset_zcull_options); - connect(ui->zcullPrecisionMode, QOverload::of(&QComboBox::currentIndexChanged), [this](int index) + connect(ui->zcullPrecisionMode, &QComboBox::currentIndexChanged, [this](int index) { if (index < 0) return; @@ -589,7 +589,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std ui->stereoRenderMode->setEnabled(stereo_allowed && stereo_enabled); ui->stereoRenderEnabled->setEnabled(stereo_allowed); }; - connect(ui->resBox, QOverload::of(&QComboBox::currentIndexChanged), this, [enable_3D_modes](int){ enable_3D_modes(); }); + connect(ui->resBox, &QComboBox::currentIndexChanged, this, [enable_3D_modes](int){ enable_3D_modes(); }); connect(ui->stereoRenderEnabled, &QCheckBox::checkStateChanged, this, [enable_3D_modes](Qt::CheckState){ enable_3D_modes(); }); enable_3D_modes(); } @@ -872,7 +872,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std apply_fsr_specific_options(); connect(ui->renderBox, &QComboBox::currentTextChanged, apply_renderer_specific_options); connect(ui->renderBox, &QComboBox::currentTextChanged, this, apply_fsr_specific_options); - connect(ui->outputScalingMode, QOverload::of(&QComboBox::currentIndexChanged), this, apply_fsr_specific_options); + connect(ui->outputScalingMode, &QComboBox::currentIndexChanged, this, apply_fsr_specific_options); // _ _ _______ _ // /\ | (_) |__ __| | | @@ -997,7 +997,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std #else SubscribeTooltip(ui->gb_audio_out, tooltips.settings.audio_out_linux); #endif - connect(ui->audioOutBox, QOverload::of(&QComboBox::currentIndexChanged), this, [change_audio_output_device, get_audio_output_devices](int) + connect(ui->audioOutBox, &QComboBox::currentIndexChanged, this, [change_audio_output_device, get_audio_output_devices](int) { get_audio_output_devices(false); change_audio_output_device(0); // Set device to 'Default' @@ -1006,7 +1006,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceComboBox(ui->combo_audio_channel_layout, emu_settings_type::AudioChannelLayout); SubscribeTooltip(ui->gb_audio_channel_layout, tooltips.settings.audio_channel_layout); - connect(ui->combo_audio_format, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) + connect(ui->combo_audio_format, &QComboBox::currentIndexChanged, this, [this](int index) { const auto [text, value] = get_data(ui->combo_audio_format, index); ui->list_audio_formats->setEnabled(static_cast(value) == audio_format::manual); @@ -1071,7 +1071,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std SubscribeTooltip(ui->gb_audio_avport, tooltips.settings.audio_avport); SubscribeTooltip(ui->gb_audio_device, tooltips.settings.audio_device); - connect(ui->audioDeviceBox, QOverload::of(&QComboBox::currentIndexChanged), this, change_audio_output_device); + connect(ui->audioDeviceBox, &QComboBox::currentIndexChanged, this, change_audio_output_device); connect(this, &settings_dialog::signal_restore_dependant_defaults, this, [change_audio_output_device]() { change_audio_output_device(0); }); // Set device to 'Default' get_audio_output_devices(); @@ -1111,7 +1111,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std m_emu_settings->EnhanceComboBox(ui->microphoneBox, emu_settings_type::MicrophoneType); SubscribeTooltip(ui->microphoneBox, tooltips.settings.microphone); - connect(ui->microphoneBox, QOverload::of(&QComboBox::currentIndexChanged), change_microphone_type); + connect(ui->microphoneBox, &QComboBox::currentIndexChanged, change_microphone_type); propagate_used_devices(); // Enables/Disables comboboxes and checks values from config for sanity // Checkboxes @@ -1184,7 +1184,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std cfg_log.error("The selected camera was not found. Selecting default camera as fallback."); ui->cameraIdBox->setCurrentIndex(ui->cameraIdBox->findData(QString::fromStdString(default_camera))); } - connect(ui->cameraIdBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) + connect(ui->cameraIdBox, &QComboBox::currentIndexChanged, this, [this](int index) { if (index >= 0) m_emu_settings->SetSetting(emu_settings_type::CameraID, ui->cameraIdBox->itemData(index).toString().toStdString()); }); @@ -1424,7 +1424,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std // Comboboxes - connect(ui->netStatusBox, QOverload::of(&QComboBox::currentIndexChanged), [this](int index) + connect(ui->netStatusBox, &QComboBox::currentIndexChanged, [this](int index) { if (index < 0) return; const auto [text, value] = get_data(ui->netStatusBox, index); @@ -1448,7 +1448,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std SubscribeTooltip(ui->gb_psnStatusBox, tooltips.settings.psn_status); settings_dialog::refresh_countrybox(); - connect(ui->psnCountryBox, QOverload::of(&QComboBox::currentIndexChanged), this, [this](int index) + connect(ui->psnCountryBox, &QComboBox::currentIndexChanged, this, [this](int index) { if (index < 0) return; @@ -2277,7 +2277,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std ui->combo_updates->addItem(tr("Automatic", "Updates"), gui::update_auto); ui->combo_updates->addItem(tr("No", "Updates"), gui::update_off); ui->combo_updates->setCurrentIndex(ui->combo_updates->findData(m_gui_settings->GetValue(gui::m_check_upd_start).toString())); - connect(ui->combo_updates, QOverload::of(&QComboBox::currentIndexChanged), [this](int index) + connect(ui->combo_updates, &QComboBox::currentIndexChanged, [this](int index) { if (index >= 0) m_gui_settings->SetValue(gui::m_check_upd_start, ui->combo_updates->itemData(index)); }); diff --git a/rpcs3/rpcs3qt/skylander_dialog.cpp b/rpcs3/rpcs3qt/skylander_dialog.cpp index 86dfb61464..6623d27f03 100644 --- a/rpcs3/rpcs3qt/skylander_dialog.cpp +++ b/rpcs3/rpcs3qt/skylander_dialog.cpp @@ -586,7 +586,7 @@ skylander_creator_dialog::skylander_creator_dialog(QWidget* parent) setLayout(vbox_panel); - connect(combo_skylist, QOverload::of(&QComboBox::currentIndexChanged), [=](int index) + connect(combo_skylist, &QComboBox::currentIndexChanged, [=](int index) { const u32 sky_info = combo_skylist->itemData(index).toUInt(); if (sky_info != 0xFFFFFFFF) @@ -663,7 +663,7 @@ skylander_creator_dialog::skylander_creator_dialog(QWidget* parent) connect(btn_cancel, &QAbstractButton::clicked, this, &QDialog::reject); - connect(co_compl, QOverload::of(&QCompleter::activated),[=](const QString& text) + connect(co_compl, qOverload(&QCompleter::activated), [=](const QString& text) { combo_skylist->setCurrentText(text); combo_skylist->setCurrentIndex(combo_skylist->findText(text));