summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/am/applets/software_keyboard.cpp
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-03-12 00:35:01 +0100
committerZach Hilman <zachhilman@gmail.com>2019-04-17 17:35:24 +0200
commitd273bec68fd867f047944ab9d28ac5c5c6617571 (patch)
tree92efbacd5d67fa1ed73afcdff18d8a22fce3b8d0 /src/core/hle/service/am/applets/software_keyboard.cpp
parentweb_browser: Make OpenPage const (diff)
downloadyuzu-d273bec68fd867f047944ab9d28ac5c5c6617571.tar
yuzu-d273bec68fd867f047944ab9d28ac5c5c6617571.tar.gz
yuzu-d273bec68fd867f047944ab9d28ac5c5c6617571.tar.bz2
yuzu-d273bec68fd867f047944ab9d28ac5c5c6617571.tar.lz
yuzu-d273bec68fd867f047944ab9d28ac5c5c6617571.tar.xz
yuzu-d273bec68fd867f047944ab9d28ac5c5c6617571.tar.zst
yuzu-d273bec68fd867f047944ab9d28ac5c5c6617571.zip
Diffstat (limited to 'src/core/hle/service/am/applets/software_keyboard.cpp')
-rw-r--r--src/core/hle/service/am/applets/software_keyboard.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp
index 8c5bd6059..e197990f7 100644
--- a/src/core/hle/service/am/applets/software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/software_keyboard.cpp
@@ -39,7 +39,8 @@ static Core::Frontend::SoftwareKeyboardParameters ConvertToFrontendParameters(
return params;
}
-SoftwareKeyboard::SoftwareKeyboard() = default;
+SoftwareKeyboard::SoftwareKeyboard(const Core::Frontend::SoftwareKeyboardApplet& frontend)
+ : frontend(frontend) {}
SoftwareKeyboard::~SoftwareKeyboard() = default;
@@ -90,8 +91,6 @@ void SoftwareKeyboard::ExecuteInteractive() {
if (status == INTERACTIVE_STATUS_OK) {
complete = true;
} else {
- const auto& frontend{Core::System::GetInstance().GetSoftwareKeyboard()};
-
std::array<char16_t, SWKBD_OUTPUT_INTERACTIVE_BUFFER_SIZE / 2 - 2> string;
std::memcpy(string.data(), data.data() + 4, string.size() * 2);
frontend.SendTextCheckDialog(
@@ -106,8 +105,6 @@ void SoftwareKeyboard::Execute() {
return;
}
- const auto& frontend{Core::System::GetInstance().GetSoftwareKeyboard()};
-
const auto parameters = ConvertToFrontendParameters(config, initial_text);
frontend.RequestText([this](std::optional<std::u16string> text) { WriteText(text); },