diff options
| author | Mat M <mathew1800@gmail.com> | 2018-05-02 15:47:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 15:47:28 -0400 |
| commit | a2c12f15032c13dea2d70cf2085f1f784fc02abc (patch) | |
| tree | 56ac2943ff63979ffd8b2dddfa13c72ecf487c49 /Source/Core/Common/Config | |
| parent | 6bd7e99a62c74e1239612e97f6779d6dd4c45c58 (diff) | |
| parent | 6e96f62b413ca0045aa5cf6d5cdb6479b9caa1b6 (diff) | |
Merge pull request #6735 from JosJuice/ui-ini
Remove code related to UI.ini
Diffstat (limited to 'Source/Core/Common/Config')
| -rw-r--r-- | Source/Core/Common/Config/Config.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Common/Config/Enums.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/Common/Config/Config.cpp b/Source/Core/Common/Config/Config.cpp index df17d8a0db..7e1fc904d9 100644 --- a/Source/Core/Common/Config/Config.cpp +++ b/Source/Core/Common/Config/Config.cpp @@ -88,9 +88,9 @@ void ClearCurrentRunLayer() } static const std::map<System, std::string> system_to_name = { - {System::Main, "Dolphin"}, {System::GCPad, "GCPad"}, {System::WiiPad, "Wiimote"}, - {System::GCKeyboard, "GCKeyboard"}, {System::GFX, "Graphics"}, {System::Logger, "Logger"}, - {System::Debugger, "Debugger"}, {System::UI, "UI"}, {System::SYSCONF, "SYSCONF"}}; + {System::Main, "Dolphin"}, {System::GCPad, "GCPad"}, {System::WiiPad, "Wiimote"}, + {System::GCKeyboard, "GCKeyboard"}, {System::GFX, "Graphics"}, {System::Logger, "Logger"}, + {System::Debugger, "Debugger"}, {System::SYSCONF, "SYSCONF"}}; const std::string& GetSystemName(System system) { diff --git a/Source/Core/Common/Config/Enums.h b/Source/Core/Common/Config/Enums.h index f35653ddff..0dffff7f17 100644 --- a/Source/Core/Common/Config/Enums.h +++ b/Source/Core/Common/Config/Enums.h @@ -30,7 +30,6 @@ enum class System GFX, Logger, Debugger, - UI, }; constexpr std::array<LayerType, 7> SEARCH_ORDER{{ |