mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-19 10:03:22 +02:00
citra-qt: Use structured bindings where applicable in ConfigureHotkeys::applyConfiguration
. Fix a few minor issues.
* Address https://github.com/citra-emu/citra/pull/4437#discussion_r241380912
This commit is contained in:
parent
dccd1664ad
commit
71f36efd27
@ -17,7 +17,7 @@ class ConfigureDialog : public QDialog {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry);
|
||||
explicit ConfigureDialog(QWidget* parent, HotkeyRegistry& registry);
|
||||
~ConfigureDialog() override;
|
||||
|
||||
void UpdateVisibleTabs();
|
||||
|
@ -107,15 +107,13 @@ void ConfigureHotkeys::applyConfiguration(HotkeyRegistry& registry) {
|
||||
for (int key_column_id = 0; key_column_id < parent->rowCount(); key_column_id++) {
|
||||
QStandardItem* action = parent->child(key_column_id, 0);
|
||||
QStandardItem* keyseq = parent->child(key_column_id, 1);
|
||||
for (auto key_iterator = registry.hotkey_groups.begin();
|
||||
key_iterator != registry.hotkey_groups.end(); ++key_iterator) {
|
||||
if (key_iterator->first == parent->text()) {
|
||||
for (auto it2 = key_iterator->second.begin(); it2 != key_iterator->second.end();
|
||||
++it2) {
|
||||
if (it2->first == action->text()) {
|
||||
it2->second.keyseq = QKeySequence(keyseq->text());
|
||||
}
|
||||
}
|
||||
for (auto& [group, sub_actions] : registry.hotkey_groups) {
|
||||
if (group != parent->text())
|
||||
continue;
|
||||
for (auto& [action_name, hotkey] : sub_actions) {
|
||||
if (action_name != action->text())
|
||||
continue;
|
||||
hotkey.keyseq = QKeySequence(keyseq->text());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -32,8 +32,10 @@ void HotkeyRegistry::LoadHotkeys() {
|
||||
hk.keyseq = QKeySequence::fromString(shortcut.shortcut.first, QKeySequence::NativeText);
|
||||
hk.context = (Qt::ShortcutContext)shortcut.shortcut.second;
|
||||
}
|
||||
if (hk.shortcut)
|
||||
if (hk.shortcut) {
|
||||
hk.shortcut->disconnect();
|
||||
hk.shortcut->setKey(hk.keyseq);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user