mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-11-28 06:52:47 +00:00
Merge pull request #4128 from lioncash/move2
software_keyboard: Eliminate trivial redundant copies
This commit is contained in:
commit
1d1489da80
|
@ -30,7 +30,7 @@ static Core::Frontend::SoftwareKeyboardParameters ConvertToFrontendParameters(
|
||||||
config.sub_text.size());
|
config.sub_text.size());
|
||||||
params.guide_text = Common::UTF16StringFromFixedZeroTerminatedBuffer(config.guide_text.data(),
|
params.guide_text = Common::UTF16StringFromFixedZeroTerminatedBuffer(config.guide_text.data(),
|
||||||
config.guide_text.size());
|
config.guide_text.size());
|
||||||
params.initial_text = initial_text;
|
params.initial_text = std::move(initial_text);
|
||||||
params.max_length = config.length_limit == 0 ? DEFAULT_MAX_LENGTH : config.length_limit;
|
params.max_length = config.length_limit == 0 ? DEFAULT_MAX_LENGTH : config.length_limit;
|
||||||
params.password = static_cast<bool>(config.is_password);
|
params.password = static_cast<bool>(config.is_password);
|
||||||
params.cursor_at_beginning = static_cast<bool>(config.initial_cursor_position);
|
params.cursor_at_beginning = static_cast<bool>(config.initial_cursor_position);
|
||||||
|
@ -109,7 +109,7 @@ void SoftwareKeyboard::Execute() {
|
||||||
|
|
||||||
const auto parameters = ConvertToFrontendParameters(config, initial_text);
|
const auto parameters = ConvertToFrontendParameters(config, initial_text);
|
||||||
|
|
||||||
frontend.RequestText([this](std::optional<std::u16string> text) { WriteText(text); },
|
frontend.RequestText([this](std::optional<std::u16string> text) { WriteText(std::move(text)); },
|
||||||
parameters);
|
parameters);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue