From f49a04ba39363ad3b406233085f33afe8776707b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 May 2019 21:09:32 -0400 Subject: [PATCH] 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. --- src/yuzu/configuration/config.cpp | 3 ++- 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 98963bec85..db27da23e3 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 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 Config::default_hotkeys{{ +const std::array 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 b62a480eef..6b523ecdde 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -9,7 +9,6 @@ #include #include #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 default_hotkeys; - std::unique_ptr qt_config; std::string qt_config_loc; };