summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/am/applets
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-05-21 07:05:04 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-06-02 06:39:27 +0200
commit12c1766997f2596b4b1b1a6a411e4f6d56605ee7 (patch)
treee718a0f18be8aaf664ebdcd197af513e5a118b72 /src/core/hle/service/am/applets
parentMerge pull request #6395 from lioncash/result-move (diff)
downloadyuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.gz
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.bz2
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.lz
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.xz
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.tar.zst
yuzu-12c1766997f2596b4b1b1a6a411e4f6d56605ee7.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/am/applets/controller.h2
-rw-r--r--src/core/hle/service/am/applets/error.cpp2
-rw-r--r--src/core/hle/service/am/applets/error.h2
-rw-r--r--src/core/hle/service/am/applets/general_backend.cpp6
-rw-r--r--src/core/hle/service/am/applets/profile_select.cpp2
-rw-r--r--src/core/hle/service/am/applets/profile_select.h2
-rw-r--r--src/core/hle/service/am/applets/software_keyboard.cpp2
-rw-r--r--src/core/hle/service/am/applets/software_keyboard.h2
-rw-r--r--src/core/hle/service/am/applets/web_browser.h2
9 files changed, 11 insertions, 11 deletions
diff --git a/src/core/hle/service/am/applets/controller.h b/src/core/hle/service/am/applets/controller.h
index 2d4dae0bd..20617e91f 100644
--- a/src/core/hle/service/am/applets/controller.h
+++ b/src/core/hle/service/am/applets/controller.h
@@ -129,7 +129,7 @@ private:
ControllerSupportArgNew controller_user_arg_new;
ControllerUpdateFirmwareArg controller_update_arg;
bool complete{false};
- ResultCode status{RESULT_SUCCESS};
+ ResultCode status{ResultSuccess};
bool is_single_mode{false};
std::vector<u8> out_data;
};
diff --git a/src/core/hle/service/am/applets/error.cpp b/src/core/hle/service/am/applets/error.cpp
index 08348b180..c724e5d5b 100644
--- a/src/core/hle/service/am/applets/error.cpp
+++ b/src/core/hle/service/am/applets/error.cpp
@@ -135,7 +135,7 @@ bool Error::TransactionComplete() const {
}
ResultCode Error::GetStatus() const {
- return RESULT_SUCCESS;
+ return ResultSuccess;
}
void Error::ExecuteInteractive() {
diff --git a/src/core/hle/service/am/applets/error.h b/src/core/hle/service/am/applets/error.h
index e606d12ce..8aa9046a5 100644
--- a/src/core/hle/service/am/applets/error.h
+++ b/src/core/hle/service/am/applets/error.h
@@ -42,7 +42,7 @@ private:
union ErrorArguments;
const Core::Frontend::ErrorApplet& frontend;
- ResultCode error_code = RESULT_SUCCESS;
+ ResultCode error_code = ResultSuccess;
ErrorAppletMode mode = ErrorAppletMode::ShowError;
std::unique_ptr<ErrorArguments> args;
diff --git a/src/core/hle/service/am/applets/general_backend.cpp b/src/core/hle/service/am/applets/general_backend.cpp
index e95499edd..9fcb9f95b 100644
--- a/src/core/hle/service/am/applets/general_backend.cpp
+++ b/src/core/hle/service/am/applets/general_backend.cpp
@@ -76,7 +76,7 @@ bool Auth::TransactionComplete() const {
}
ResultCode Auth::GetStatus() const {
- return successful ? RESULT_SUCCESS : ERROR_INVALID_PIN;
+ return successful ? ResultSuccess : ERROR_INVALID_PIN;
}
void Auth::ExecuteInteractive() {
@@ -175,7 +175,7 @@ bool PhotoViewer::TransactionComplete() const {
}
ResultCode PhotoViewer::GetStatus() const {
- return RESULT_SUCCESS;
+ return ResultSuccess;
}
void PhotoViewer::ExecuteInteractive() {
@@ -229,7 +229,7 @@ bool StubApplet::TransactionComplete() const {
ResultCode StubApplet::GetStatus() const {
LOG_WARNING(Service_AM, "called (STUBBED)");
- return RESULT_SUCCESS;
+ return ResultSuccess;
}
void StubApplet::ExecuteInteractive() {
diff --git a/src/core/hle/service/am/applets/profile_select.cpp b/src/core/hle/service/am/applets/profile_select.cpp
index c91a9776a..37048be26 100644
--- a/src/core/hle/service/am/applets/profile_select.cpp
+++ b/src/core/hle/service/am/applets/profile_select.cpp
@@ -23,7 +23,7 @@ ProfileSelect::~ProfileSelect() = default;
void ProfileSelect::Initialize() {
complete = false;
- status = RESULT_SUCCESS;
+ status = ResultSuccess;
final_data.clear();
Applet::Initialize();
diff --git a/src/core/hle/service/am/applets/profile_select.h b/src/core/hle/service/am/applets/profile_select.h
index f0dd6c1f3..8fb76e6c4 100644
--- a/src/core/hle/service/am/applets/profile_select.h
+++ b/src/core/hle/service/am/applets/profile_select.h
@@ -51,7 +51,7 @@ private:
UserSelectionConfig config;
bool complete = false;
- ResultCode status = RESULT_SUCCESS;
+ ResultCode status = ResultSuccess;
std::vector<u8> final_data;
Core::System& system;
};
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp
index b1a81810b..00dfe1675 100644
--- a/src/core/hle/service/am/applets/software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/software_keyboard.cpp
@@ -658,7 +658,7 @@ void SoftwareKeyboard::InlineTextChanged() {
void SoftwareKeyboard::ExitKeyboard() {
complete = true;
- status = RESULT_SUCCESS;
+ status = ResultSuccess;
frontend.ExitKeyboard();
diff --git a/src/core/hle/service/am/applets/software_keyboard.h b/src/core/hle/service/am/applets/software_keyboard.h
index 7bdef78a7..e3fc733d0 100644
--- a/src/core/hle/service/am/applets/software_keyboard.h
+++ b/src/core/hle/service/am/applets/software_keyboard.h
@@ -160,7 +160,7 @@ private:
bool is_background{false};
bool complete{false};
- ResultCode status{RESULT_SUCCESS};
+ ResultCode status{ResultSuccess};
};
} // namespace Service::AM::Applets
diff --git a/src/core/hle/service/am/applets/web_browser.h b/src/core/hle/service/am/applets/web_browser.h
index cdeaf2c40..9f81214b6 100644
--- a/src/core/hle/service/am/applets/web_browser.h
+++ b/src/core/hle/service/am/applets/web_browser.h
@@ -68,7 +68,7 @@ private:
const Core::Frontend::WebBrowserApplet& frontend;
bool complete{false};
- ResultCode status{RESULT_SUCCESS};
+ ResultCode status{ResultSuccess};
WebAppletVersion web_applet_version{};
WebArgHeader web_arg_header{};