summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/yuzu/applets/software_keyboard.cpp16
-rw-r--r--src/yuzu/applets/software_keyboard.h7
2 files changed, 11 insertions, 12 deletions
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp
index efefb1f99..8a26fdff1 100644
--- a/src/yuzu/applets/software_keyboard.cpp
+++ b/src/yuzu/applets/software_keyboard.cpp
@@ -82,8 +82,8 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
82 : QString::fromStdU16String(parameters.submit_text), 82 : QString::fromStdU16String(parameters.submit_text),
83 QDialogButtonBox::AcceptRole); 83 QDialogButtonBox::AcceptRole);
84 84
85 connect(buttons, &QDialogButtonBox::accepted, this, &QtSoftwareKeyboardDialog::Submit); 85 connect(buttons, &QDialogButtonBox::accepted, this, &QtSoftwareKeyboardDialog::accept);
86 connect(buttons, &QDialogButtonBox::rejected, this, &QtSoftwareKeyboardDialog::Reject); 86 connect(buttons, &QDialogButtonBox::rejected, this, &QtSoftwareKeyboardDialog::reject);
87 layout->addWidget(header_label); 87 layout->addWidget(header_label);
88 layout->addWidget(sub_label); 88 layout->addWidget(sub_label);
89 layout->addWidget(guide_label); 89 layout->addWidget(guide_label);
@@ -96,16 +96,16 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
96 96
97QtSoftwareKeyboardDialog::~QtSoftwareKeyboardDialog() = default; 97QtSoftwareKeyboardDialog::~QtSoftwareKeyboardDialog() = default;
98 98
99void QtSoftwareKeyboardDialog::Submit() { 99void QtSoftwareKeyboardDialog::accept() {
100 ok = true; 100 ok = true;
101 text = line_edit->text().toStdU16String(); 101 text = line_edit->text().toStdU16String();
102 accept(); 102 QDialog::accept();
103} 103}
104 104
105void QtSoftwareKeyboardDialog::Reject() { 105void QtSoftwareKeyboardDialog::reject() {
106 ok = false; 106 ok = false;
107 text.clear(); 107 text.clear();
108 accept(); 108 QDialog::reject();
109} 109}
110 110
111std::u16string QtSoftwareKeyboardDialog::GetText() const { 111std::u16string QtSoftwareKeyboardDialog::GetText() const {
@@ -129,13 +129,13 @@ QtSoftwareKeyboard::~QtSoftwareKeyboard() = default;
129 129
130void QtSoftwareKeyboard::RequestText(std::function<void(std::optional<std::u16string>)> out, 130void QtSoftwareKeyboard::RequestText(std::function<void(std::optional<std::u16string>)> out,
131 Core::Frontend::SoftwareKeyboardParameters parameters) const { 131 Core::Frontend::SoftwareKeyboardParameters parameters) const {
132 text_output = out; 132 text_output = std::move(out);
133 emit MainWindowGetText(parameters); 133 emit MainWindowGetText(parameters);
134} 134}
135 135
136void QtSoftwareKeyboard::SendTextCheckDialog(std::u16string error_message, 136void QtSoftwareKeyboard::SendTextCheckDialog(std::u16string error_message,
137 std::function<void()> finished_check) const { 137 std::function<void()> finished_check) const {
138 this->finished_check = finished_check; 138 this->finished_check = std::move(finished_check);
139 emit MainWindowTextCheckDialog(error_message); 139 emit MainWindowTextCheckDialog(error_message);
140} 140}
141 141
diff --git a/src/yuzu/applets/software_keyboard.h b/src/yuzu/applets/software_keyboard.h
index 73f56714f..c63720ba4 100644
--- a/src/yuzu/applets/software_keyboard.h
+++ b/src/yuzu/applets/software_keyboard.h
@@ -33,8 +33,8 @@ public:
33 Core::Frontend::SoftwareKeyboardParameters parameters); 33 Core::Frontend::SoftwareKeyboardParameters parameters);
34 ~QtSoftwareKeyboardDialog() override; 34 ~QtSoftwareKeyboardDialog() override;
35 35
36 void Submit(); 36 void accept() override;
37 void Reject(); 37 void reject() override;
38 38
39 std::u16string GetText() const; 39 std::u16string GetText() const;
40 bool GetStatus() const; 40 bool GetStatus() const;
@@ -70,11 +70,10 @@ signals:
70 void MainWindowGetText(Core::Frontend::SoftwareKeyboardParameters parameters) const; 70 void MainWindowGetText(Core::Frontend::SoftwareKeyboardParameters parameters) const;
71 void MainWindowTextCheckDialog(std::u16string error_message) const; 71 void MainWindowTextCheckDialog(std::u16string error_message) const;
72 72
73public slots: 73private:
74 void MainWindowFinishedText(std::optional<std::u16string> text); 74 void MainWindowFinishedText(std::optional<std::u16string> text);
75 void MainWindowFinishedCheckDialog(); 75 void MainWindowFinishedCheckDialog();
76 76
77private:
78 mutable std::function<void(std::optional<std::u16string>)> text_output; 77 mutable std::function<void(std::optional<std::u16string>)> text_output;
79 mutable std::function<void()> finished_check; 78 mutable std::function<void()> finished_check;
80}; 79};