diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-05-29 00:52:47 -0400 | 
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-05-29 00:56:45 -0400 | 
| commit | cfc9d92b38bae6d9815ae06bbe5e2d800887f897 (patch) | |
| tree | 0e29c639d312387b9ec6e32a22fa73d084e3b4f8 | |
| parent | 802dd3cc95aee9e7ba3a5005e291beb65612b52b (diff) | |
yuzu/software_keyboard: Remove unnecessary GetStatus() member function
Like with the profile selection dialog, we can just use the result of
QDialog's exec() function to determine whether or not a dialog was
accepted.
| -rw-r--r-- | src/yuzu/applets/software_keyboard.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/applets/software_keyboard.h | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 3 | 
3 files changed, 1 insertions, 10 deletions
diff --git a/src/yuzu/applets/software_keyboard.cpp b/src/yuzu/applets/software_keyboard.cpp index 5223ec977..af36f07c6 100644 --- a/src/yuzu/applets/software_keyboard.cpp +++ b/src/yuzu/applets/software_keyboard.cpp @@ -104,13 +104,11 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(  QtSoftwareKeyboardDialog::~QtSoftwareKeyboardDialog() = default;  void QtSoftwareKeyboardDialog::accept() { -    ok = true;      text = line_edit->text().toStdU16String();      QDialog::accept();  }  void QtSoftwareKeyboardDialog::reject() { -    ok = false;      text.clear();      QDialog::reject();  } @@ -119,10 +117,6 @@ std::u16string QtSoftwareKeyboardDialog::GetText() const {      return text;  } -bool QtSoftwareKeyboardDialog::GetStatus() const { -    return ok; -} -  QtSoftwareKeyboard::QtSoftwareKeyboard(GMainWindow& main_window) {      connect(this, &QtSoftwareKeyboard::MainWindowGetText, &main_window,              &GMainWindow::SoftwareKeyboardGetText, Qt::QueuedConnection); diff --git a/src/yuzu/applets/software_keyboard.h b/src/yuzu/applets/software_keyboard.h index 78c5a042b..44bcece75 100644 --- a/src/yuzu/applets/software_keyboard.h +++ b/src/yuzu/applets/software_keyboard.h @@ -36,10 +36,8 @@ public:      void reject() override;      std::u16string GetText() const; -    bool GetStatus() const;  private: -    bool ok = false;      std::u16string text;      QDialogButtonBox* buttons; diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index cb07b64b8..92de0097e 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -259,9 +259,8 @@ void GMainWindow::SoftwareKeyboardGetText(      dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |                            Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);      dialog.setWindowModality(Qt::WindowModal); -    dialog.exec(); -    if (!dialog.GetStatus()) { +    if (dialog.exec() == QDialog::Rejected) {          emit SoftwareKeyboardFinishedText(std::nullopt);          return;      }  | 
