From 5d1d0b36931ee29b7a5737c51405c7389f53dc10 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sat, 2 Nov 2019 18:55:08 +0100 Subject: [PATCH 1/2] yuzu/game_list_worker: Silence warnings Co-Authored-By: Rodrigo Locatti --- src/citra_qt/game_list_worker.cpp | 6 +++--- src/citra_qt/game_list_worker.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/citra_qt/game_list_worker.cpp b/src/citra_qt/game_list_worker.cpp index 13ba8c676..1b9769b94 100644 --- a/src/citra_qt/game_list_worker.cpp +++ b/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); } diff --git a/src/citra_qt/game_list_worker.h b/src/citra_qt/game_list_worker.h index 91adbd212..4decfa37f 100644 --- a/src/citra_qt/game_list_worker.h +++ b/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& game_dirs; + const CompatibilityList& compatibility_list; + + QStringList watch_list; std::atomic_bool stop_processing; }; From 5e98835b5ffb16867492cf09a989b5fb5df791af Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sat, 2 Nov 2019 18:56:23 +0100 Subject: [PATCH 2/2] yuzu/game_list: Silence -Wswitch Co-Authored-By: Rodrigo Locatti --- src/citra_qt/game_list.cpp | 6 ++++++ src/citra_qt/game_list_p.h | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 933077a7e..d137d8472 100644 --- a/src/citra_qt/game_list.cpp +++ b/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)); } diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h index fb64c34c0..0387b0cf7 100644 --- a/src/citra_qt/game_list_p.h +++ b/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(dir_type);