CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

yuzu qt: Restore const qualifiers 

This addresses review comments.

Co-authored-by: LC <mathew1800@gmail.com>
master
lat9nq 2021-05-25 21:39:57 +07:00
parent cfb9bcbe42
commit bc38d4c81b
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/yuzu/configuration/configure_per_game.cpp
Unescape Escape View File

@ -30,13 +30,9 @@
ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, std::string_view file_name) ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id, std::string_view file_name)
: QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()), title_id(title_id) { : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()), title_id(title_id) {
if (title_id == 0) { const auto config_file_name =
game_config = std::make_unique<Config>(Common::FS::GetFilename(file_name), title_id == 0 ? Common::FS::GetFilename(file_name) : fmt::format("{:016X}", title_id);
Config::ConfigType::PerGameConfig); game_config = std::make_unique<Config>(config_file_name, Config::ConfigType::PerGameConfig);
} else {
game_config = std::make_unique<Config>(fmt::format("{:016X}", title_id),
Config::ConfigType::PerGameConfig);
}
Settings::SetConfiguringGlobal(false); Settings::SetConfiguringGlobal(false);

25
src/yuzu/main.cpp
Unescape Escape View File

@ -1334,13 +1334,10 @@ void GMainWindow::BootGame(const QString& filename, std::size_t program_index) {
if (!(loader == nullptr || loader->ReadProgramId(title_id) != Loader::ResultStatus::Success)) { if (!(loader == nullptr || loader->ReadProgramId(title_id) != Loader::ResultStatus::Success)) {
// Load per game settings // Load per game settings
if (title_id == 0) { const auto config_file_name = title_id == 0
Config per_game_config(Common::FS::GetFilename(filename.toStdString()), ? Common::FS::GetFilename(filename.toStdString())
Config::ConfigType::PerGameConfig); : fmt::format("{:016X}", title_id);
} else { Config per_game_config(config_file_name, Config::ConfigType::PerGameConfig);
Config per_game_config(fmt::format("{:016X}", title_id),
Config::ConfigType::PerGameConfig);
}
} }
ConfigureVibration::SetAllVibrationDevices(); ConfigureVibration::SetAllVibrationDevices();
@ -1850,15 +1847,11 @@ void GMainWindow::RemoveTransferableShaderCache(u64 program_id) {
} }
void GMainWindow::RemoveCustomConfiguration(u64 program_id, std::string_view game_path) { void GMainWindow::RemoveCustomConfiguration(u64 program_id, std::string_view game_path) {
std::string custom_config_file_path; const auto config_file_name = program_id == 0
if (program_id == 0) { ? fmt::format("{:s}.ini", Common::FS::GetFilename(game_path))
custom_config_file_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / : fmt::format("{:016X}.ini", program_id);
"custom" / const auto custom_config_file_path =
fmt::format("{:s}.ini", Common::FS::GetFilename(game_path)); Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "custom" / config_file_name;
} else {
custom_config_file_path = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) /
"custom" / fmt::format("{:016X}.ini", program_id);
}
if (!Common::FS::Exists(custom_config_file_path)) { if (!Common::FS::Exists(custom_config_file_path)) {
QMessageBox::warning(this, tr("Error Removing Custom Configuration"), QMessageBox::warning(this, tr("Error Removing Custom Configuration"),