diff options
author | Lioncash <mathew1800@gmail.com> | 2019-05-21 03:09:32 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-05-21 03:09:35 +0200 |
commit | f49a04ba39363ad3b406233085f33afe8776707b (patch) | |
tree | 9441bb0cb958843a119a483234aba03f621e7c5d /src | |
parent | yuzu/configuration/config: Specify string conversions explicitly (diff) | |
download | yuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar yuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar.gz yuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar.bz2 yuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar.lz yuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar.xz yuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar.zst yuzu-f49a04ba39363ad3b406233085f33afe8776707b.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/yuzu/configuration/config.cpp | 3 | ||||
-rw-r--r-- | src/yuzu/configuration/config.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 98963bec8..db27da23e 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -11,6 +11,7 @@ #include "core/hle/service/hid/controllers/npad.h" #include "input_common/main.h" #include "yuzu/configuration/config.h" +#include "yuzu/ui_settings.h" Config::Config() { // TODO: Don't hardcode the path; let the frontend decide where to put the config files. @@ -210,7 +211,7 @@ const std::array<int, Settings::NativeKeyboard::NumKeyboardMods> Config::default // This must be in alphabetical order according to action name as it must have the same order as // UISetting::values.shortcuts, which is alphabetically ordered. // clang-format off -const std::array<UISettings::Shortcut, 15> Config::default_hotkeys{{ +const std::array<UISettings::Shortcut, 15> default_hotkeys{{ {QStringLiteral("Capture Screenshot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+P"), Qt::ApplicationShortcut}}, {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), Qt::WindowShortcut}}, {QStringLiteral("Decrease Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("-"), Qt::ApplicationShortcut}}, diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index b62a480ee..6b523ecdd 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -9,7 +9,6 @@ #include <string> #include <QVariant> #include "core/settings.h" -#include "yuzu/ui_settings.h" class QSettings; @@ -82,8 +81,6 @@ private: void WriteSetting(const QString& name, const QVariant& value); void WriteSetting(const QString& name, const QVariant& value, const QVariant& default_value); - static const std::array<UISettings::Shortcut, 15> default_hotkeys; - std::unique_ptr<QSettings> qt_config; std::string qt_config_loc; }; |