lvella/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

yuzu/configuration/configure_per_general: Specify string conversions explicitly

Browse source 
Allows the per-game configuration to be successfully built with implicit
string conversions disabled.
This commit is contained in:
Lioncash 2019-05-19 12:47:30 -04:00
parent 3039211c20
commit 17255cd835
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/yuzu/configuration/configure_per_general.cpp
View file

@ -88,15 +88,15 @@ void ConfigurePerGameGeneral::loadFromFile(FileSys::VirtualFile file) {
} }
void ConfigurePerGameGeneral::loadConfiguration() { void ConfigurePerGameGeneral::loadConfiguration() {
if (file == nullptr) if (file == nullptr) {
return; return;
}
const auto loader = Loader::GetLoader(file); ui->display_title_id->setText(QString::fromStdString(fmt::format("{:016X}", title_id)));
ui->display_title_id->setText(fmt::format("{:016X}", title_id).c_str());
FileSys::PatchManager pm{title_id}; FileSys::PatchManager pm{title_id};
const auto control = pm.GetControlMetadata(); const auto control = pm.GetControlMetadata();
const auto loader = Loader::GetLoader(file);
if (control.first != nullptr) { if (control.first != nullptr) {
ui->display_version->setText(QString::fromStdString(control.first->GetVersionString())); ui->display_version->setText(QString::fromStdString(control.first->GetVersionString()));
@ -142,8 +142,10 @@ void ConfigurePerGameGeneral::loadConfiguration() {
const auto& disabled = Settings::values.disabled_addons[title_id]; const auto& disabled = Settings::values.disabled_addons[title_id];
for (const auto& patch : pm.GetPatchVersionNames(update_raw)) { for (const auto& patch : pm.GetPatchVersionNames(update_raw)) {
QStandardItem* first_item = new QStandardItem; const auto name =
const auto name = QString::fromStdString(patch.first).replace("[D] ", ""); QString::fromStdString(patch.first).replace(QStringLiteral("[D] "), QString{});
auto* const first_item = new QStandardItem;
first_item->setText(name); first_item->setText(name);
first_item->setCheckable(true); first_item->setCheckable(true);