N-archive/suyu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

game_list: Eliminate variable shadowing

Browse source
This commit is contained in:
Morph 2022-06-13 16:52:19 -04:00
parent 8b55f2c615
commit e29e8eec2f
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/yuzu/game_list.cpp
View file

@ -28,8 +28,8 @@
#include "yuzu/uisettings.h" #include "yuzu/uisettings.h"
#include "yuzu/util/controller_navigation.h" #include "yuzu/util/controller_navigation.h"
GameListSearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist, QObject* parent) GameListSearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist_, QObject* parent)
: QObject(parent), gamelist{gamelist} {} : QObject(parent), gamelist{gamelist_} {}
// EventFilter in order to process systemkeys while editing the searchfield // EventFilter in order to process systemkeys while editing the searchfield
bool GameListSearchField::KeyReleaseEater::eventFilter(QObject* obj, QEvent* event) { bool GameListSearchField::KeyReleaseEater::eventFilter(QObject* obj, QEvent* event) {
@ -309,9 +309,9 @@ void GameList::OnFilterCloseClicked() {
main_window->filterBarSetChecked(false); main_window->filterBarSetChecked(false);
} }
GameList::GameList(FileSys::VirtualFilesystem vfs, FileSys::ManualContentProvider* provider, GameList::GameList(FileSys::VirtualFilesystem vfs_, FileSys::ManualContentProvider* provider_,
Core::System& system_, GMainWindow* parent) Core::System& system_, GMainWindow* parent)
: QWidget{parent}, vfs(std::move(vfs)), provider(provider), system{system_} { : QWidget{parent}, vfs{std::move(vfs_)}, provider{provider_}, system{system_} {
watcher = new QFileSystemWatcher(this); watcher = new QFileSystemWatcher(this);
connect(watcher, &QFileSystemWatcher::directoryChanged, this, &GameList::RefreshGameDirectory); connect(watcher, &QFileSystemWatcher::directoryChanged, this, &GameList::RefreshGameDirectory);

4
src/yuzu/game_list.h
View file

@ -67,8 +67,8 @@ public:
COLUMN_COUNT, // Number of columns COLUMN_COUNT, // Number of columns
}; };
explicit GameList(std::shared_ptr<FileSys::VfsFilesystem> vfs, explicit GameList(std::shared_ptr<FileSys::VfsFilesystem> vfs_,
FileSys::ManualContentProvider* provider, Core::System& system_, FileSys::ManualContentProvider* provider_, Core::System& system_,
GMainWindow* parent = nullptr); GMainWindow* parent = nullptr);
~GameList() override; ~GameList() override;

6
src/yuzu/game_list_p.h
View file

@ -225,8 +225,8 @@ public:
static constexpr int GameDirRole = Qt::UserRole + 2; static constexpr int GameDirRole = Qt::UserRole + 2;
explicit GameListDir(UISettings::GameDir& directory, explicit GameListDir(UISettings::GameDir& directory,
GameListItemType dir_type = GameListItemType::CustomDir) GameListItemType dir_type_ = GameListItemType::CustomDir)
: dir_type{dir_type} { : dir_type{dir_type_} {
setData(type(), TypeRole); setData(type(), TypeRole);
UISettings::GameDir* game_dir = &directory; UISettings::GameDir* game_dir = &directory;
@ -356,7 +356,7 @@ public:
private: private:
class KeyReleaseEater : public QObject { class KeyReleaseEater : public QObject {
public: public:
explicit KeyReleaseEater(GameList* gamelist, QObject* parent = nullptr); explicit KeyReleaseEater(GameList* gamelist_, QObject* parent = nullptr);
private: private:
GameList* gamelist = nullptr; GameList* gamelist = nullptr;

12
src/yuzu/game_list_worker.cpp
View file

@ -223,12 +223,12 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri
} }
} // Anonymous namespace } // Anonymous namespace
GameListWorker::GameListWorker(FileSys::VirtualFilesystem vfs, GameListWorker::GameListWorker(FileSys::VirtualFilesystem vfs_,
FileSys::ManualContentProvider* provider, FileSys::ManualContentProvider* provider_,
QVector<UISettings::GameDir>& game_dirs, QVector<UISettings::GameDir>& game_dirs_,
const CompatibilityList& compatibility_list, Core::System& system_) const CompatibilityList& compatibility_list_, Core::System& system_)
: vfs(std::move(vfs)), provider(provider), game_dirs(game_dirs), : vfs{std::move(vfs_)}, provider{provider_}, game_dirs{game_dirs_},
compatibility_list(compatibility_list), system{system_} {} compatibility_list{compatibility_list_}, system{system_} {}
GameListWorker::~GameListWorker() = default; GameListWorker::~GameListWorker() = default;

8
src/yuzu/game_list_worker.h
View file

@ -33,10 +33,10 @@ class GameListWorker : public QObject, public QRunnable {
Q_OBJECT Q_OBJECT
public: public:
explicit GameListWorker(std::shared_ptr<FileSys::VfsFilesystem> vfs, explicit GameListWorker(std::shared_ptr<FileSys::VfsFilesystem> vfs_,
FileSys::ManualContentProvider* provider, FileSys::ManualContentProvider* provider_,
QVector<UISettings::GameDir>& game_dirs, QVector<UISettings::GameDir>& game_dirs_,
const CompatibilityList& compatibility_list, Core::System& system_); const CompatibilityList& compatibility_list_, Core::System& system_);
~GameListWorker() override; ~GameListWorker() override;
/// Starts the processing of directory tree information. /// Starts the processing of directory tree information.