summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-04 12:33:17 +0200
committerLioncash <mathew1800@gmail.com>2018-10-04 15:43:51 +0200
commit30dfd89126b4d1e7366697fb7f937e2db29d7295 (patch)
treeea230e248bffe2a944ce6062a7775d25feab1dfc /src
parentMerge pull request #1330 from raven02/tlds (diff)
downloadyuzu-30dfd89126b4d1e7366697fb7f937e2db29d7295.tar
yuzu-30dfd89126b4d1e7366697fb7f937e2db29d7295.tar.gz
yuzu-30dfd89126b4d1e7366697fb7f937e2db29d7295.tar.bz2
yuzu-30dfd89126b4d1e7366697fb7f937e2db29d7295.tar.lz
yuzu-30dfd89126b4d1e7366697fb7f937e2db29d7295.tar.xz
yuzu-30dfd89126b4d1e7366697fb7f937e2db29d7295.tar.zst
yuzu-30dfd89126b4d1e7366697fb7f937e2db29d7295.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/configure_general.cpp2
-rw-r--r--src/yuzu/ui_settings.cpp8
-rw-r--r--src/yuzu/ui_settings.h5
3 files changed, 10 insertions, 5 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 9292d9a42..f5db9e55b 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -13,7 +13,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
ui->setupUi(this);
- for (auto theme : UISettings::themes) {
+ for (const auto& theme : UISettings::themes) {
ui->theme_combobox->addItem(theme.first, theme.second);
}
diff --git a/src/yuzu/ui_settings.cpp b/src/yuzu/ui_settings.cpp
index 120b34990..a314493fc 100644
--- a/src/yuzu/ui_settings.cpp
+++ b/src/yuzu/ui_settings.cpp
@@ -6,5 +6,11 @@
namespace UISettings {
+const Themes themes{{
+ {"Default", "default"},
+ {"Dark", "qdarkstyle"},
+}};
+
Values values = {};
-}
+
+} // namespace UISettings
diff --git a/src/yuzu/ui_settings.h b/src/yuzu/ui_settings.h
index 051494bc5..2d679004f 100644
--- a/src/yuzu/ui_settings.h
+++ b/src/yuzu/ui_settings.h
@@ -15,9 +15,8 @@ namespace UISettings {
using ContextualShortcut = std::pair<QString, int>;
using Shortcut = std::pair<QString, ContextualShortcut>;
-static const std::array<std::pair<QString, QString>, 2> themes = {
- {std::make_pair(QString("Default"), QString("default")),
- std::make_pair(QString("Dark"), QString("qdarkstyle"))}};
+using Themes = std::array<std::pair<const char*, const char*>, 2>;
+extern const Themes themes;
struct Values {
QByteArray geometry;