Merge pull request #4985 from FearlessTobi/port-2942

Port yuzu-emu/yuzu#2942: "Silence miscellaneous warnings"

src/citra_qt/game_list.cpp

@@ -258,6 +258,8 @@ void GameList::onUpdateThemedIcons() {
         case GameListItemType::AddDir:
             child->setData(QIcon::fromTheme("plus").pixmap(48), Qt::DecorationRole);
             break;
+        default:
+            break;
         }
     }
 }
@@ -371,6 +373,8 @@ void GameList::ValidateEntry(const QModelIndex& item) {
     case GameListItemType::AddDir:
         emit AddDirectory();
         break;
+    default:
+        break;
     }
 }
 
@@ -442,6 +446,8 @@ void GameList::PopupContextMenu(const QPoint& menu_location) {
     case GameListItemType::SystemDir:
         AddPermDirPopup(context_menu, selected);
         break;
+    default:
+        break;
     }
     context_menu.exec(tree_view->viewport()->mapToGlobal(menu_location));
 }

src/citra_qt/game_list_p.h

@@ -361,14 +361,17 @@ public:
             setData(QIcon::fromTheme(QStringLiteral("chip")).pixmap(icon_size), Qt::DecorationRole);
             setData(QObject::tr("System Titles"), Qt::DisplayRole);
             break;
-        case GameListItemType::CustomDir:
+        case GameListItemType::CustomDir: {
             QString icon_name = QFileInfo::exists(game_dir->path) ? QStringLiteral("folder")
                                                                   : QStringLiteral("bad_folder");
             setData(QIcon::fromTheme(icon_name).pixmap(icon_size), Qt::DecorationRole);
             setData(game_dir->path, Qt::DisplayRole);
             break;
-        };
+        }
-    };
+        default:
+            break;
+        }
+    }
 
     int type() const override {
         return static_cast<int>(dir_type);

src/citra_qt/game_list_worker.cpp

@@ -135,7 +135,7 @@ void GameListWorker::run() {
             watch_list.append(games_path);
             watch_list.append(demos_path);
             auto* const game_list_dir = new GameListDir(game_dir, GameListItemType::InstalledDir);
-            emit DirEntryReady({game_list_dir});
+            emit DirEntryReady(game_list_dir);
             AddFstEntriesToGameList(games_path.toStdString(), 2, game_list_dir);
             AddFstEntriesToGameList(demos_path.toStdString(), 2, game_list_dir);
         } else if (game_dir.path == "SYSTEM") {
@@ -144,12 +144,12 @@ void GameListWorker::run() {
                 "00000000000000000000000000000000/title/00040010";
             watch_list.append(path);
             auto* const game_list_dir = new GameListDir(game_dir, GameListItemType::SystemDir);
-            emit DirEntryReady({game_list_dir});
+            emit DirEntryReady(game_list_dir);
             AddFstEntriesToGameList(path.toStdString(), 2, game_list_dir);
         } else {
             watch_list.append(game_dir.path);
             auto* const game_list_dir = new GameListDir(game_dir);
-            emit DirEntryReady({game_list_dir});
+            emit DirEntryReady(game_list_dir);
             AddFstEntriesToGameList(game_dir.path.toStdString(), game_dir.deep_scan ? 256 : 0,
                                     game_list_dir);
         }

src/citra_qt/game_list_worker.h

@@ -56,8 +56,9 @@ private:
     void AddFstEntriesToGameList(const std::string& dir_path, unsigned int recursion,
                                  GameListDir* parent_dir);
 
-    QStringList watch_list;
-    const CompatibilityList& compatibility_list;
     QVector<UISettings::GameDir>& game_dirs;
+    const CompatibilityList& compatibility_list;
+
+    QStringList watch_list;
     std::atomic_bool stop_processing;
 };