INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-14 08:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

13
src/yuzu/configuration/configure_general.cpp
View File

@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <functional>
#include <utility>
#include <QCheckBox>
#include <QMessageBox>
#include <QSpinBox>
@ -57,10 +59,8 @@ void ConfigureGeneral::SetConfiguration() {
}
// Called to set the callback when resetting settings to defaults
void ConfigureGeneral::SetResetCallback(void (*callback)(ConfigureDialog*),
ConfigureDialog* param) {
ResetCallback = callback;
reset_callback_param = param;
void ConfigureGeneral::SetResetCallback(std::function<void()> callback) {
reset_callback = std::move(callback);
}
void ConfigureGeneral::ResetDefaults() {
@ -69,11 +69,12 @@ void ConfigureGeneral::ResetDefaults() {
tr("This reset all settings and remove all per-game configurations. This will not delete "
"game directories, profiles, or input profiles. Proceed?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No)
if (answer == QMessageBox::No) {
return;
}
UISettings::values.reset_to_defaults = true;
UISettings::values.is_game_list_reload_pending.exchange(true);
(*ResetCallback)(reset_callback_param);
reset_callback();
}
void ConfigureGeneral::ApplyConfiguration() {