summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2019-05-20 21:09:32 -0400
committerGravatar Lioncash2019-05-20 21:09:35 -0400
commitf49a04ba39363ad3b406233085f33afe8776707b (patch)
tree9441bb0cb958843a119a483234aba03f621e7c5d /src
parentyuzu/configuration/config: Specify string conversions explicitly (diff)
downloadyuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar.gz
yuzu-f49a04ba39363ad3b406233085f33afe8776707b.tar.xz
yuzu-f49a04ba39363ad3b406233085f33afe8776707b.zip
yuzu/configuration/config: Make default hotkeys an internally-linked array in the cpp file
Given the array is a private static array, we can just make it internally linked to hide it from external code. This also allows us to remove an inclusion within the header.
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/config.cpp3
-rw-r--r--src/yuzu/configuration/config.h3
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 @@
11#include "core/hle/service/hid/controllers/npad.h" 11#include "core/hle/service/hid/controllers/npad.h"
12#include "input_common/main.h" 12#include "input_common/main.h"
13#include "yuzu/configuration/config.h" 13#include "yuzu/configuration/config.h"
14#include "yuzu/ui_settings.h"
14 15
15Config::Config() { 16Config::Config() {
16 // TODO: Don't hardcode the path; let the frontend decide where to put the config files. 17 // 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
210// This must be in alphabetical order according to action name as it must have the same order as 211// This must be in alphabetical order according to action name as it must have the same order as
211// UISetting::values.shortcuts, which is alphabetically ordered. 212// UISetting::values.shortcuts, which is alphabetically ordered.
212// clang-format off 213// clang-format off
213const std::array<UISettings::Shortcut, 15> Config::default_hotkeys{{ 214const std::array<UISettings::Shortcut, 15> default_hotkeys{{
214 {QStringLiteral("Capture Screenshot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+P"), Qt::ApplicationShortcut}}, 215 {QStringLiteral("Capture Screenshot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+P"), Qt::ApplicationShortcut}},
215 {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), Qt::WindowShortcut}}, 216 {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), Qt::WindowShortcut}},
216 {QStringLiteral("Decrease Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("-"), Qt::ApplicationShortcut}}, 217 {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 @@
9#include <string> 9#include <string>
10#include <QVariant> 10#include <QVariant>
11#include "core/settings.h" 11#include "core/settings.h"
12#include "yuzu/ui_settings.h"
13 12
14class QSettings; 13class QSettings;
15 14
@@ -82,8 +81,6 @@ private:
82 void WriteSetting(const QString& name, const QVariant& value); 81 void WriteSetting(const QString& name, const QVariant& value);
83 void WriteSetting(const QString& name, const QVariant& value, const QVariant& default_value); 82 void WriteSetting(const QString& name, const QVariant& value, const QVariant& default_value);
84 83
85 static const std::array<UISettings::Shortcut, 15> default_hotkeys;
86
87 std::unique_ptr<QSettings> qt_config; 84 std::unique_ptr<QSettings> qt_config;
88 std::string qt_config_loc; 85 std::string qt_config_loc;
89}; 86};