summaryrefslogtreecommitdiff
path: root/src/citra_qt/config.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-03-17 14:59:39 -0400
committerGitHub <noreply@github.com>2017-03-17 14:59:39 -0400
commit423ab5e2bcf5a522e5f412447c05f648df57a14c (patch)
tree1e60eaeffa59229254a47f885d2fe2cbbdc1a5c0 /src/citra_qt/config.h
parent3e7459bbf9efa80b2d2dd45b892f7f3cef8ab751 (diff)
parentb5faa681206e2d82248293591f010f7aea8b99fe (diff)
Merge pull request #2497 from wwylele/input-2
Refactor input emulation & add SDL gamepad support
Diffstat (limited to 'src/citra_qt/config.h')
-rw-r--r--src/citra_qt/config.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/citra_qt/config.h b/src/citra_qt/config.h
index 79c901804..cbf745ea2 100644
--- a/src/citra_qt/config.h
+++ b/src/citra_qt/config.h
@@ -4,6 +4,7 @@
#pragma once
+#include <array>
#include <string>
#include <QVariant>
#include "core/settings.h"
@@ -23,5 +24,7 @@ public:
void Reload();
void Save();
- static const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> defaults;
+
+ static const std::array<int, Settings::NativeButton::NumButtons> default_buttons;
+ static const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> default_analogs;
};