From 3a2567c97cc7dc03d662a7609c979aef9e0a80ae Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 12 Sep 2018 01:06:50 -0400
Subject: [PATCH] yuzu/configure_gamelist: Move combo box initializtion to
 their own functions

Keeps the individual initialization of the combo boxes logically separate.
We also shouldn't be dumping this sort of thing in the constructor
directly.
---
 src/yuzu/configuration/configure_gamelist.cpp | 51 +++++++++++--------
 src/yuzu/configuration/configure_gamelist.h   |  4 +-
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/yuzu/configuration/configure_gamelist.cpp b/src/yuzu/configuration/configure_gamelist.cpp
index 1ae3423cfc..1238356a82 100644
--- a/src/yuzu/configuration/configure_gamelist.cpp
+++ b/src/yuzu/configuration/configure_gamelist.cpp
@@ -12,6 +12,33 @@ ConfigureGameList::ConfigureGameList(QWidget* parent)
     : QWidget(parent), ui(new Ui::ConfigureGameList) {
     ui->setupUi(this);
 
+    InitializeIconSizeComboBox();
+    InitializeRowComboBoxes();
+
+    this->setConfiguration();
+}
+
+ConfigureGameList::~ConfigureGameList() = default;
+
+void ConfigureGameList::applyConfiguration() {
+    UISettings::values.show_unknown = ui->show_unknown->isChecked();
+    UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt();
+    UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
+    UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt();
+    Settings::Apply();
+}
+
+void ConfigureGameList::setConfiguration() {
+    ui->show_unknown->setChecked(UISettings::values.show_unknown);
+    ui->icon_size_combobox->setCurrentIndex(
+        ui->icon_size_combobox->findData(UISettings::values.icon_size));
+    ui->row_1_text_combobox->setCurrentIndex(
+        ui->row_1_text_combobox->findData(UISettings::values.row_1_text_id));
+    ui->row_2_text_combobox->setCurrentIndex(
+        ui->row_2_text_combobox->findData(UISettings::values.row_2_text_id));
+}
+
+void ConfigureGameList::InitializeIconSizeComboBox() {
     static const std::vector<std::pair<u32, std::string>> default_icon_sizes{
         std::make_pair(0, "None"),        std::make_pair(32, "Small"),
         std::make_pair(64, "Standard"),   std::make_pair(128, "Large"),
@@ -24,7 +51,9 @@ ConfigureGameList::ConfigureGameList(QWidget* parent)
                                                                std::to_string(size.first) + ")"),
                                         size.first);
     }
+}
 
+void ConfigureGameList::InitializeRowComboBoxes() {
     static const std::vector<std::string> row_text_names{
         "Filename",
         "Filetype",
@@ -38,26 +67,4 @@ ConfigureGameList::ConfigureGameList(QWidget* parent)
         ui->row_2_text_combobox->addItem(QString::fromStdString(row_text_names[i]),
                                          QVariant::fromValue(i));
     }
-
-    this->setConfiguration();
-}
-
-ConfigureGameList::~ConfigureGameList() {}
-
-void ConfigureGameList::setConfiguration() {
-    ui->show_unknown->setChecked(UISettings::values.show_unknown);
-    ui->icon_size_combobox->setCurrentIndex(
-        ui->icon_size_combobox->findData(UISettings::values.icon_size));
-    ui->row_1_text_combobox->setCurrentIndex(
-        ui->row_1_text_combobox->findData(UISettings::values.row_1_text_id));
-    ui->row_2_text_combobox->setCurrentIndex(
-        ui->row_2_text_combobox->findData(UISettings::values.row_2_text_id));
-}
-
-void ConfigureGameList::applyConfiguration() {
-    UISettings::values.show_unknown = ui->show_unknown->isChecked();
-    UISettings::values.icon_size = ui->icon_size_combobox->currentData().toUInt();
-    UISettings::values.row_1_text_id = ui->row_1_text_combobox->currentData().toUInt();
-    UISettings::values.row_2_text_id = ui->row_2_text_combobox->currentData().toUInt();
-    Settings::Apply();
 }
diff --git a/src/yuzu/configuration/configure_gamelist.h b/src/yuzu/configuration/configure_gamelist.h
index 94fba63730..71fd67e99f 100644
--- a/src/yuzu/configuration/configure_gamelist.h
+++ b/src/yuzu/configuration/configure_gamelist.h
@@ -23,6 +23,8 @@ public:
 private:
     void setConfiguration();
 
-private:
+    void InitializeIconSizeComboBox();
+    void InitializeRowComboBoxes();
+
     std::unique_ptr<Ui::ConfigureGameList> ui;
 };