summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-11-20 17:36:47 +0100
committerLioncash <mathew1800@gmail.com>2018-11-20 17:36:50 +0100
commit4dcdd3a837808fbdc1da4d041295fe678fcfdf81 (patch)
tree375e18e916893142b876e687619ec970174b4531
parentyuzu/applets/software_keyboard: std::move std::function instances where applicable (diff)
downloadyuzu-4dcdd3a837808fbdc1da4d041295fe678fcfdf81.tar
yuzu-4dcdd3a837808fbdc1da4d041295fe678fcfdf81.tar.gz
yuzu-4dcdd3a837808fbdc1da4d041295fe678fcfdf81.tar.bz2
yuzu-4dcdd3a837808fbdc1da4d041295fe678fcfdf81.tar.lz
yuzu-4dcdd3a837808fbdc1da4d041295fe678fcfdf81.tar.xz
yuzu-4dcdd3a837808fbdc1da4d041295fe678fcfdf81.tar.zst
yuzu-4dcdd3a837808fbdc1da4d041295fe678fcfdf81.zip
-rw-r--r--src/yuzu/applets/software_keyboard.cpp12
-rw-r--r--src/yuzu/applets/software_keyboard.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp
index 338d91426..8a26fdff1 100644
--- a/src/yuzu/applets/software_keyboard.cpp
+++ b/src/yuzu/applets/software_keyboard.cpp
@@ -82,8 +82,8 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
: QString::fromStdU16String(parameters.submit_text),
QDialogButtonBox::AcceptRole);
- connect(buttons, &QDialogButtonBox::accepted, this, &QtSoftwareKeyboardDialog::Submit);
- connect(buttons, &QDialogButtonBox::rejected, this, &QtSoftwareKeyboardDialog::Reject);
+ connect(buttons, &QDialogButtonBox::accepted, this, &QtSoftwareKeyboardDialog::accept);
+ connect(buttons, &QDialogButtonBox::rejected, this, &QtSoftwareKeyboardDialog::reject);
layout->addWidget(header_label);
layout->addWidget(sub_label);
layout->addWidget(guide_label);
@@ -96,16 +96,16 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
QtSoftwareKeyboardDialog::~QtSoftwareKeyboardDialog() = default;
-void QtSoftwareKeyboardDialog::Submit() {
+void QtSoftwareKeyboardDialog::accept() {
ok = true;
text = line_edit->text().toStdU16String();
- accept();
+ QDialog::accept();
}
-void QtSoftwareKeyboardDialog::Reject() {
+void QtSoftwareKeyboardDialog::reject() {
ok = false;
text.clear();
- accept();
+ QDialog::reject();
}
std::u16string QtSoftwareKeyboardDialog::GetText() const {
diff --git a/src/yuzu/applets/software_keyboard.h b/src/yuzu/applets/software_keyboard.h
index db3fbae1d..c63720ba4 100644
--- a/src/yuzu/applets/software_keyboard.h
+++ b/src/yuzu/applets/software_keyboard.h
@@ -33,8 +33,8 @@ public:
Core::Frontend::SoftwareKeyboardParameters parameters);
~QtSoftwareKeyboardDialog() override;
- void Submit();
- void Reject();
+ void accept() override;
+ void reject() override;
std::u16string GetText() const;
bool GetStatus() const;