From 19da1011648beb324122f36e6da4cd14cc4c7217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sat, 2 May 2020 14:39:40 +0200 Subject: Remove redundant Config prefix from ConfigInfo/ConfigLocation Both structs are already in the Config namespace. --- .../DualShockUDPClient/DualShockUDPClient.cpp | 10 +++++----- .../DualShockUDPClient/DualShockUDPClient.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface') 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 SERVER_ENABLED{ - {Config::System::DualShockUDPClient, "Server", "Enabled"}, false}; -const Config::ConfigInfo SERVER_ADDRESS{ +const Config::Info SERVER_ENABLED{{Config::System::DualShockUDPClient, "Server", "Enabled"}, + false}; +const Config::Info SERVER_ADDRESS{ {Config::System::DualShockUDPClient, "Server", "IPAddress"}, DEFAULT_SERVER_ADDRESS}; -const Config::ConfigInfo SERVER_PORT{{Config::System::DualShockUDPClient, "Server", "Port"}, - DEFAULT_SERVER_PORT}; +const Config::Info 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 SERVER_ENABLED; -extern const Config::ConfigInfo SERVER_ADDRESS; -extern const Config::ConfigInfo SERVER_PORT; +extern const Config::Info SERVER_ENABLED; +extern const Config::Info SERVER_ADDRESS; +extern const Config::Info SERVER_PORT; } // namespace Settings void Init(); -- cgit v1.2.3