From 7c6c5a43274a8d48eb97193769ff4a13aa955435 Mon Sep 17 00:00:00 2001 From: Anon Date: Sat, 30 Jul 2016 09:46:34 -0500 Subject: [PATCH] Fix breaks after rebase --- src/citra_qt/config.cpp | 2 ++ src/citra_qt/configure_input.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index a2b4683d9..8f8e2a8dc 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include + #include "citra_qt/config.h" #include "citra_qt/ui_settings.h" diff --git a/src/citra_qt/configure_input.cpp b/src/citra_qt/configure_input.cpp index b376ca9df..700814eef 100644 --- a/src/citra_qt/configure_input.cpp +++ b/src/citra_qt/configure_input.cpp @@ -35,8 +35,8 @@ ConfigureInput::ConfigureInput(QWidget* parent) : QWidget(parent), ui(std::make_ { std::make_pair(Settings::NativeInput::Values::CIRCLE_UP, ui->buttonCircleUp) }, { std::make_pair(Settings::NativeInput::Values::CIRCLE_DOWN, ui->buttonCircleDown) }, { std::make_pair(Settings::NativeInput::Values::CIRCLE_LEFT, ui->buttonCircleLeft) }, - { std::make_pair(Settings::NativeInput::Values::CIRCLE_RIGHT, ui->buttonCircleRight) }, - { std::make_pair(Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod) }, + { std::make_pair(Settings::NativeInput::Values::CIRCLE_RIGHT, ui->buttonCircleRight) } + //{ std::make_pair(Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod) }, }; // Attach handle click method to each button click. @@ -65,15 +65,15 @@ void ConfigureInput::handleClick() { void ConfigureInput::applyConfiguration() { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { int value = getKeyValue(input_mapping[Settings::NativeInput::Values(i)]->text()); - Settings::values.input_mappings[Settings::NativeInput::All[i]] = value; + //Settings::values.input_mappings[Settings::NativeInput::All[i]] = value; } Settings::Apply(); } void ConfigureInput::setConfiguration() { for (int i = 0; i < Settings::NativeInput::NUM_INPUTS; ++i) { - QString keyValue = getKeyName(Settings::values.input_mappings[i]); - input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); + //QString keyValue = getKeyName(Settings::values.input_mappings[i]); + //input_mapping[Settings::NativeInput::Values(i)]->setText(keyValue); } }