summaryrefslogtreecommitdiffstats
path: root/src/citra_qt/config.cpp
diff options
context:
space:
mode:
authorAnon <makotech222@users.noreply.github.com>2016-07-29 14:45:49 +0200
committerbunnei <bunneidev@gmail.com>2016-07-29 14:45:49 +0200
commite91327c86a863b9419fd3695b2400a52336ec3b5 (patch)
treeec914c0dbd050f8063fa5dac0204f3ff0d5b035b /src/citra_qt/config.cpp
parentMerge pull request #1950 from JamePeng/fix-apt-0x0055004-and-0x00560000 (diff)
downloadyuzu-e91327c86a863b9419fd3695b2400a52336ec3b5.tar
yuzu-e91327c86a863b9419fd3695b2400a52336ec3b5.tar.gz
yuzu-e91327c86a863b9419fd3695b2400a52336ec3b5.tar.bz2
yuzu-e91327c86a863b9419fd3695b2400a52336ec3b5.tar.lz
yuzu-e91327c86a863b9419fd3695b2400a52336ec3b5.tar.xz
yuzu-e91327c86a863b9419fd3695b2400a52336ec3b5.tar.zst
yuzu-e91327c86a863b9419fd3695b2400a52336ec3b5.zip
Diffstat (limited to 'src/citra_qt/config.cpp')
-rw-r--r--src/citra_qt/config.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index ba7edaff9..0e5f285c0 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -3,14 +3,11 @@
// Refer to the license.txt file included.
#include <QSettings>
-#include <QString>
-#include <QStringList>
#include "citra_qt/config.h"
#include "citra_qt/ui_settings.h"
#include "common/file_util.h"
-#include "core/settings.h"
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
@@ -21,7 +18,7 @@ Config::Config() {
Reload();
}
-static const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> defaults = {
+const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = {
// directly mapped keys
Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X,
Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2,
@@ -109,7 +106,7 @@ void Config::ReadValues() {
UISettings::values.shortcuts.emplace_back(
UISettings::Shortcut(group + "/" + hotkey,
UISettings::ContextualShortcut(qt_config->value("KeySeq").toString(),
- qt_config->value("Context").toInt())));
+ qt_config->value("Context").toInt())));
qt_config->endGroup();
}
@@ -191,7 +188,7 @@ void Config::SaveValues() {
qt_config->endGroup();
qt_config->beginGroup("Shortcuts");
- for (auto shortcut : UISettings::values.shortcuts ) {
+ for (auto shortcut : UISettings::values.shortcuts) {
qt_config->setValue(shortcut.first + "/KeySeq", shortcut.second.first);
qt_config->setValue(shortcut.first + "/Context", shortcut.second.second);
}