Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4985 from FearlessTobi/port-2942

Browse source 
Port yuzu-emu/yuzu#2942: "Silence miscellaneous warnings"
This commit is contained in:
Weiyi Wang 2019-11-08 23:42:32 -05:00 • committed by GitHub
commit 34c6b7ca48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/citra_qt/game_list.cpp
View file

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

9
src/citra_qt/game_list_p.h
View file

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

6
src/citra_qt/game_list_worker.cpp
View file

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

5
src/citra_qt/game_list_worker.h
View file

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