From 50a59487eb49baa229d553dd9a3c00aef20f799f Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Sat, 25 Mar 2023 13:29:08 -0400
Subject: qt: implement RequestExit for applets

---
 src/core/hle/service/am/applets/applet_cabinet.cpp           | 2 +-
 src/core/hle/service/am/applets/applet_controller.cpp        | 2 +-
 src/core/hle/service/am/applets/applet_error.cpp             | 2 +-
 src/core/hle/service/am/applets/applet_general_backend.cpp   | 4 ++--
 src/core/hle/service/am/applets/applet_mii_edit.cpp          | 2 +-
 src/core/hle/service/am/applets/applet_profile_select.cpp    | 2 +-
 src/core/hle/service/am/applets/applet_software_keyboard.cpp | 2 +-
 src/core/hle/service/am/applets/applet_web_browser.cpp       | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/core/hle/service')

diff --git a/src/core/hle/service/am/applets/applet_cabinet.cpp b/src/core/hle/service/am/applets/applet_cabinet.cpp
index d76a9ef5a..93c9f2a55 100644
--- a/src/core/hle/service/am/applets/applet_cabinet.cpp
+++ b/src/core/hle/service/am/applets/applet_cabinet.cpp
@@ -175,7 +175,7 @@ void Cabinet::Cancel() {
 }
 
 Result Cabinet::RequestExit() {
-    this->Cancel();
+    frontend.Close();
     R_SUCCEED();
 }
 
diff --git a/src/core/hle/service/am/applets/applet_controller.cpp b/src/core/hle/service/am/applets/applet_controller.cpp
index 11b64dbbd..2d1d115d7 100644
--- a/src/core/hle/service/am/applets/applet_controller.cpp
+++ b/src/core/hle/service/am/applets/applet_controller.cpp
@@ -263,7 +263,7 @@ void Controller::ConfigurationComplete() {
 }
 
 Result Controller::RequestExit() {
-    this->ConfigurationComplete();
+    frontend.Close();
     R_SUCCEED();
 }
 
diff --git a/src/core/hle/service/am/applets/applet_error.cpp b/src/core/hle/service/am/applets/applet_error.cpp
index d6935c09d..b46ea840c 100644
--- a/src/core/hle/service/am/applets/applet_error.cpp
+++ b/src/core/hle/service/am/applets/applet_error.cpp
@@ -210,7 +210,7 @@ void Error::DisplayCompleted() {
 }
 
 Result Error::RequestExit() {
-    this->DisplayCompleted();
+    frontend.Close();
     R_SUCCEED();
 }
 
diff --git a/src/core/hle/service/am/applets/applet_general_backend.cpp b/src/core/hle/service/am/applets/applet_general_backend.cpp
index baf680040..8b352020e 100644
--- a/src/core/hle/service/am/applets/applet_general_backend.cpp
+++ b/src/core/hle/service/am/applets/applet_general_backend.cpp
@@ -151,7 +151,7 @@ void Auth::AuthFinished(bool is_successful) {
 }
 
 Result Auth::RequestExit() {
-    this->AuthFinished(false);
+    frontend.Close();
     R_SUCCEED();
 }
 
@@ -208,7 +208,7 @@ void PhotoViewer::ViewFinished() {
 }
 
 Result PhotoViewer::RequestExit() {
-    this->ViewFinished();
+    frontend.Close();
     R_SUCCEED();
 }
 
diff --git a/src/core/hle/service/am/applets/applet_mii_edit.cpp b/src/core/hle/service/am/applets/applet_mii_edit.cpp
index a4a3f3cfa..d1f652c09 100644
--- a/src/core/hle/service/am/applets/applet_mii_edit.cpp
+++ b/src/core/hle/service/am/applets/applet_mii_edit.cpp
@@ -136,7 +136,7 @@ void MiiEdit::MiiEditOutputForCharInfoEditing(MiiEditResult result,
 }
 
 Result MiiEdit::RequestExit() {
-    this->MiiEditOutput(MiiEditResult::Cancel, -1);
+    frontend.Close();
     R_SUCCEED();
 }
 
diff --git a/src/core/hle/service/am/applets/applet_profile_select.cpp b/src/core/hle/service/am/applets/applet_profile_select.cpp
index 5486d80dc..07abc2563 100644
--- a/src/core/hle/service/am/applets/applet_profile_select.cpp
+++ b/src/core/hle/service/am/applets/applet_profile_select.cpp
@@ -74,7 +74,7 @@ void ProfileSelect::SelectionComplete(std::optional<Common::UUID> uuid) {
 }
 
 Result ProfileSelect::RequestExit() {
-    this->SelectionComplete(std::nullopt);
+    frontend.Close();
     R_SUCCEED();
 }
 
diff --git a/src/core/hle/service/am/applets/applet_software_keyboard.cpp b/src/core/hle/service/am/applets/applet_software_keyboard.cpp
index 6f7499731..4145bb84f 100644
--- a/src/core/hle/service/am/applets/applet_software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/applet_software_keyboard.cpp
@@ -771,7 +771,7 @@ void SoftwareKeyboard::ExitKeyboard() {
 }
 
 Result SoftwareKeyboard::RequestExit() {
-    this->ExitKeyboard();
+    frontend.Close();
     R_SUCCEED();
 }
 
diff --git a/src/core/hle/service/am/applets/applet_web_browser.cpp b/src/core/hle/service/am/applets/applet_web_browser.cpp
index 59359e4d3..2accf7898 100644
--- a/src/core/hle/service/am/applets/applet_web_browser.cpp
+++ b/src/core/hle/service/am/applets/applet_web_browser.cpp
@@ -364,7 +364,7 @@ void WebBrowser::WebBrowserExit(WebExitReason exit_reason, std::string last_url)
 }
 
 Result WebBrowser::RequestExit() {
-    this->WebBrowserExit(WebExitReason::ExitRequested);
+    frontend.Close();
     R_SUCCEED();
 }
 
-- 
cgit v1.2.3