fix clang-format warnings

This commit is contained in:
Bartosz Kaszubowski
2020-01-16 16:16:35 +01:00
parent 787993c7dc
commit 3ddf01a4fc
2 changed files with 9 additions and 10 deletions

View File

@@ -21,11 +21,8 @@ constexpr std::array default_icon_sizes{
}; };
constexpr std::array row_text_names{ constexpr std::array row_text_names{
QT_TR_NOOP("Filename"), QT_TR_NOOP("Filename"), QT_TR_NOOP("Filetype"), QT_TR_NOOP("Title ID"),
QT_TR_NOOP("Filetype"), QT_TR_NOOP("Title Name"), QT_TR_NOOP("None"),
QT_TR_NOOP("Title ID"),
QT_TR_NOOP("Title Name"),
QT_TR_NOOP("None"),
}; };
} // Anonymous namespace } // Anonymous namespace
@@ -112,8 +109,9 @@ void ConfigureGameList::InitializeRowComboBoxes() {
} }
void ConfigureGameList::UpdateFirstRowComboBox(bool init) { void ConfigureGameList::UpdateFirstRowComboBox(bool init) {
const int currentIndex = init ? UISettings::values.row_1_text_id : const int currentIndex =
ui->row_1_text_combobox->findData(ui->row_1_text_combobox->currentData()); init ? UISettings::values.row_1_text_id
: ui->row_1_text_combobox->findData(ui->row_1_text_combobox->currentData());
ui->row_1_text_combobox->clear(); ui->row_1_text_combobox->clear();
@@ -130,8 +128,9 @@ void ConfigureGameList::UpdateFirstRowComboBox(bool init) {
} }
void ConfigureGameList::UpdateSecondRowComboBox(bool init) { void ConfigureGameList::UpdateSecondRowComboBox(bool init) {
const int currentIndex = init ? UISettings::values.row_2_text_id : const int currentIndex =
ui->row_2_text_combobox->findData(ui->row_2_text_combobox->currentData()); init ? UISettings::values.row_2_text_id
: ui->row_2_text_combobox->findData(ui->row_2_text_combobox->currentData());
ui->row_2_text_combobox->clear(); ui->row_2_text_combobox->clear();

View File

@@ -108,7 +108,7 @@ public:
}}; }};
const auto& row1 = row_data.at(UISettings::values.row_1_text_id); const auto& row1 = row_data.at(UISettings::values.row_1_text_id);
int row2_id = UISettings::values.row_2_text_id; const int row2_id = UISettings::values.row_2_text_id;
if (row2_id == 4) // None if (row2_id == 4) // None
return row1; return row1;