diff options
| author | 2019-05-19 12:47:30 -0400 | |
|---|---|---|
| committer | 2019-05-19 12:47:33 -0400 | |
| commit | 17255cd835a4727ab83fd2bfa1b4d21a98a19f61 (patch) | |
| tree | 2ea09e229916d040b37d4867e8ad06b67f41c16f /src | |
| parent | yuzu/configuration/configure_mouse_advanced: Clean up array accesses (diff) | |
| download | yuzu-17255cd835a4727ab83fd2bfa1b4d21a98a19f61.tar.gz yuzu-17255cd835a4727ab83fd2bfa1b4d21a98a19f61.tar.xz yuzu-17255cd835a4727ab83fd2bfa1b4d21a98a19f61.zip | |
yuzu/configuration/configure_per_general: Specify string conversions explicitly
Allows the per-game configuration to be successfully built with implicit
string conversions disabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_per_general.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/yuzu/configuration/configure_per_general.cpp b/src/yuzu/configuration/configure_per_general.cpp index 022b94609..2bdfc8e5a 100644 --- a/src/yuzu/configuration/configure_per_general.cpp +++ b/src/yuzu/configuration/configure_per_general.cpp | |||
| @@ -88,15 +88,15 @@ void ConfigurePerGameGeneral::loadFromFile(FileSys::VirtualFile file) { | |||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | void ConfigurePerGameGeneral::loadConfiguration() { | 90 | void ConfigurePerGameGeneral::loadConfiguration() { |
| 91 | if (file == nullptr) | 91 | if (file == nullptr) { |
| 92 | return; | 92 | return; |
| 93 | } | ||
| 93 | 94 | ||
| 94 | const auto loader = Loader::GetLoader(file); | 95 | ui->display_title_id->setText(QString::fromStdString(fmt::format("{:016X}", title_id))); |
| 95 | |||
| 96 | ui->display_title_id->setText(fmt::format("{:016X}", title_id).c_str()); | ||
| 97 | 96 | ||
| 98 | FileSys::PatchManager pm{title_id}; | 97 | FileSys::PatchManager pm{title_id}; |
| 99 | const auto control = pm.GetControlMetadata(); | 98 | const auto control = pm.GetControlMetadata(); |
| 99 | const auto loader = Loader::GetLoader(file); | ||
| 100 | 100 | ||
| 101 | if (control.first != nullptr) { | 101 | if (control.first != nullptr) { |
| 102 | ui->display_version->setText(QString::fromStdString(control.first->GetVersionString())); | 102 | ui->display_version->setText(QString::fromStdString(control.first->GetVersionString())); |
| @@ -142,8 +142,10 @@ void ConfigurePerGameGeneral::loadConfiguration() { | |||
| 142 | const auto& disabled = Settings::values.disabled_addons[title_id]; | 142 | const auto& disabled = Settings::values.disabled_addons[title_id]; |
| 143 | 143 | ||
| 144 | for (const auto& patch : pm.GetPatchVersionNames(update_raw)) { | 144 | for (const auto& patch : pm.GetPatchVersionNames(update_raw)) { |
| 145 | QStandardItem* first_item = new QStandardItem; | 145 | const auto name = |
| 146 | const auto name = QString::fromStdString(patch.first).replace("[D] ", ""); | 146 | QString::fromStdString(patch.first).replace(QStringLiteral("[D] "), QString{}); |
| 147 | |||
| 148 | auto* const first_item = new QStandardItem; | ||
| 147 | first_item->setText(name); | 149 | first_item->setText(name); |
| 148 | first_item->setCheckable(true); | 150 | first_item->setCheckable(true); |
| 149 | 151 | ||