yuzu qt: Use lambda and std::function for reset callback

Also makes use of std::move, and performs a clang-format cleanup.

This addresses review comments.

Co-authored-by: LC <mathew1800@gmail.com>
This commit is contained in:
lat9nq
2021-05-25 22:14:55 -04:00
parent 4a3d57e469
commit c17e1bd7a8
4 changed files with 17 additions and 19 deletions

View File

@ -2611,17 +2611,18 @@ void GMainWindow::OnConfigure() {
LOG_WARNING(Frontend, "Failed to remove game metadata cache files");
}
// Explicitly save the game directories, since reinitializing config does not do so.
QVector<UISettings::GameDir> old_game_dirs = UISettings::values.game_dirs;
QVector<u64> old_favorited_ids = UISettings::values.favorited_ids;
// Explicitly save the game directories, since reinitializing config does not explicitly do
// so.
QVector<UISettings::GameDir> old_game_dirs = std::move(UISettings::values.game_dirs);
QVector<u64> old_favorited_ids = std::move(UISettings::values.favorited_ids);
Settings::values.disabled_addons.clear();
config = std::make_unique<Config>();
UISettings::values.reset_to_defaults = false;
UISettings::values.game_dirs = old_game_dirs;
UISettings::values.favorited_ids = old_favorited_ids;
UISettings::values.game_dirs = std::move(old_game_dirs);
UISettings::values.favorited_ids = std::move(old_favorited_ids);
InitializeRecentFileMenuActions();