diff options
| author | 2019-05-19 11:16:21 -0400 | |
|---|---|---|
| committer | 2019-05-19 11:16:23 -0400 | |
| commit | 05235ccaa96c26a56a4a3c3af70ec446e785dba7 (patch) | |
| tree | fda7b1468e66193a2051ce1982614fc6998a367f /src | |
| parent | yuzu/configuration/configure_audio: Store power on query into a variable (diff) | |
| download | yuzu-05235ccaa96c26a56a4a3c3af70ec446e785dba7.tar.gz yuzu-05235ccaa96c26a56a4a3c3af70ec446e785dba7.tar.xz yuzu-05235ccaa96c26a56a4a3c3af70ec446e785dba7.zip | |
yuzu/configuration/configure_gamelist: Specify string conversions explicitly
Allows the gamelist configuration code to compile with implicit string
conversions disabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/configure_gamelist.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/yuzu/configuration/configure_gamelist.cpp b/src/yuzu/configuration/configure_gamelist.cpp index ae8cac243..6f0d75605 100644 --- a/src/yuzu/configuration/configure_gamelist.cpp +++ b/src/yuzu/configuration/configure_gamelist.cpp | |||
| @@ -100,13 +100,15 @@ void ConfigureGameList::RetranslateUI() { | |||
| 100 | 100 | ||
| 101 | void ConfigureGameList::InitializeIconSizeComboBox() { | 101 | void ConfigureGameList::InitializeIconSizeComboBox() { |
| 102 | for (const auto& size : default_icon_sizes) { | 102 | for (const auto& size : default_icon_sizes) { |
| 103 | ui->icon_size_combobox->addItem(size.second, size.first); | 103 | ui->icon_size_combobox->addItem(QString::fromUtf8(size.second), size.first); |
| 104 | } | 104 | } |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | void ConfigureGameList::InitializeRowComboBoxes() { | 107 | void ConfigureGameList::InitializeRowComboBoxes() { |
| 108 | for (std::size_t i = 0; i < row_text_names.size(); ++i) { | 108 | for (std::size_t i = 0; i < row_text_names.size(); ++i) { |
| 109 | ui->row_1_text_combobox->addItem(row_text_names[i], QVariant::fromValue(i)); | 109 | const QString row_text_name = QString::fromUtf8(row_text_names[i]); |
| 110 | ui->row_2_text_combobox->addItem(row_text_names[i], QVariant::fromValue(i)); | 110 | |
| 111 | ui->row_1_text_combobox->addItem(row_text_name, QVariant::fromValue(i)); | ||
| 112 | ui->row_2_text_combobox->addItem(row_text_name, QVariant::fromValue(i)); | ||
| 111 | } | 113 | } |
| 112 | } | 114 | } |