From 59dbc72e7bd2da9b3c2f3454f7be23ffc367c1d3 Mon Sep 17 00:00:00 2001
From: fearlessTobi <thm.frey@gmail.com>
Date: Tue, 5 Feb 2019 22:07:03 +0100
Subject: [PATCH] configure_dialog: backport minor changes from yuzu

---
 src/citra_qt/configuration/configure_dialog.cpp | 12 ++++++------
 src/citra_qt/configuration/configure_dialog.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/citra_qt/configuration/configure_dialog.cpp b/src/citra_qt/configuration/configure_dialog.cpp
index a0ef52d2e..e1fc5abac 100644
--- a/src/citra_qt/configuration/configure_dialog.cpp
+++ b/src/citra_qt/configuration/configure_dialog.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <QHash>
+#include <map>
 #include <QListWidgetItem>
 #include "citra_qt/configuration/config.h"
 #include "citra_qt/configuration/configure_dialog.h"
@@ -74,7 +74,7 @@ void ConfigureDialog::PopulateSelectionList() {
          {tr("Controls"), {QT_TR_NOOP("Input"), QT_TR_NOOP("Hotkeys")}}}};
 
     for (const auto& entry : items) {
-        auto* item = new QListWidgetItem(entry.first);
+        auto* const item = new QListWidgetItem(entry.first);
         item->setData(Qt::UserRole, entry.second);
 
         ui->selectorList->addItem(item);
@@ -111,11 +111,11 @@ void ConfigureDialog::retranslateUi() {
 }
 
 void ConfigureDialog::UpdateVisibleTabs() {
-    auto items = ui->selectorList->selectedItems();
+    const auto items = ui->selectorList->selectedItems();
     if (items.isEmpty())
         return;
 
-    const QHash<QString, QWidget*> widgets = {
+    const std::map<QString, QWidget*> widgets = {
         {"General", ui->generalTab},   {"System", ui->systemTab},
         {"Input", ui->inputTab},       {"Hotkeys", ui->hotkeysTab},
         {"Graphics", ui->graphicsTab}, {"Audio", ui->audioTab},
@@ -124,8 +124,8 @@ void ConfigureDialog::UpdateVisibleTabs() {
 
     ui->tabWidget->clear();
 
-    QStringList tabs = items[0]->data(Qt::UserRole).toStringList();
+    const QStringList tabs = items[0]->data(Qt::UserRole).toStringList();
 
     for (const auto& tab : tabs)
-        ui->tabWidget->addTab(widgets[tab], tr(qPrintable(tab)));
+        ui->tabWidget->addTab(widgets.at(tab), tr(qPrintable(tab)));
 }
diff --git a/src/citra_qt/configuration/configure_dialog.h b/src/citra_qt/configuration/configure_dialog.h
index c902bf702..91234ca0b 100644
--- a/src/citra_qt/configuration/configure_dialog.h
+++ b/src/citra_qt/configuration/configure_dialog.h
@@ -21,8 +21,6 @@ public:
     ~ConfigureDialog() override;
 
     void applyConfiguration();
-    void UpdateVisibleTabs();
-    void PopulateSelectionList();
 
 private slots:
     void onLanguageChanged(const QString& locale);
@@ -33,6 +31,8 @@ signals:
 private:
     void setConfiguration();
     void retranslateUi();
+    void UpdateVisibleTabs();
+    void PopulateSelectionList();
 
     std::unique_ptr<Ui::ConfigureDialog> ui;
     HotkeyRegistry& registry;