summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-05-28 05:22:38 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-05-28 05:45:56 +0200
commitc68255f70f2f91769a6b7d8bac4cbb1f80c4004b (patch)
tree5fb7f851518d26ba5e559a80db7292bdf5ddc2f7 /src/core
parentapplets/swkbd: Only read the text check message on Failure/Confirm (diff)
downloadyuzu-c68255f70f2f91769a6b7d8bac4cbb1f80c4004b.tar
yuzu-c68255f70f2f91769a6b7d8bac4cbb1f80c4004b.tar.gz
yuzu-c68255f70f2f91769a6b7d8bac4cbb1f80c4004b.tar.bz2
yuzu-c68255f70f2f91769a6b7d8bac4cbb1f80c4004b.tar.lz
yuzu-c68255f70f2f91769a6b7d8bac4cbb1f80c4004b.tar.xz
yuzu-c68255f70f2f91769a6b7d8bac4cbb1f80c4004b.tar.zst
yuzu-c68255f70f2f91769a6b7d8bac4cbb1f80c4004b.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/service/am/applets/software_keyboard.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/service/am/applets/software_keyboard.cpp b/src/core/hle/service/am/applets/software_keyboard.cpp
index a1027a9ad..b1a81810b 100644
--- a/src/core/hle/service/am/applets/software_keyboard.cpp
+++ b/src/core/hle/service/am/applets/software_keyboard.cpp
@@ -290,10 +290,10 @@ void SoftwareKeyboard::ProcessTextCheck() {
SubmitNormalOutputAndExit(SwkbdResult::Ok, current_text);
break;
case SwkbdTextCheckResult::Failure:
- ShowTextCheckDialog(SwkbdTextCheckResult::Failure, text_check_message);
+ ShowTextCheckDialog(SwkbdTextCheckResult::Failure, std::move(text_check_message));
break;
case SwkbdTextCheckResult::Confirm:
- ShowTextCheckDialog(SwkbdTextCheckResult::Confirm, text_check_message);
+ ShowTextCheckDialog(SwkbdTextCheckResult::Confirm, std::move(text_check_message));
break;
case SwkbdTextCheckResult::Silent:
default:
@@ -487,7 +487,7 @@ void SoftwareKeyboard::InitializeFrontendKeyboard() {
max_text_length <= 32 ? SwkbdTextDrawType::Line : SwkbdTextDrawType::Box;
Core::Frontend::KeyboardInitializeParameters initialize_parameters{
- .ok_text{ok_text},
+ .ok_text{std::move(ok_text)},
.header_text{},
.sub_text{},
.guide_text{},
@@ -563,10 +563,10 @@ void SoftwareKeyboard::InitializeFrontendKeyboard() {
: false;
Core::Frontend::KeyboardInitializeParameters initialize_parameters{
- .ok_text{ok_text},
- .header_text{header_text},
- .sub_text{sub_text},
- .guide_text{guide_text},
+ .ok_text{std::move(ok_text)},
+ .header_text{std::move(header_text)},
+ .sub_text{std::move(sub_text)},
+ .guide_text{std::move(guide_text)},
.initial_text{initial_text},
.max_text_length{max_text_length},
.min_text_length{min_text_length},
@@ -595,7 +595,7 @@ void SoftwareKeyboard::ShowNormalKeyboard() {
void SoftwareKeyboard::ShowTextCheckDialog(SwkbdTextCheckResult text_check_result,
std::u16string text_check_message) {
- frontend.ShowTextCheckDialog(text_check_result, text_check_message);
+ frontend.ShowTextCheckDialog(text_check_result, std::move(text_check_message));
}
void SoftwareKeyboard::ShowInlineKeyboard() {