InputCommon: Use distinct values for profile key

Because the last commit made us use separate folders for GCPad and
GCKey profiles, we should also use separate game INI keys for them.
Otherwise setting e.g. PadProfile1 in a game INI will make both GCPad
and GCKey try to load it, typically with one of them succeeding and the
other one showing a panic alert due to the profile not existing in its
folder.

Better do this breaking change for GCKeys in the same PR as the other
breaking change rather than later.

2 files changed, 5 insertions, 26 deletions

diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index 651e2821c2..ff3f68acd0 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -20,9 +20,9 @@
 #include "InputCommon/InputProfile.h"
 
 InputConfig::InputConfig(const std::string& ini_name, const std::string& gui_name,
-                         const std::string& profile_directory_name, InputClass input_class)
+                         const std::string& profile_directory_name, const std::string& profile_key)
     : m_ini_name(ini_name), m_gui_name(gui_name), m_profile_directory_name(profile_directory_name),
-      m_input_class(input_class)
+      m_profile_key(profile_key)
 {
 }
 
@@ -159,20 +159,6 @@ bool InputConfig::ControllersNeedToBeCreated() const
   return m_controllers.empty();
 }
 
-std::string InputConfig::GetProfileKey() const
-{
-  switch (m_input_class)
-  {
-  case InputClass::GBA:
-    return "GBA";
-  case InputClass::Wii:
-    return "Wiimote";
-  case InputClass::GC:
-  default:
-    return "Pad";
-  }
-}
-
 std::string InputConfig::GetUserProfileDirectoryPath() const
 {
   return fmt::format("{}Profiles/{}/", File::GetUserPath(D_CONFIG_IDX), GetProfileDirectoryName());
diff --git a/Source/Core/InputCommon/InputConfig.h b/Source/Core/InputCommon/InputConfig.h
index ff8c4be65d..09b9f6c182 100644
--- a/Source/Core/InputCommon/InputConfig.h
+++ b/Source/Core/InputCommon/InputConfig.h
@@ -24,15 +24,8 @@ class EmulatedController;
 class InputConfig
 {
 public:
-  enum class InputClass
-  {
-    GC,
-    Wii,
-    GBA,
-  };
-
   InputConfig(const std::string& ini_name, const std::string& gui_name,
-              const std::string& profile_directory_name, InputClass input_class);
+              const std::string& profile_directory_name, const std::string& profile_key);
 
   ~InputConfig();
 
@@ -51,7 +44,7 @@ public:
   bool IsControllerControlledByGamepadDevice(int index) const;
 
   std::string GetGUIName() const { return m_gui_name; }
-  std::string GetProfileKey() const;
+  std::string GetProfileKey() const { return m_profile_key; }
   std::string GetProfileDirectoryName() const { return m_profile_directory_name; }
   std::string GetUserProfileDirectoryPath() const;
   std::string GetSysProfileDirectoryPath() const;
@@ -69,6 +62,6 @@ private:
   const std::string m_ini_name;
   const std::string m_gui_name;
   const std::string m_profile_directory_name;
-  const InputClass m_input_class;
+  const std::string m_profile_key;
   InputCommon::DynamicInputTextureManager m_dynamic_input_tex_config_manager;
 };