yuzu: Eliminate variable shadowing

This commit is contained in:
Morph 2022-05-26 19:57:35 -04:00
parent 12156b199a
commit b3d6f7bdd8
10 changed files with 25 additions and 25 deletions

View File

@ -364,9 +364,9 @@ void GRenderWindow::RestoreGeometry() {
QWidget::restoreGeometry(geometry);
}
void GRenderWindow::restoreGeometry(const QByteArray& geometry) {
void GRenderWindow::restoreGeometry(const QByteArray& geometry_) {
// Make sure users of this class don't need to deal with backing up the geometry themselves
QWidget::restoreGeometry(geometry);
QWidget::restoreGeometry(geometry_);
BackupGeometry();
}
@ -1014,8 +1014,8 @@ QStringList GRenderWindow::GetUnsupportedGLExtensions() const {
return unsupported_ext;
}
void GRenderWindow::OnEmulationStarting(EmuThread* emu_thread) {
this->emu_thread = emu_thread;
void GRenderWindow::OnEmulationStarting(EmuThread* emu_thread_) {
emu_thread = emu_thread_;
}
void GRenderWindow::OnEmulationStopping() {

View File

@ -56,12 +56,12 @@ public:
/**
* Sets whether the emulation thread is running or not
* @param running Boolean value, set the emulation thread to running if true
* @param running_ Boolean value, set the emulation thread to running if true
* @note This function is thread-safe
*/
void SetRunning(bool running) {
void SetRunning(bool running_) {
std::unique_lock lock{running_mutex};
this->running = running;
running = running_;
lock.unlock();
running_cv.notify_all();
if (!running) {
@ -138,7 +138,7 @@ public:
void BackupGeometry();
void RestoreGeometry();
void restoreGeometry(const QByteArray& geometry); // overridden
void restoreGeometry(const QByteArray& geometry_); // overridden
QByteArray saveGeometry(); // overridden
qreal windowPixelRatio() const;
@ -189,7 +189,7 @@ public:
void Exit();
public slots:
void OnEmulationStarting(EmuThread* emu_thread);
void OnEmulationStarting(EmuThread* emu_thread_);
void OnEmulationStopping();
void OnFramebufferSizeChanged();

View File

@ -116,8 +116,8 @@ void ConfigurePerGame::HandleApplyButtonClicked() {
ApplyConfiguration();
}
void ConfigurePerGame::LoadFromFile(FileSys::VirtualFile file) {
this->file = std::move(file);
void ConfigurePerGame::LoadFromFile(FileSys::VirtualFile file_) {
file = std::move(file_);
LoadConfiguration();
}

View File

@ -46,7 +46,7 @@ public:
/// Save all button configurations to settings file
void ApplyConfiguration();
void LoadFromFile(FileSys::VirtualFile file);
void LoadFromFile(FileSys::VirtualFile file_);
private:
void changeEvent(QEvent* event) override;

View File

@ -89,8 +89,8 @@ void ConfigurePerGameAddons::ApplyConfiguration() {
Settings::values.disabled_addons[title_id] = disabled_addons;
}
void ConfigurePerGameAddons::LoadFromFile(FileSys::VirtualFile file) {
this->file = std::move(file);
void ConfigurePerGameAddons::LoadFromFile(FileSys::VirtualFile file_) {
file = std::move(file_);
LoadConfiguration();
}

View File

@ -35,7 +35,7 @@ public:
/// Save all button configurations to settings file
void ApplyConfiguration();
void LoadFromFile(FileSys::VirtualFile file);
void LoadFromFile(FileSys::VirtualFile file_);
void SetTitleId(u64 id);

View File

@ -80,9 +80,9 @@ bool GameListSearchField::KeyReleaseEater::eventFilter(QObject* obj, QEvent* eve
return QObject::eventFilter(obj, event);
}
void GameListSearchField::setFilterResult(int visible, int total) {
this->visible = visible;
this->total = total;
void GameListSearchField::setFilterResult(int visible_, int total_) {
visible = visible_;
total = total_;
label_filter_result->setText(tr("%1 of %n result(s)", "", total).arg(visible));
}

View File

@ -348,7 +348,7 @@ public:
explicit GameListSearchField(GameList* parent = nullptr);
QString filterText() const;
void setFilterResult(int visible, int total);
void setFilterResult(int visible_, int total_);
void clear();
void setFocus();

View File

@ -1442,7 +1442,7 @@ bool GMainWindow::LoadROM(const QString& filename, u64 program_id, std::size_t p
}
return false;
}
game_path = filename;
current_game_path = filename;
system->TelemetrySession().AddField(Common::Telemetry::FieldType::App, "Frontend", "Qt");
return true;
@ -1641,7 +1641,7 @@ void GMainWindow::ShutdownGame() {
emu_frametime_label->setVisible(false);
renderer_status_button->setEnabled(!UISettings::values.has_broken_vulkan);
game_path.clear();
current_game_path.clear();
// When closing the game, destroy the GLWindow to clear the context after the game is closed
render_window->ReleaseRenderTarget();
@ -2560,7 +2560,7 @@ void GMainWindow::OnRestartGame() {
return;
}
// Make a copy since BootGame edits game_path
BootGame(QString(game_path));
BootGame(QString(current_game_path));
}
void GMainWindow::OnPauseGame() {
@ -2989,7 +2989,7 @@ void GMainWindow::OnToggleAdaptingFilter() {
void GMainWindow::OnConfigurePerGame() {
const u64 title_id = system->GetCurrentProcessProgramID();
OpenPerGameConfiguration(title_id, game_path.toStdString());
OpenPerGameConfiguration(title_id, current_game_path.toStdString());
}
void GMainWindow::OpenPerGameConfiguration(u64 title_id, const std::string& file_name) {

View File

@ -369,7 +369,7 @@ private:
bool emulation_running = false;
std::unique_ptr<EmuThread> emu_thread;
// The path to the game currently running
QString game_path;
QString current_game_path;
bool auto_paused = false;
bool auto_muted = false;