summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2020-05-03 14:07:41 +0200
committerGitHub <noreply@github.com>2020-05-03 14:07:41 +0200
commit90ba73c6c2cdc6d92bff75f4e66d48b044ebdfac (patch)
tree65e612f4bb02ee0d7cea8f5856afd0a52fd66626 /Source/Core/InputCommon/ControllerInterface
parent8d4e8314a3dcd8680ae81d91fb7e076b4496b43b (diff)
parent19da1011648beb324122f36e6da4cd14cc4c7217 (diff)
Merge pull request #8787 from leoetlino/config-config
Remove redundant Config prefix from ConfigInfo/ConfigLocation
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp10
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h6
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
index 3dff8cf309..c398225bfe 100644
--- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
@@ -31,12 +31,12 @@ namespace Settings
constexpr char DEFAULT_SERVER_ADDRESS[] = "127.0.0.1";
constexpr u16 DEFAULT_SERVER_PORT = 26760;
-const Config::ConfigInfo<bool> SERVER_ENABLED{
- {Config::System::DualShockUDPClient, "Server", "Enabled"}, false};
-const Config::ConfigInfo<std::string> SERVER_ADDRESS{
+const Config::Info<bool> SERVER_ENABLED{{Config::System::DualShockUDPClient, "Server", "Enabled"},
+ false};
+const Config::Info<std::string> SERVER_ADDRESS{
{Config::System::DualShockUDPClient, "Server", "IPAddress"}, DEFAULT_SERVER_ADDRESS};
-const Config::ConfigInfo<int> SERVER_PORT{{Config::System::DualShockUDPClient, "Server", "Port"},
- DEFAULT_SERVER_PORT};
+const Config::Info<int> SERVER_PORT{{Config::System::DualShockUDPClient, "Server", "Port"},
+ DEFAULT_SERVER_PORT};
} // namespace Settings
// Clock type used for querying timeframes
diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h
index e694cb622d..1b51a2e1b9 100644
--- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h
+++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h
@@ -10,9 +10,9 @@ namespace ciface::DualShockUDPClient
{
namespace Settings
{
-extern const Config::ConfigInfo<bool> SERVER_ENABLED;
-extern const Config::ConfigInfo<std::string> SERVER_ADDRESS;
-extern const Config::ConfigInfo<int> SERVER_PORT;
+extern const Config::Info<bool> SERVER_ENABLED;
+extern const Config::Info<std::string> SERVER_ADDRESS;
+extern const Config::Info<int> SERVER_PORT;
} // namespace Settings
void Init();