diff options
| author | 2019-05-25 03:53:41 -0400 | |
|---|---|---|
| committer | 2019-05-25 04:08:07 -0400 | |
| commit | c03fb00ac142e27ba8d7e7cc1dde0539375b7d96 (patch) | |
| tree | cc1a5ee67e9583368232dc44d5715a9e569c7ef7 | |
| parent | sequence_dialog: Reorganize the constructor (diff) | |
| download | yuzu-c03fb00ac142e27ba8d7e7cc1dde0539375b7d96.tar.gz yuzu-c03fb00ac142e27ba8d7e7cc1dde0539375b7d96.tar.xz yuzu-c03fb00ac142e27ba8d7e7cc1dde0539375b7d96.zip | |
configure_hotkeys: Remove unused EmitHotkeysChanged()
1. This is something that should be solely emitted by the hotkey dialog
itself
2. This is functionally unused, given there's nothing listening for the
signal.
| -rw-r--r-- | src/yuzu/configuration/configure_dialog.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_hotkeys.cpp | 5 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_hotkeys.h | 5 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp index 32c05b797..8086f9d6b 100644 --- a/src/yuzu/configuration/configure_dialog.cpp +++ b/src/yuzu/configuration/configure_dialog.cpp | |||
| @@ -25,9 +25,6 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry) | |||
| 25 | 25 | ||
| 26 | adjustSize(); | 26 | adjustSize(); |
| 27 | ui->selectorList->setCurrentRow(0); | 27 | ui->selectorList->setCurrentRow(0); |
| 28 | |||
| 29 | // Synchronise lists upon initialisation | ||
| 30 | ui->hotkeysTab->EmitHotkeysChanged(); | ||
| 31 | } | 28 | } |
| 32 | 29 | ||
| 33 | ConfigureDialog::~ConfigureDialog() = default; | 30 | ConfigureDialog::~ConfigureDialog() = default; |
diff --git a/src/yuzu/configuration/configure_hotkeys.cpp b/src/yuzu/configuration/configure_hotkeys.cpp index a7a8752e5..9155da4e8 100644 --- a/src/yuzu/configuration/configure_hotkeys.cpp +++ b/src/yuzu/configuration/configure_hotkeys.cpp | |||
| @@ -31,10 +31,6 @@ ConfigureHotkeys::ConfigureHotkeys(QWidget* parent) | |||
| 31 | 31 | ||
| 32 | ConfigureHotkeys::~ConfigureHotkeys() = default; | 32 | ConfigureHotkeys::~ConfigureHotkeys() = default; |
| 33 | 33 | ||
| 34 | void ConfigureHotkeys::EmitHotkeysChanged() { | ||
| 35 | emit HotkeysChanged(GetUsedKeyList()); | ||
| 36 | } | ||
| 37 | |||
| 38 | QList<QKeySequence> ConfigureHotkeys::GetUsedKeyList() const { | 34 | QList<QKeySequence> ConfigureHotkeys::GetUsedKeyList() const { |
| 39 | QList<QKeySequence> list; | 35 | QList<QKeySequence> list; |
| 40 | for (int r = 0; r < model->rowCount(); r++) { | 36 | for (int r = 0; r < model->rowCount(); r++) { |
| @@ -87,7 +83,6 @@ void ConfigureHotkeys::Configure(QModelIndex index) { | |||
| 87 | tr("You're using a key that's already bound.")); | 83 | tr("You're using a key that's already bound.")); |
| 88 | } else { | 84 | } else { |
| 89 | model->setData(index, key_sequence.toString(QKeySequence::NativeText)); | 85 | model->setData(index, key_sequence.toString(QKeySequence::NativeText)); |
| 90 | EmitHotkeysChanged(); | ||
| 91 | } | 86 | } |
| 92 | } | 87 | } |
| 93 | 88 | ||
diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h index 73fb8a175..1bbe64114 100644 --- a/src/yuzu/configuration/configure_hotkeys.h +++ b/src/yuzu/configuration/configure_hotkeys.h | |||
| @@ -24,8 +24,6 @@ public: | |||
| 24 | void applyConfiguration(HotkeyRegistry& registry); | 24 | void applyConfiguration(HotkeyRegistry& registry); |
| 25 | void retranslateUi(); | 25 | void retranslateUi(); |
| 26 | 26 | ||
| 27 | void EmitHotkeysChanged(); | ||
| 28 | |||
| 29 | /** | 27 | /** |
| 30 | * Populates the hotkey list widget using data from the provided registry. | 28 | * Populates the hotkey list widget using data from the provided registry. |
| 31 | * Called everytime the Configure dialog is opened. | 29 | * Called everytime the Configure dialog is opened. |
| @@ -33,9 +31,6 @@ public: | |||
| 33 | */ | 31 | */ |
| 34 | void Populate(const HotkeyRegistry& registry); | 32 | void Populate(const HotkeyRegistry& registry); |
| 35 | 33 | ||
| 36 | signals: | ||
| 37 | void HotkeysChanged(QList<QKeySequence> new_key_list); | ||
| 38 | |||
| 39 | private: | 34 | private: |
| 40 | void Configure(QModelIndex index); | 35 | void Configure(QModelIndex index); |
| 41 | bool IsUsedKey(QKeySequence key_sequence) const; | 36 | bool IsUsedKey(QKeySequence key_sequence) const; |