From f70c9cc63ed9704007f71045124b17376cdcc3b9 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Thu, 3 Dec 2020 12:02:15 -0600 Subject: [PATCH] Remove Setting_ prefix from all settings keys --- Controllers/DebugController/DebugControllerDetect.cpp | 4 ++-- Controllers/E131Controller/E131ControllerDetect.cpp | 2 +- Controllers/EspurnaController/EspurnaControllerDetect.cpp | 2 +- Controllers/LEDStripController/LEDStripControllerDetect.cpp | 2 +- Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp | 2 +- .../PhilipsWizController/PhilipsWizControllerDetect.cpp | 2 +- ResourceManager.cpp | 4 ++-- qt/OpenRGBDialog2.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Controllers/DebugController/DebugControllerDetect.cpp b/Controllers/DebugController/DebugControllerDetect.cpp index 23fca424..e4adee8b 100644 --- a/Controllers/DebugController/DebugControllerDetect.cpp +++ b/Controllers/DebugController/DebugControllerDetect.cpp @@ -162,7 +162,7 @@ static const char *led_names[] = * * * DetectDebugControllers * * * -* Add dummy controllers based on the Setting_DebugDevices key in the settings json * +* Add dummy controllers based on the DebugDevices key in the settings json * * * \******************************************************************************************/ @@ -173,7 +173,7 @@ void DetectDebugControllers(std::vector &rgb_controllers) /*-------------------------------------------------*\ | Get Debug Device settings from settings manager | \*-------------------------------------------------*/ - debug_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_DebugDevices"); + debug_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("DebugDevices"); /*-------------------------------------------------*\ | If the Debug settings contains devices, process | diff --git a/Controllers/E131Controller/E131ControllerDetect.cpp b/Controllers/E131Controller/E131ControllerDetect.cpp index ca89a448..072bdc1c 100644 --- a/Controllers/E131Controller/E131ControllerDetect.cpp +++ b/Controllers/E131Controller/E131ControllerDetect.cpp @@ -30,7 +30,7 @@ void DetectE131Controllers(std::vector &rgb_controllers) /*-------------------------------------------------*\ | Get E1.31 settings from settings manager | \*-------------------------------------------------*/ - e131_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_E131Devices"); + e131_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("E131Devices"); /*-------------------------------------------------*\ | If the E1.31 settings contains devices, process | diff --git a/Controllers/EspurnaController/EspurnaControllerDetect.cpp b/Controllers/EspurnaController/EspurnaControllerDetect.cpp index 5c440a30..9b5a490e 100644 --- a/Controllers/EspurnaController/EspurnaControllerDetect.cpp +++ b/Controllers/EspurnaController/EspurnaControllerDetect.cpp @@ -24,7 +24,7 @@ void DetectEspurnaControllers(std::vector &rgb_controllers) /*-------------------------------------------------*\ | Get Espurna settings from settings manager | \*-------------------------------------------------*/ - espurna_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_EspurnaDevices"); + espurna_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("EspurnaDevices"); /*-------------------------------------------------*\ | If the Espurna settings contains devices, process | diff --git a/Controllers/LEDStripController/LEDStripControllerDetect.cpp b/Controllers/LEDStripController/LEDStripControllerDetect.cpp index 3cdb647f..88db6d1e 100644 --- a/Controllers/LEDStripController/LEDStripControllerDetect.cpp +++ b/Controllers/LEDStripController/LEDStripControllerDetect.cpp @@ -25,7 +25,7 @@ void DetectLEDStripControllers(std::vector &rgb_controllers) /*-------------------------------------------------*\ | Get LED Strip settings from settings manager | \*-------------------------------------------------*/ - ledstrip_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_LEDStripDevices"); + ledstrip_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LEDStripDevices"); /*-------------------------------------------------*\ | If the LEDStrip settings contains devices, process| diff --git a/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp b/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp index e3d8ab54..66e116e2 100644 --- a/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp +++ b/Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp @@ -27,7 +27,7 @@ void DetectLinuxLEDControllers(std::vector &rgb_controllers) /*-------------------------------------------------*\ | Get Linux LED settings from settings manager | \*-------------------------------------------------*/ - linux_led_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_LinuxLEDDevices"); + linux_led_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LinuxLEDDevices"); /*-------------------------------------------------*\ | If the LinuxLED settings contains devices, process| diff --git a/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp b/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp index 955b1dbc..cf15910d 100644 --- a/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp +++ b/Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp @@ -25,7 +25,7 @@ void DetectPhilipsWizControllers(std::vector &rgb_controllers) /*-------------------------------------------------*\ | Get Philips Wiz settings from settings manager | \*-------------------------------------------------*/ - wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_PhilipsWizDevices"); + wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("PhilipsWizDevices"); /*-------------------------------------------------*\ | If the Wiz settings contains devices, process | diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 600d232f..05d382bb 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -416,7 +416,7 @@ void ResourceManager::DetectDevicesThreadFunction() | Open device disable list and read in disabled | | device strings | \*-------------------------------------------------*/ - detector_settings = settings_manager->GetSettings("Setting_Detectors"); + detector_settings = settings_manager->GetSettings("Detectors"); /*-------------------------------------------------*\ | Check HID safe mode setting | @@ -756,7 +756,7 @@ void ResourceManager::DetectDevicesThreadFunction() if(save_settings) { - settings_manager->SetSettings("Setting_Detectors", detector_settings); + settings_manager->SetSettings("Detectors", detector_settings); settings_manager->SaveSettings(); } diff --git a/qt/OpenRGBDialog2.cpp b/qt/OpenRGBDialog2.cpp index 8435bf7f..bf07571f 100644 --- a/qt/OpenRGBDialog2.cpp +++ b/qt/OpenRGBDialog2.cpp @@ -97,7 +97,7 @@ bool OpenRGBDialog2::IsDarkTheme() /*-------------------------------------------------*\ | Get prefered theme from settings manager | \*-------------------------------------------------*/ - theme_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_Theme"); + theme_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Theme"); /*-------------------------------------------------*\ | Read the theme key and adjust accordingly |