citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

configure_system: Amend function casing

This commit is contained in:
Lioncash 2018-10-25 16:47:09 -04:00 committed by fearlessTobi
parent 97cdf44ddd
commit 470cc66049
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/citra_qt/configuration/configure_system.cpp
View File

@ -220,12 +220,12 @@ ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::
ui->setupUi(this); ui->setupUi(this);
connect(ui->combo_birthmonth, connect(ui->combo_birthmonth,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&ConfigureSystem::updateBirthdayComboBox); &ConfigureSystem::UpdateBirthdayComboBox);
connect(ui->combo_init_clock, connect(ui->combo_init_clock,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&ConfigureSystem::updateInitTime); &ConfigureSystem::UpdateInitTime);
connect(ui->button_regenerate_console_id, &QPushButton::clicked, this, connect(ui->button_regenerate_console_id, &QPushButton::clicked, this,
&ConfigureSystem::refreshConsoleID); &ConfigureSystem::RefreshConsoleID);
for (u8 i = 0; i < country_names.size(); i++) { for (u8 i = 0; i < country_names.size(); i++) {
if (country_names.at(i) != "") { if (country_names.at(i) != "") {
ui->combo_country->addItem(tr(country_names.at(i)), i); ui->combo_country->addItem(tr(country_names.at(i)), i);
@ -270,7 +270,7 @@ void ConfigureSystem::ReadSystemSettings() {
// set birthday // set birthday
std::tie(birthmonth, birthday) = cfg->GetBirthday(); std::tie(birthmonth, birthday) = cfg->GetBirthday();
ui->combo_birthmonth->setCurrentIndex(birthmonth - 1); ui->combo_birthmonth->setCurrentIndex(birthmonth - 1);
updateBirthdayComboBox( UpdateBirthdayComboBox(
birthmonth - birthmonth -
1); // explicitly update it because the signal from setCurrentIndex is not reliable 1); // explicitly update it because the signal from setCurrentIndex is not reliable
ui->combo_birthday->setCurrentIndex(birthday - 1); ui->combo_birthday->setCurrentIndex(birthday - 1);
@ -358,7 +358,7 @@ void ConfigureSystem::applyConfiguration() {
Settings::Apply(); Settings::Apply();
} }
void ConfigureSystem::updateBirthdayComboBox(int birthmonth_index) { void ConfigureSystem::UpdateBirthdayComboBox(int birthmonth_index) {
if (birthmonth_index < 0 || birthmonth_index >= 12) if (birthmonth_index < 0 || birthmonth_index >= 12)
return; return;
@ -391,17 +391,17 @@ void ConfigureSystem::ConfigureTime() {
this->setConfiguration(); this->setConfiguration();
updateInitTime(ui->combo_init_clock->currentIndex()); UpdateInitTime(ui->combo_init_clock->currentIndex());
} }
void ConfigureSystem::updateInitTime(int init_clock) { void ConfigureSystem::UpdateInitTime(int init_clock) {
const bool is_fixed_time = const bool is_fixed_time =
static_cast<Settings::InitClock>(init_clock) == Settings::InitClock::FixedTime; static_cast<Settings::InitClock>(init_clock) == Settings::InitClock::FixedTime;
ui->label_init_time->setVisible(is_fixed_time); ui->label_init_time->setVisible(is_fixed_time);
ui->edit_init_time->setVisible(is_fixed_time); ui->edit_init_time->setVisible(is_fixed_time);
} }
void ConfigureSystem::refreshConsoleID() { void ConfigureSystem::RefreshConsoleID() {
QMessageBox::StandardButton reply; QMessageBox::StandardButton reply;
QString warning_text = tr("This will replace your current virtual 3DS with a new one. " QString warning_text = tr("This will replace your current virtual 3DS with a new one. "
"Your current virtual 3DS will not be recoverable. " "Your current virtual 3DS will not be recoverable. "

6
src/citra_qt/configuration/configure_system.h
View File

@ -33,9 +33,9 @@ private:
void ReadSystemSettings(); void ReadSystemSettings();
void ConfigureTime(); void ConfigureTime();
void updateBirthdayComboBox(int birthmonth_index); void UpdateBirthdayComboBox(int birthmonth_index);
void updateInitTime(int init_clock); void UpdateInitTime(int init_clock);
void refreshConsoleID(); void RefreshConsoleID();
std::unique_ptr<Ui::ConfigureSystem> ui; std::unique_ptr<Ui::ConfigureSystem> ui;
bool enabled; bool enabled;