From c106f71bebdc6fffc03967f5a57618cfbe2ebaed Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 24 May 2016 17:22:44 -0400
Subject: [PATCH] New3DS: Minor style cleanup to #1520.
---
src/citra/config.cpp | 2 +-
src/citra_qt/config.cpp | 4 ++--
src/core/hle/service/ptm/ptm.cpp | 4 ++--
src/core/settings.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 4d170dec8b..c64de8e225 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -78,7 +78,7 @@ void Config::ReadValues() {
Settings::values.use_virtual_sd = sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
// System
- Settings::values.is_new3ds = sdl2_config->GetBoolean("System", "is_new3ds", false);
+ Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false);
Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1);
// Miscellaneous
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index f6e4981287..6e4ba39076 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -61,7 +61,7 @@ void Config::ReadValues() {
qt_config->endGroup();
qt_config->beginGroup("System");
- Settings::values.is_new3ds = qt_config->value("is_new3ds", false).toBool();
+ Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool();
Settings::values.region_value = qt_config->value("region_value", 1).toInt();
qt_config->endGroup();
@@ -152,7 +152,7 @@ void Config::SaveValues() {
qt_config->endGroup();
qt_config->beginGroup("System");
- qt_config->setValue("is_new3ds", Settings::values.is_new3ds);
+ qt_config->setValue("is_new_3ds", Settings::values.is_new_3ds);
qt_config->setValue("region_value", Settings::values.region_value);
qt_config->endGroup();
diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp
index 3a0331ee19..e2c17d93b3 100644
--- a/src/core/hle/service/ptm/ptm.cpp
+++ b/src/core/hle/service/ptm/ptm.cpp
@@ -91,10 +91,10 @@ void IsLegacyPowerOff(Service::Interface* self) {
void CheckNew3DS(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer();
- const bool is_new_3ds = Settings::values.is_new3ds;
+ const bool is_new_3ds = Settings::values.is_new_3ds;
if (is_new_3ds) {
- LOG_CRITICAL(Service_PTM, "The option 'is_new3ds' is enabled as part of the 'System' settings. Citra does not fully support New3DS emulation yet!");
+ LOG_CRITICAL(Service_PTM, "The option 'is_new_3ds' is enabled as part of the 'System' settings. Citra does not fully support New 3DS emulation yet!");
}
cmd_buff[1] = RESULT_SUCCESS.raw;
diff --git a/src/core/settings.h b/src/core/settings.h
index a61f25cbee..ea72f4d9cc 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -42,7 +42,7 @@ static const std::array<Values, NUM_INPUTS> All = {{
struct Values {
// CheckNew3DS
- bool is_new3ds;
+ bool is_new_3ds;
// Controls
std::array<int, NativeInput::NUM_INPUTS> input_mappings;
--
GitLab