diff options
author | Lioncash <mathew1800@gmail.com> | 2022-12-06 00:56:47 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2022-12-06 01:06:04 +0100 |
commit | d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3 (patch) | |
tree | 2d4961867fba4f10b6bc2a6695a660ef79cdd9d3 /src/core | |
parent | applets/mii_edit: Use aliases for callbacks (diff) | |
download | yuzu-d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3.tar yuzu-d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3.tar.gz yuzu-d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3.tar.bz2 yuzu-d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3.tar.lz yuzu-d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3.tar.xz yuzu-d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3.tar.zst yuzu-d8da9a2afdff6b3aa2f8c2ac80083353fcaab8b3.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/frontend/applets/error.cpp | 6 | ||||
-rw-r--r-- | src/core/frontend/applets/error.h | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/core/frontend/applets/error.cpp b/src/core/frontend/applets/error.cpp index f8b961098..69c2b2b4d 100644 --- a/src/core/frontend/applets/error.cpp +++ b/src/core/frontend/applets/error.cpp @@ -8,13 +8,13 @@ namespace Core::Frontend { ErrorApplet::~ErrorApplet() = default; -void DefaultErrorApplet::ShowError(Result error, std::function<void()> finished) const { +void DefaultErrorApplet::ShowError(Result error, FinishedCallback finished) const { LOG_CRITICAL(Service_Fatal, "Application requested error display: {:04}-{:04} (raw={:08X})", error.module.Value(), error.description.Value(), error.raw); } void DefaultErrorApplet::ShowErrorWithTimestamp(Result error, std::chrono::seconds time, - std::function<void()> finished) const { + FinishedCallback finished) const { LOG_CRITICAL( Service_Fatal, "Application requested error display: {:04X}-{:04X} (raw={:08X}) with timestamp={:016X}", @@ -23,7 +23,7 @@ void DefaultErrorApplet::ShowErrorWithTimestamp(Result error, std::chrono::secon void DefaultErrorApplet::ShowCustomErrorText(Result error, std::string main_text, std::string detail_text, - std::function<void()> finished) const { + FinishedCallback finished) const { LOG_CRITICAL(Service_Fatal, "Application requested custom error with error_code={:04X}-{:04X} (raw={:08X})", error.module.Value(), error.description.Value(), error.raw); diff --git a/src/core/frontend/applets/error.h b/src/core/frontend/applets/error.h index f378f8805..884f2f653 100644 --- a/src/core/frontend/applets/error.h +++ b/src/core/frontend/applets/error.h @@ -12,25 +12,27 @@ namespace Core::Frontend { class ErrorApplet { public: + using FinishedCallback = std::function<void()>; + virtual ~ErrorApplet(); - virtual void ShowError(Result error, std::function<void()> finished) const = 0; + virtual void ShowError(Result error, FinishedCallback finished) const = 0; virtual void ShowErrorWithTimestamp(Result error, std::chrono::seconds time, - std::function<void()> finished) const = 0; + FinishedCallback finished) const = 0; virtual void ShowCustomErrorText(Result error, std::string dialog_text, std::string fullscreen_text, - std::function<void()> finished) const = 0; + FinishedCallback finished) const = 0; }; class DefaultErrorApplet final : public ErrorApplet { public: - void ShowError(Result error, std::function<void()> finished) const override; + void ShowError(Result error, FinishedCallback finished) const override; void ShowErrorWithTimestamp(Result error, std::chrono::seconds time, - std::function<void()> finished) const override; + FinishedCallback finished) const override; void ShowCustomErrorText(Result error, std::string main_text, std::string detail_text, - std::function<void()> finished) const override; + FinishedCallback finished) const override; }; } // namespace Core::Frontend |