diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index d1b04bad7..33befa7b7 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -31,7 +31,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) static_cast(&QComboBox::currentIndexChanged), this, &ConfigureGeneral::onLanguageChanged); - for (auto theme : UISettings::themes) { + for (const auto& theme : UISettings::themes) { ui->theme_combobox->addItem(theme.first, theme.second); } diff --git a/src/citra_qt/ui_settings.cpp b/src/citra_qt/ui_settings.cpp index 120b34990..b27fc7661 100644 --- a/src/citra_qt/ui_settings.cpp +++ b/src/citra_qt/ui_settings.cpp @@ -6,5 +6,13 @@ namespace UISettings { +const Themes themes{{ + {"Default", "default"}, + {"Dark", "qdarkstyle"}, + {"Colorful", "colorful"}, + {"Colorful Dark", "colorful_dark"}, +}}; + Values values = {}; -} + +} // namespace UISettings diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h index 1cd94c99d..b36da3341 100644 --- a/src/citra_qt/ui_settings.h +++ b/src/citra_qt/ui_settings.h @@ -16,11 +16,8 @@ namespace UISettings { using ContextualShortcut = std::pair; using Shortcut = std::pair; -static const std::array, 4> themes = { - {std::make_pair(QString("Default"), QString("default")), - std::make_pair(QString("Dark"), QString("qdarkstyle")), - std::make_pair(QString("Colorful"), QString("colorful")), - std::make_pair(QString("Colorful Dark"), QString("colorful_dark"))}}; +using Themes = std::array, 4>; +extern const Themes themes; struct GameDir { QString path;