From 8d6927dc4ceabcc18c4db2453e172056a5aa7307 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 15 Aug 2020 11:14:09 -0400 Subject: [PATCH] yuzu: Resolve -Wextra-semi warnings While we're in the same area, we can ensure GameDir member variables are always initialized to consistent values. --- src/citra_qt/game_list.cpp | 2 +- src/citra_qt/game_list_worker.cpp | 3 ++- src/citra_qt/uisettings.h | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index e4e0c5788..6c7fbe789 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -391,7 +391,7 @@ bool GameList::isEmpty() const { (type == GameListItemType::InstalledDir || type == GameListItemType::SystemDir)) { item_model->invisibleRootItem()->removeRow(child->row()); i--; - }; + } } return !item_model->invisibleRootItem()->hasChildren(); } diff --git a/src/citra_qt/game_list_worker.cpp b/src/citra_qt/game_list_worker.cpp index f03244637..5f73a901c 100644 --- a/src/citra_qt/game_list_worker.cpp +++ b/src/citra_qt/game_list_worker.cpp @@ -152,7 +152,8 @@ void GameListWorker::run() { AddFstEntriesToGameList(game_dir.path.toStdString(), game_dir.deep_scan ? 256 : 0, game_list_dir); } - }; + } + emit Finished(watch_list); } diff --git a/src/citra_qt/uisettings.h b/src/citra_qt/uisettings.h index a54bc3ee7..2031eb384 100644 --- a/src/citra_qt/uisettings.h +++ b/src/citra_qt/uisettings.h @@ -30,14 +30,14 @@ extern const Themes themes; struct GameDir { QString path; - bool deep_scan; - bool expanded; + bool deep_scan = false; + bool expanded = false; bool operator==(const GameDir& rhs) const { return path == rhs.path; - }; + } bool operator!=(const GameDir& rhs) const { return !operator==(rhs); - }; + } }; enum class GameListIconSize {