From 719912786a51f5e36d87e9c5aa19e8ecdb065fe1 Mon Sep 17 00:00:00 2001
From: vitor-k <vitor-kiguchi@hotmail.com>
Date: Sat, 7 Sep 2019 00:15:07 -0300
Subject: [PATCH] UISettings::GameListText Append a value to the enum to
 function as length counter. Also remove magic numbers where possible, by
 using the enum instead.

---
 src/citra_qt/configuration/config.cpp | 18 ++++++++++--------
 src/citra_qt/uisettings.h             |  3 +--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp
index 6b214216e..c96d8d86b 100644
--- a/src/citra_qt/configuration/config.cpp
+++ b/src/citra_qt/configuration/config.cpp
@@ -306,17 +306,19 @@ void Config::ReadValues() {
     }
     UISettings::values.game_list_icon_size = UISettings::GameListIconSize{icon_size};
 
-    int row_1 = ReadSetting("row1", 2).toInt();
-    if (row_1 < 0 || row_1 >= UISettings::GAME_LIST_TEXT_LENGTH) {
-        row_1 = 2;
+    UISettings::GameListText row_1 = UISettings::GameListText{
+        ReadSetting("row1", static_cast<int>(UISettings::GameListText::TitleName)).toInt()};
+    if (row_1 <= UISettings::GameListText::NoText || row_1 >= UISettings::GameListText::ListEnd) {
+        row_1 = UISettings::GameListText::TitleName;
     }
-    UISettings::values.game_list_row_1 = UISettings::GameListText{row_1};
+    UISettings::values.game_list_row_1 = row_1;
 
-    int row_2 = ReadSetting("row2", 0).toInt();
-    if (row_2 < -1 || row_2 >= UISettings::GAME_LIST_TEXT_LENGTH) {
-        row_2 = 0;
+    UISettings::GameListText row_2 = UISettings::GameListText{
+        ReadSetting("row2", static_cast<int>(UISettings::GameListText::FileName)).toInt()};
+    if (row_2 < UISettings::GameListText::NoText || row_2 >= UISettings::GameListText::ListEnd) {
+        row_2 = UISettings::GameListText::FileName;
     }
-    UISettings::values.game_list_row_2 = UISettings::GameListText{row_2};
+    UISettings::values.game_list_row_2 = row_2;
 
     UISettings::values.game_list_hide_no_icon = ReadSetting("hideNoIcon", false).toBool();
     UISettings::values.game_list_single_line_mode = ReadSetting("singleLineMode", false).toBool();
diff --git a/src/citra_qt/uisettings.h b/src/citra_qt/uisettings.h
index c33db6e75..31be267c6 100644
--- a/src/citra_qt/uisettings.h
+++ b/src/citra_qt/uisettings.h
@@ -52,9 +52,8 @@ enum class GameListText {
     TitleName,     ///< Display the name of the title
     TitleID,       ///< Display the title ID
     LongTitleName, ///< Display the long name of the title
+    ListEnd,       ///< Keep this at the end of the enum.
 };
-// The length of the GameListText, excluding NoText
-constexpr int GAME_LIST_TEXT_LENGTH = 5;
 
 struct Values {
     QByteArray geometry;