fixup: Comments, input order, casts closer to variables

This commit is contained in:
Kloen 2015-09-23 12:50:01 +02:00
parent 77a68e0607
commit 166e9d7400
4 changed files with 27 additions and 27 deletions

View File

@ -43,9 +43,9 @@ bool Config::LoadINI(INIReader* config, const char* location, const std::string&
static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = { static const std::array<int, Settings::NativeInput::NUM_INPUTS> defaults = {
GLFW_KEY_X, GLFW_KEY_Z, GLFW_KEY_S, GLFW_KEY_A, GLFW_KEY_X, GLFW_KEY_Z, GLFW_KEY_S, GLFW_KEY_A,
GLFW_KEY_Q, GLFW_KEY_W, GLFW_KEY_1, GLFW_KEY_2, GLFW_KEY_Q, GLFW_KEY_W, GLFW_KEY_1, GLFW_KEY_2,
GLFW_KEY_I, GLFW_KEY_K, GLFW_KEY_J, GLFW_KEY_L, GLFW_KEY_J, GLFW_KEY_L, GLFW_KEY_I, GLFW_KEY_K,
GLFW_KEY_T, GLFW_KEY_G, GLFW_KEY_F, GLFW_KEY_H, GLFW_KEY_F, GLFW_KEY_H, GLFW_KEY_T, GLFW_KEY_G,
GLFW_KEY_UP, GLFW_KEY_DOWN, GLFW_KEY_LEFT, GLFW_KEY_RIGHT, GLFW_KEY_LEFT, GLFW_KEY_RIGHT, GLFW_KEY_UP, GLFW_KEY_DOWN,
GLFW_KEY_M, GLFW_KEY_N, GLFW_KEY_B GLFW_KEY_M, GLFW_KEY_N, GLFW_KEY_B
}; };

View File

@ -24,9 +24,9 @@ Config::Config() {
const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = { const std::array<QVariant, Settings::NativeInput::NUM_INPUTS> Config::defaults = {
Qt::Key_X, Qt::Key_Z, Qt::Key_S, Qt::Key_A, Qt::Key_X, Qt::Key_Z, Qt::Key_S, Qt::Key_A,
Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2, Qt::Key_Q, Qt::Key_W, Qt::Key_1, Qt::Key_2,
Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_J, Qt::Key_L, Qt::Key_I, Qt::Key_K,
Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H, Qt::Key_F, Qt::Key_H, Qt::Key_T, Qt::Key_G,
Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_Left, Qt::Key_Right, Qt::Key_Up, Qt::Key_Down,
Qt::Key_M, Qt::Key_N, Qt::Key_B Qt::Key_M, Qt::Key_N, Qt::Key_B
}; };

View File

@ -17,11 +17,11 @@
#include "common/logging/log.h" #include "common/logging/log.h"
InputsDialog::InputsDialog(QWidget* parent) : QDialog(parent) { InputsDialog::InputsDialog(QWidget* parent) : QDialog(parent) {
// create a copy of the current settings // Create a copy of the current settings
temp_settings = Settings::Values(Settings::values); temp_settings = Settings::Values(Settings::values);
signal_mapper = new QSignalMapper(this); signal_mapper = new QSignalMapper(this);
// create the QPushButtons // Create the QPushButtons
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) {
push_buttons[i] = new QPushButton(this); push_buttons[i] = new QPushButton(this);
push_buttons[i]->setCheckable(true); push_buttons[i]->setCheckable(true);
@ -64,7 +64,7 @@ InputsDialog::InputsDialog(QWidget* parent) : QDialog(parent) {
connect(signal_mapper, SIGNAL(mapped(int)), this, SLOT(ChangeValue(int))); connect(signal_mapper, SIGNAL(mapped(int)), this, SLOT(ChangeValue(int)));
// the button box that contains the restore default/ok/cancel buttons // The button box that contains the restore default/ok/cancel buttons
QVBoxLayout* verticalLayout = new QVBoxLayout(); QVBoxLayout* verticalLayout = new QVBoxLayout();
QDialogButtonBox* buttonBox = new QDialogButtonBox(); QDialogButtonBox* buttonBox = new QDialogButtonBox();
buttonBox->setOrientation(Qt::Horizontal); buttonBox->setOrientation(Qt::Horizontal);
@ -79,11 +79,11 @@ InputsDialog::InputsDialog(QWidget* parent) : QDialog(parent) {
setLayout(verticalLayout); setLayout(verticalLayout);
setWindowTitle(tr("Input Settings")); setWindowTitle(tr("Input Settings"));
// set up event handlers for the buttons // Set up event handlers for the buttons
QPushButton* defaultButton = buttonBox->button(QDialogButtonBox::RestoreDefaults); QPushButton* defaultButton = buttonBox->button(QDialogButtonBox::RestoreDefaults);
connect(defaultButton, SIGNAL(clicked()), this, SLOT(RestoreDefaultSettings())); connect(defaultButton, SIGNAL(clicked()), this, SLOT(RestoreDefaultSettings()));
// display current key settings // Display current key settings
UpdateKeyLabels(); UpdateKeyLabels();
} }
@ -137,25 +137,25 @@ QString InputsDialog::GetKeyName(int key_code) {
} }
void InputsDialog::RestoreDefaultSettings() { void InputsDialog::RestoreDefaultSettings() {
// load the default button settings into temp_settings // Load the default button settings into temp_settings
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) {
temp_settings.input_mappings[Settings::NativeInput::All[i]] = Config::defaults[i].toInt(); temp_settings.input_mappings[Settings::NativeInput::All[i]] = Config::defaults[i].toInt();
} }
// then display it // Then display it
UpdateKeyLabels(); UpdateKeyLabels();
} }
void InputsDialog::SaveSettings() { void InputsDialog::SaveSettings() {
Config config; Config config;
// load the temporary settings into our real settings // Load the temporary settings into our real settings
for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) {
Settings::values.input_mappings[Settings::NativeInput::All[i]] = Settings::values.input_mappings[Settings::NativeInput::All[i]] =
temp_settings.input_mappings[Settings::NativeInput::All[i]]; temp_settings.input_mappings[Settings::NativeInput::All[i]];
} }
// then save it // Then save it
config.Save(); config.Save();
// Close the dialog after save the bindings // Close the dialog after save the bindings

View File

@ -13,26 +13,26 @@ namespace NativeInput {
enum Values { enum Values {
Y, X, B, A, Y, X, B, A,
L, R, ZL, ZR, L, R, ZL, ZR,
CUP, CDOWN, CLEFT, CRIGHT, CLEFT, CRIGHT, CUP, CDOWN,
DUP, DDOWN, DLEFT, DRIGHT, DLEFT, DRIGHT, DUP, DDOWN,
SUP, SDOWN, SLEFT, SRIGHT, SLEFT, SRIGHT, SUP, SDOWN,
START, SELECT, HOME, START, SELECT, HOME,
NUM_INPUTS NUM_INPUTS
}; };
static const std::array<const char*, NUM_INPUTS> Mapping = {{ static const std::array<const char*, NUM_INPUTS> Mapping = {{
"pad_y", "pad_x", "pad_b", "pad_a", "pad_y", "pad_x", "pad_b", "pad_a",
"pad_l", "pad_r", "pad_zl", "pad_zr", "pad_l", "pad_r", "pad_zl", "pad_zr",
"pad_cup", "pad_cdown", "pad_cleft", "pad_cright", "pad_cleft", "pad_cright", "pad_cup", "pad_cdown",
"pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_dleft", "pad_dright", "pad_dup", "pad_ddown",
"pad_sup", "pad_sdown", "pad_sleft", "pad_sright", "pad_sleft", "pad_sright", "pad_sup", "pad_sdown",
"pad_start", "pad_select", "pad_home" "pad_start", "pad_select", "pad_home"
}}; }};
static const std::array<Values, NUM_INPUTS> All = {{ static const std::array<Values, NUM_INPUTS> All = {{
Y, X, B, A, Y, X, B, A,
L, R, ZL, ZR, L, R, ZL, ZR,
CUP, CDOWN, CLEFT, CRIGHT, CLEFT, CRIGHT, CUP, CDOWN,
DUP, DDOWN, DLEFT, DRIGHT, DLEFT, DRIGHT, DUP, DDOWN,
SUP, SDOWN, SLEFT, SRIGHT, SLEFT, SRIGHT, SUP, SDOWN,
START, SELECT, HOME START, SELECT, HOME
}}; }};
} }