From a23d4e7b7da88ca8c9dc9430e4a40d5316453b45 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Fri, 16 Apr 2021 07:33:57 +0200
Subject: [PATCH] early-access version 1606

---
 README.md              |  2 +-
 src/yuzu/game_list.cpp | 21 +++++++++++----------
 src/yuzu/game_list_p.h |  4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index efa59c126..34f42ace3 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 1605.
+This is the source code for early-access 1606.
 
 ## Legal Notice
 
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index 4e5d7aeba..48b78d65f 100755
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -85,7 +85,7 @@ void GameListSearchField::setFilterResult(int visible, int total) {
     label_filter_result->setText(tr("%1 of %n result(s)", "", total).arg(visible));
 }
 
-bool GameListSearchField::SearchFieldEmpty() const {
+bool GameListSearchField::isEmpty() const {
     return edit_filter->text().isEmpty();
 }
 
@@ -446,7 +446,7 @@ void GameList::DonePopulating(const QStringList& watch_list) {
     tree_view->setRowHidden(0, item_model->invisibleRootItem()->index(),
                             UISettings::values.favorited_ids.size() == 0);
     tree_view->expand(item_model->invisibleRootItem()->child(0)->index());
-    for (u64 id : UISettings::values.favorited_ids) {
+    for (const auto id : UISettings::values.favorited_ids) {
         AddFavorite(id);
     }
 
@@ -649,7 +649,7 @@ void GameList::AddFavoritesPopup(QMenu& context_menu) {
     QAction* clear_all = context_menu.addAction(tr("Clear"));
 
     connect(clear_all, &QAction::triggered, [this] {
-        for (u64 id : UISettings::values.favorited_ids) {
+        for (const auto id : UISettings::values.favorited_ids) {
             RemoveFavorite(id);
         }
         UISettings::values.favorited_ids.clear();
@@ -774,7 +774,7 @@ void GameList::RefreshGameDirectory() {
 void GameList::ToggleFavorite(u64 program_id) {
     if (!UISettings::values.favorited_ids.contains(program_id)) {
         tree_view->setRowHidden(0, item_model->invisibleRootItem()->index(),
-                                !search_field->SearchFieldEmpty());
+                                !search_field->isEmpty());
         UISettings::values.favorited_ids.append(program_id);
         AddFavorite(program_id);
         item_model->sort(tree_view->header()->sortIndicatorSection(),
@@ -789,12 +789,13 @@ void GameList::ToggleFavorite(u64 program_id) {
 }
 
 void GameList::AddFavorite(u64 program_id) {
-    const auto favorites_row = item_model->item(0);
+    auto* favorites_row = item_model->item(0);
 
     for (int i = 1; i < item_model->rowCount() - 1; i++) {
-        const auto folder = item_model->item(i);
+        const auto* folder = item_model->item(i);
         for (int j = 0; j < folder->rowCount(); j++) {
-            if (folder->child(j)->data(GameListItemPath::ProgramIdRole) == program_id) {
+            if (folder->child(j)->data(GameListItemPath::ProgramIdRole).toULongLong() ==
+                program_id) {
                 QList<QStandardItem*> list;
                 for (int k = 0; k < item_model->columnCount(); k++) {
                     list.append(folder->child(j, k)->clone());
@@ -811,11 +812,11 @@ void GameList::AddFavorite(u64 program_id) {
 }
 
 void GameList::RemoveFavorite(u64 program_id) {
-    const auto favorites_row = item_model->item(0);
+    auto* favorites_row = item_model->item(0);
 
     for (int i = 0; i < favorites_row->rowCount(); i++) {
-        const auto game = favorites_row->child(i);
-        if (game->data(GameListItemPath::ProgramIdRole) == program_id) {
+        const auto* game = favorites_row->child(i);
+        if (game->data(GameListItemPath::ProgramIdRole).toULongLong() == program_id) {
             favorites_row->removeRow(i);
             return;
         }
diff --git a/src/yuzu/game_list_p.h b/src/yuzu/game_list_p.h
index 7f5818627..7ca8ece23 100755
--- a/src/yuzu/game_list_p.h
+++ b/src/yuzu/game_list_p.h
@@ -30,7 +30,7 @@ enum class GameListItemType {
     UserNandDir = QStandardItem::UserType + 4,
     SysNandDir = QStandardItem::UserType + 5,
     AddDir = QStandardItem::UserType + 6,
-    Favorites = QStandardItem::UserType + 7
+    Favorites = QStandardItem::UserType + 7,
 };
 
 Q_DECLARE_METATYPE(GameListItemType);
@@ -347,7 +347,7 @@ public:
     explicit GameListSearchField(GameList* parent = nullptr);
 
     void setFilterResult(int visible, int total);
-    bool SearchFieldEmpty() const;
+    bool isEmpty() const;
 
     void clear();
     void setFocus();