citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-24 19:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5531 from FearlessTobi/port-4536

Browse source 
Port yuzu-emu/yuzu#4536: "yuzu: Resolve -Wextra-semi warnings"
This commit is contained in:
Marshall Mohror 2020-08-28 13:29:22 -05:00 committed by GitHub
parent f2d26eb73b 8d6927dc4c
commit 69f4aacccf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/citra_qt/game_list.cpp
View file

@ -391,7 +391,7 @@ bool GameList::isEmpty() const {
(type == GameListItemType::InstalledDir || type == GameListItemType::SystemDir)) { (type == GameListItemType::InstalledDir || type == GameListItemType::SystemDir)) {
item_model->invisibleRootItem()->removeRow(child->row()); item_model->invisibleRootItem()->removeRow(child->row());
i--; i--;
}; }
} }
return !item_model->invisibleRootItem()->hasChildren(); return !item_model->invisibleRootItem()->hasChildren();
} }

3
src/citra_qt/game_list_worker.cpp
View file

@ -152,7 +152,8 @@ void GameListWorker::run() {
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);
} }
}; }
emit Finished(watch_list); emit Finished(watch_list);
} }

8
src/citra_qt/uisettings.h
View file

@ -30,14 +30,14 @@ extern const Themes themes;
struct GameDir { struct GameDir {
QString path; QString path;
bool deep_scan; bool deep_scan = false;
bool expanded; bool expanded = false;
bool operator==(const GameDir& rhs) const { bool operator==(const GameDir& rhs) const {
return path == rhs.path; return path == rhs.path;
}; }
bool operator!=(const GameDir& rhs) const { bool operator!=(const GameDir& rhs) const {
return !operator==(rhs); return !operator==(rhs);
}; }
}; };
enum class GameListIconSize { enum class GameListIconSize {