diff options
author | bunnei <bunneidev@gmail.com> | 2020-12-08 17:43:59 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 17:43:59 -0800 |
commit | 05a703e15d37265523b7f804e066a80ba14f0096 (patch) | |
tree | 8c388c1e0e575c375bb61fcb355186b98745f805 /src/yuzu/applets/error.cpp | |
parent | aeb100cffe2495d35f4d38d4212e7a101b0d600f (diff) | |
parent | f6d4a289d53516789ceb5f90f086ffe8b2822115 (diff) |
Merge pull request #5135 from Morph1984/applets-shadow
applets: Resolve variable shadowing
Diffstat (limited to 'src/yuzu/applets/error.cpp')
-rw-r--r-- | src/yuzu/applets/error.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu/applets/error.cpp b/src/yuzu/applets/error.cpp index 08ed57355..53a993cf6 100644 --- a/src/yuzu/applets/error.cpp +++ b/src/yuzu/applets/error.cpp @@ -17,7 +17,7 @@ QtErrorDisplay::QtErrorDisplay(GMainWindow& parent) { QtErrorDisplay::~QtErrorDisplay() = default; void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) const { - this->callback = std::move(finished); + callback = std::move(finished); emit MainWindowDisplayError( tr("An error has occured.\nPlease try again or contact the developer of the " "software.\n\nError Code: %1-%2 (0x%3)") @@ -28,7 +28,7 @@ void QtErrorDisplay::ShowError(ResultCode error, std::function<void()> finished) void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::seconds time, std::function<void()> finished) const { - this->callback = std::move(finished); + callback = std::move(finished); const QDateTime date_time = QDateTime::fromSecsSinceEpoch(time.count()); emit MainWindowDisplayError( @@ -44,7 +44,7 @@ void QtErrorDisplay::ShowErrorWithTimestamp(ResultCode error, std::chrono::secon void QtErrorDisplay::ShowCustomErrorText(ResultCode error, std::string dialog_text, std::string fullscreen_text, std::function<void()> finished) const { - this->callback = std::move(finished); + callback = std::move(finished); emit MainWindowDisplayError( tr("An error has occured.\nError Code: %1-%2 (0x%3)\n\n%4\n\n%5") .arg(static_cast<u32>(error.module.Value()) + 2000, 4, 10, QChar::fromLatin1('0')) |