From 1791876eda617a9b3b0af44977996debed0e40ff Mon Sep 17 00:00:00 2001 From: oltolm Date: Fri, 27 Mar 2026 17:21:41 +0100 Subject: [PATCH] remove unused lambda captures --- rpcs3/headless_application.cpp | 2 +- rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/clans_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/emu_settings.cpp | 2 +- rpcs3/rpcs3qt/game_list_actions.cpp | 2 +- rpcs3/rpcs3qt/game_list_grid.cpp | 2 +- rpcs3/rpcs3qt/game_list_table.cpp | 2 +- rpcs3/rpcs3qt/gs_frame.cpp | 2 +- rpcs3/rpcs3qt/gui_application.cpp | 8 ++++---- rpcs3/rpcs3qt/kernel_explorer.cpp | 4 ++-- rpcs3/rpcs3qt/main_window.cpp | 8 ++++---- rpcs3/rpcs3qt/savestate_manager_dialog.cpp | 2 +- rpcs3/rpcs3qt/settings_dialog.cpp | 4 ++-- rpcs3/rpcs3qt/sound_effect_manager_dialog.cpp | 2 +- rpcs3/rpcs3qt/trophy_manager_dialog.cpp | 12 ++++++------ rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/rpcs3/headless_application.cpp b/rpcs3/headless_application.cpp index 135a61c491..5d9240254d 100644 --- a/rpcs3/headless_application.cpp +++ b/rpcs3/headless_application.cpp @@ -49,7 +49,7 @@ void headless_application::InitializeCallbacks() { EmuCallbacks callbacks = CreateCallbacks(); - callbacks.try_to_quit = [this](bool force_quit, std::function on_exit) -> bool + callbacks.try_to_quit = [](bool force_quit, std::function on_exit) -> bool { if (force_quit) { diff --git a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp index 26cbfc96b7..4eaadb9e7e 100644 --- a/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp @@ -181,7 +181,7 @@ void auto_pause_settings_dialog::ShowContextMenu(const QPoint &pos) OnEntryConfig(idx, true); }); connect(remove, &QAction::triggered, this, &auto_pause_settings_dialog::OnRemove); - connect(config, &QAction::triggered, this, [=, this]() {OnEntryConfig(row, false); }); + connect(config, &QAction::triggered, this, [=]() {OnEntryConfig(row, false); }); myMenu.exec(m_pause_list->viewport()->mapToGlobal(pos)); } diff --git a/rpcs3/rpcs3qt/clans_settings_dialog.cpp b/rpcs3/rpcs3qt/clans_settings_dialog.cpp index 9745d11294..0b26b791ee 100644 --- a/rpcs3/rpcs3qt/clans_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/clans_settings_dialog.cpp @@ -66,7 +66,7 @@ clans_settings_dialog::clans_settings_dialog(QWidget* parent) g_cfg_clans.save(); }); - connect(m_cbx_protocol, &QComboBox::currentIndexChanged, this, [this](int index) + connect(m_cbx_protocol, &QComboBox::currentIndexChanged, this, [](int index) { if (index < 0) return; diff --git a/rpcs3/rpcs3qt/emu_settings.cpp b/rpcs3/rpcs3qt/emu_settings.cpp index 30860e10f5..0ec017a02c 100644 --- a/rpcs3/rpcs3qt/emu_settings.cpp +++ b/rpcs3/rpcs3qt/emu_settings.cpp @@ -207,7 +207,7 @@ bool emu_settings::ValidateSettings(bool cleanup) bool is_clean = true; std::function&, cfg::_base*)> search_level; - search_level = [&search_level, &is_clean, &cleanup, this](int level, YAML::Node& yml_node, std::vector& keys, cfg::_base* cfg_base) + search_level = [&search_level, &is_clean, &cleanup](int level, YAML::Node& yml_node, std::vector& keys, cfg::_base* cfg_base) { if (!yml_node || !yml_node.IsMap()) { diff --git a/rpcs3/rpcs3qt/game_list_actions.cpp b/rpcs3/rpcs3qt/game_list_actions.cpp index 5ff938e990..25b9f06b96 100644 --- a/rpcs3/rpcs3qt/game_list_actions.cpp +++ b/rpcs3/rpcs3qt/game_list_actions.cpp @@ -908,7 +908,7 @@ void game_list_actions::BatchActionBySerials(progress_dialog* pdlg, const std::s const int serials_size = ::narrow(serials.size()); - *iterate_over_serial = [=, this, index_ptr = index](int index) + *iterate_over_serial = [=, index_ptr = index](int index) { if (index == serials_size) { diff --git a/rpcs3/rpcs3qt/game_list_grid.cpp b/rpcs3/rpcs3qt/game_list_grid.cpp index 94fa571f7e..903fdf016a 100644 --- a/rpcs3/rpcs3qt/game_list_grid.cpp +++ b/rpcs3/rpcs3qt/game_list_grid.cpp @@ -21,7 +21,7 @@ game_list_grid::game_list_grid() Q_EMIT IconReady(game, item); }; - connect(this, &game_list_grid::IconReady, this, [this](const game_info& game, const movie_item_base* item) + connect(this, &game_list_grid::IconReady, this, [](const game_info& game, const movie_item_base* item) { if (game && item && game->item == item) item->image_change_callback(); }, Qt::QueuedConnection); // The default 'AutoConnection' doesn't seem to work in this specific case... diff --git a/rpcs3/rpcs3qt/game_list_table.cpp b/rpcs3/rpcs3qt/game_list_table.cpp index 53d0754bce..3d40467bb1 100644 --- a/rpcs3/rpcs3qt/game_list_table.cpp +++ b/rpcs3/rpcs3qt/game_list_table.cpp @@ -54,7 +54,7 @@ game_list_table::game_list_table(game_list_frame* frame, std::shared_ptritem == item) item->image_change_callback(); }); diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp index 2dab09d87f..bcc148d9a6 100644 --- a/rpcs3/rpcs3qt/gs_frame.cpp +++ b/rpcs3/rpcs3qt/gs_frame.cpp @@ -793,7 +793,7 @@ f64 gs_frame::client_display_rate() { f64 rate = 20.; // Minimum is 20 - Emu.BlockingCallFromMainThread([this, &rate]() + Emu.BlockingCallFromMainThread([&rate]() { const QList screens = QGuiApplication::screens(); diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 606a081fff..8379e2f5e0 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -737,8 +737,8 @@ void gui_application::InitializeCallbacks() callbacks.get_msg_dialog = [this]() -> std::shared_ptr { return m_show_gui ? std::make_shared() : nullptr; }; callbacks.get_osk_dialog = [this]() -> std::shared_ptr { return m_show_gui ? std::make_shared() : nullptr; }; callbacks.get_save_dialog = []() -> std::unique_ptr { return std::make_unique(); }; - callbacks.get_sendmessage_dialog = [this]() -> std::shared_ptr { return std::make_shared(); }; - callbacks.get_recvmessage_dialog = [this]() -> std::shared_ptr { return std::make_shared(); }; + callbacks.get_sendmessage_dialog = []() -> std::shared_ptr { return std::make_shared(); }; + callbacks.get_recvmessage_dialog = []() -> std::shared_ptr { return std::make_shared(); }; callbacks.get_trophy_notification_dialog = [this]() -> std::unique_ptr { return std::make_unique(m_game_window); }; callbacks.on_run = [this](bool start_playtime) { OnEmulatorRun(start_playtime); }; @@ -839,7 +839,7 @@ void gui_application::InitializeCallbacks() }; } - callbacks.on_emulation_stop_no_response = [this](std::shared_ptr> closed_successfully, int seconds_waiting_already) + callbacks.on_emulation_stop_no_response = [](std::shared_ptr> closed_successfully, int seconds_waiting_already) { const std::string terminate_message = tr("Stopping emulator took too long." "\nSome thread has probably deadlocked. Aborting.").toStdString(); @@ -849,7 +849,7 @@ void gui_application::InitializeCallbacks() report_fatal_error(terminate_message); } - Emu.CallFromMainThread([this, closed_successfully, seconds_waiting_already, terminate_message] + Emu.CallFromMainThread([closed_successfully, seconds_waiting_already, terminate_message] { const auto seconds = std::make_shared(seconds_waiting_already); diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp index 68c6f45e2b..926949fb58 100644 --- a/rpcs3/rpcs3qt/kernel_explorer.cpp +++ b/rpcs3/rpcs3qt/kernel_explorer.cpp @@ -316,7 +316,7 @@ void kernel_explorer::update() add_solid_node(find_node(root, additional_nodes::process_info), QString::fromStdString(fmt::format("Process Info, Sdk Version: 0x%08x, PPC SEG: %#x, SFO Category: %s (Fake: %s)", g_ps3_process_info.sdk_ver, g_ps3_process_info.ppc_seg, Emu.GetCat(), Emu.GetFakeCat()))); - auto display_program_segments = [this](QTreeWidgetItem* tree, const ppu_module& m) + auto display_program_segments = [](QTreeWidgetItem* tree, const ppu_module& m) { for (usz i = 0; i < m.segs.size(); i++) { @@ -661,7 +661,7 @@ void kernel_explorer::update() const s32 prio = ppu.prio.load().prio; std::string prio_text = fmt::format("%4d", prio); prio_text = fmt::replace_all(prio_text, " ", " "); - + ppu_threads.emplace_back(prio, fmt::format(u8"PPU 0x%07x: PRIO: %s, “%s”Joiner: %s, Status: %s, State: %s, %s func: “%s”%s", id, prio_text, *ppu.ppu_tname.load(), ppu.joiner.load(), status, ppu.state.load() , ppu.ack_suspend ? "After" : (ppu.current_function ? "In" : "Last"), func ? func : "", get_wait_time_str(ppu.start_time))); }, idm::unlocked); diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index a82fe5b091..0d62ef5b72 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -1734,7 +1734,7 @@ void main_window::DecryptSPRXLibraries() dlg->set_button_enabled(QDialogButtonBox::StandardButton::Ok, text.size() - (text.indexOf('x') + 1) == 32); }); - connect(dlg, &QDialog::accepted, this, [this, iterate, dlg, mod_index, decrypter, repeat_count]() + connect(dlg, &QDialog::accepted, this, [iterate, dlg, mod_index, decrypter, repeat_count]() { std::string text = dlg->get_input_text().toStdString(); @@ -3118,13 +3118,13 @@ void main_window::CreateConnects() m_game_list_frame->Refresh(true); // New user may have different games unlocked. }); - connect(ui->actionManage_Screenshots, &QAction::triggered, this, [this] + connect(ui->actionManage_Screenshots, &QAction::triggered, this, [] { screenshot_manager_dialog* screenshot_manager = new screenshot_manager_dialog(); screenshot_manager->show(); }); - connect(ui->actionManage_SoundEffects, &QAction::triggered, this, [this] + connect(ui->actionManage_SoundEffects, &QAction::triggered, this, [] { sound_effect_manager_dialog* dlg = new sound_effect_manager_dialog(); dlg->show(); @@ -3376,7 +3376,7 @@ void main_window::CreateConnects() welcome->open(); }); - connect(ui->supportAct, &QAction::triggered, this, [this] + connect(ui->supportAct, &QAction::triggered, this, [] { QDesktopServices::openUrl(QUrl("https://rpcs3.net/patreon")); }); diff --git a/rpcs3/rpcs3qt/savestate_manager_dialog.cpp b/rpcs3/rpcs3qt/savestate_manager_dialog.cpp index 2898c9b170..dbeca1698f 100644 --- a/rpcs3/rpcs3qt/savestate_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/savestate_manager_dialog.cpp @@ -575,7 +575,7 @@ void savestate_manager_dialog::ShowGameTableContextMenu(const QPoint& pos) if (!name.isEmpty()) { QAction* copy_name = new QAction(tr("&Copy Name"), menu); - connect(copy_name, &QAction::triggered, this, [this, name]() + connect(copy_name, &QAction::triggered, this, [name]() { QApplication::clipboard()->setText(name); }); diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index c95247748a..f4fcee4985 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -858,7 +858,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std ui->vulkansched->setEnabled(is_vulkan); }; - const auto apply_fsr_specific_options = [r_creator, this]() + const auto apply_fsr_specific_options = [this]() { const auto [text, value] = get_data(ui->outputScalingMode, ui->outputScalingMode->currentIndex()); const bool fsr_selected = static_cast(value) == output_scaling_mode::fsr; @@ -2095,7 +2095,7 @@ settings_dialog::settings_dialog(std::shared_ptr gui_settings, std connect(ui->edit_button_game_window_title_format, &QAbstractButton::clicked, [get_game_window_title, set_game_window_title, this]() { - auto get_game_window_title_label = [get_game_window_title, set_game_window_title, this](const QString& format) + auto get_game_window_title_label = [get_game_window_title](const QString& format) { const QString game_window_title = get_game_window_title(format); diff --git a/rpcs3/rpcs3qt/sound_effect_manager_dialog.cpp b/rpcs3/rpcs3qt/sound_effect_manager_dialog.cpp index cfd93246eb..3f7aeccce0 100644 --- a/rpcs3/rpcs3qt/sound_effect_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/sound_effect_manager_dialog.cpp @@ -41,7 +41,7 @@ sound_effect_manager_dialog::sound_effect_manager_dialog(QWidget* parent) } QPushButton* button = new QPushButton("", this); - connect(button, &QAbstractButton::clicked, this, [this, button, sound, name]() + connect(button, &QAbstractButton::clicked, this, [this, sound, name]() { const std::string path = rsx::overlays::get_sound_filepath(sound); if (fs::is_file(path)) diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp index 51ef2d2e9f..11046f2a70 100644 --- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp @@ -392,7 +392,7 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr gui_s m_trophy_table->create_header_actions(m_trophy_column_acts, [this](int col) { return m_gui_settings->GetTrophylistColVisibility(static_cast(col)); }, [this](int col, bool visible) { m_gui_settings->SetTrophylistColVisibility(static_cast(col), visible); }); - + m_game_table->create_header_actions(m_game_column_acts, [this](int col) { return m_gui_settings->GetTrophyGamelistColVisibility(static_cast(col)); }, [this](int col, bool visible) { m_gui_settings->SetTrophyGamelistColVisibility(static_cast(col), visible); }); @@ -651,7 +651,7 @@ void trophy_manager_dialog::ResizeGameIcons() const int trophy_index = item->data(GameUserRole::GameIndex).toInt(); QString trophy_icon_path = QString::fromStdString(m_trophies_db[trophy_index]->path); - item->set_icon_load_func([this, icon_path = std::move(trophy_icon_path), localized_icon, trophy_index, cancel = item->icon_loading_aborted(), dpr](int index) + item->set_icon_load_func([this, icon_path = std::move(trophy_icon_path), localized_icon, cancel = item->icon_loading_aborted(), dpr](int index) { if (cancel && cancel->load()) { @@ -897,7 +897,7 @@ void trophy_manager_dialog::ShowTrophyTableContextMenu(const QPoint& pos) if (!name.isEmpty() && !desc.isEmpty()) { QAction* copy_both = new QAction(tr("&Copy Name + Description"), copy_menu); - connect(copy_both, &QAction::triggered, this, [this, name, desc]() + connect(copy_both, &QAction::triggered, this, [name, desc]() { QApplication::clipboard()->setText(name % QStringLiteral("\n\n") % desc); }); @@ -907,7 +907,7 @@ void trophy_manager_dialog::ShowTrophyTableContextMenu(const QPoint& pos) if (!name.isEmpty()) { QAction* copy_name = new QAction(tr("&Copy Name"), copy_menu); - connect(copy_name, &QAction::triggered, this, [this, name]() + connect(copy_name, &QAction::triggered, this, [name]() { QApplication::clipboard()->setText(name); }); @@ -917,7 +917,7 @@ void trophy_manager_dialog::ShowTrophyTableContextMenu(const QPoint& pos) if (!desc.isEmpty()) { QAction* copy_desc = new QAction(tr("&Copy Description"), copy_menu); - connect(copy_desc, &QAction::triggered, this, [this, desc]() + connect(copy_desc, &QAction::triggered, this, [desc]() { QApplication::clipboard()->setText(desc); }); @@ -1038,7 +1038,7 @@ void trophy_manager_dialog::ShowGameTableContextMenu(const QPoint& pos) if (!name.isEmpty()) { QAction* copy_name = new QAction(tr("&Copy Name"), menu); - connect(copy_name, &QAction::triggered, this, [this, name]() + connect(copy_name, &QAction::triggered, this, [name]() { QApplication::clipboard()->setText(name); }); diff --git a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp b/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp index f5ceac8aee..44aceff70a 100644 --- a/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp +++ b/rpcs3/rpcs3qt/vfs_dialog_path_widget.cpp @@ -81,7 +81,7 @@ vfs_dialog_path_widget::vfs_dialog_path_widget(const QString& name, const QStrin item->setCheckState(Qt::CheckState::Checked); }); - connect(m_dir_list, &QListWidget::currentRowChanged, this, [this, button_remove_dir](int row) + connect(m_dir_list, &QListWidget::currentRowChanged, this, [button_remove_dir](int row) { button_remove_dir->setEnabled(row > 0); });