diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2017-09-04 01:32:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-04 01:32:46 -0700 |
| commit | 018ad987149196cb016d11e2ea651e36679bd994 (patch) | |
| tree | 57265e0cd286e009364fe191d6d59b4142c8d57e /Source | |
| parent | ee6930a231a7ff1b25750deb84f613bddee90379 (diff) | |
| parent | f00456e6bff95fa8e7d124cb6feeb2b3204f8ad4 (diff) | |
Merge pull request #6019 from spycrab/qt_use_map
Qt/ControllersWindow: Use std::map instead of std::unordered_map
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinQt2/Config/ControllersWindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp index ab1b22dee1..59e422ba6c 100644 --- a/Source/Core/DolphinQt2/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt2/Config/ControllersWindow.cpp @@ -18,7 +18,7 @@ #include <QScreen> #include <QVBoxLayout> -#include <unordered_map> +#include <map> #include "Core/ConfigManager.h" #include "Core/HW/SI/SI.h" @@ -33,13 +33,13 @@ #include "DolphinQt2/Config/ControllersWindow.h" -static const std::unordered_map<SerialInterface::SIDevices, int> s_gc_types = { +static const std::map<SerialInterface::SIDevices, int> s_gc_types = { {SerialInterface::SIDEVICE_NONE, 0}, {SerialInterface::SIDEVICE_GC_CONTROLLER, 1}, {SerialInterface::SIDEVICE_WIIU_ADAPTER, 2}, {SerialInterface::SIDEVICE_GC_STEERING, 3}, {SerialInterface::SIDEVICE_DANCEMAT, 4}, {SerialInterface::SIDEVICE_GC_TARUKONGA, 5}, {SerialInterface::SIDEVICE_GC_GBA, 6}, {SerialInterface::SIDEVICE_GC_KEYBOARD, 7}}; -static const std::unordered_map<int, int> s_wiimote_types = { +static const std::map<int, int> s_wiimote_types = { {WIIMOTE_SRC_NONE, 0}, {WIIMOTE_SRC_EMU, 1}, {WIIMOTE_SRC_REAL, 2}, {WIIMOTE_SRC_HYBRID, 3}}; static int ToGCMenuIndex(const SerialInterface::SIDevices sidevice) |