Skip to content

Commit f70c9cc

Browse files
Remove Setting_ prefix from all settings keys
1 parent 61d4b8f commit f70c9cc

8 files changed

Lines changed: 10 additions & 10 deletions

File tree

Controllers/DebugController/DebugControllerDetect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ static const char *led_names[] =
162162
* *
163163
* DetectDebugControllers *
164164
* *
165-
* Add dummy controllers based on the Setting_DebugDevices key in the settings json *
165+
* Add dummy controllers based on the DebugDevices key in the settings json *
166166
* *
167167
\******************************************************************************************/
168168

@@ -173,7 +173,7 @@ void DetectDebugControllers(std::vector<RGBController*> &rgb_controllers)
173173
/*-------------------------------------------------*\
174174
| Get Debug Device settings from settings manager |
175175
\*-------------------------------------------------*/
176-
debug_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_DebugDevices");
176+
debug_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("DebugDevices");
177177

178178
/*-------------------------------------------------*\
179179
| If the Debug settings contains devices, process |

Controllers/E131Controller/E131ControllerDetect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void DetectE131Controllers(std::vector<RGBController*> &rgb_controllers)
3030
/*-------------------------------------------------*\
3131
| Get E1.31 settings from settings manager |
3232
\*-------------------------------------------------*/
33-
e131_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_E131Devices");
33+
e131_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("E131Devices");
3434

3535
/*-------------------------------------------------*\
3636
| If the E1.31 settings contains devices, process |

Controllers/EspurnaController/EspurnaControllerDetect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void DetectEspurnaControllers(std::vector<RGBController*> &rgb_controllers)
2424
/*-------------------------------------------------*\
2525
| Get Espurna settings from settings manager |
2626
\*-------------------------------------------------*/
27-
espurna_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_EspurnaDevices");
27+
espurna_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("EspurnaDevices");
2828

2929
/*-------------------------------------------------*\
3030
| If the Espurna settings contains devices, process |

Controllers/LEDStripController/LEDStripControllerDetect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void DetectLEDStripControllers(std::vector<RGBController*> &rgb_controllers)
2525
/*-------------------------------------------------*\
2626
| Get LED Strip settings from settings manager |
2727
\*-------------------------------------------------*/
28-
ledstrip_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_LEDStripDevices");
28+
ledstrip_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LEDStripDevices");
2929

3030
/*-------------------------------------------------*\
3131
| If the LEDStrip settings contains devices, process|

Controllers/LinuxLEDController/LinuxLEDControllerDetect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void DetectLinuxLEDControllers(std::vector<RGBController*> &rgb_controllers)
2727
/*-------------------------------------------------*\
2828
| Get Linux LED settings from settings manager |
2929
\*-------------------------------------------------*/
30-
linux_led_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_LinuxLEDDevices");
30+
linux_led_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("LinuxLEDDevices");
3131

3232
/*-------------------------------------------------*\
3333
| If the LinuxLED settings contains devices, process|

Controllers/PhilipsWizController/PhilipsWizControllerDetect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void DetectPhilipsWizControllers(std::vector<RGBController*> &rgb_controllers)
2525
/*-------------------------------------------------*\
2626
| Get Philips Wiz settings from settings manager |
2727
\*-------------------------------------------------*/
28-
wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_PhilipsWizDevices");
28+
wiz_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("PhilipsWizDevices");
2929

3030
/*-------------------------------------------------*\
3131
| If the Wiz settings contains devices, process |

ResourceManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ void ResourceManager::DetectDevicesThreadFunction()
416416
| Open device disable list and read in disabled |
417417
| device strings |
418418
\*-------------------------------------------------*/
419-
detector_settings = settings_manager->GetSettings("Setting_Detectors");
419+
detector_settings = settings_manager->GetSettings("Detectors");
420420

421421
/*-------------------------------------------------*\
422422
| Check HID safe mode setting |
@@ -756,7 +756,7 @@ void ResourceManager::DetectDevicesThreadFunction()
756756

757757
if(save_settings)
758758
{
759-
settings_manager->SetSettings("Setting_Detectors", detector_settings);
759+
settings_manager->SetSettings("Detectors", detector_settings);
760760

761761
settings_manager->SaveSettings();
762762
}

qt/OpenRGBDialog2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ bool OpenRGBDialog2::IsDarkTheme()
9797
/*-------------------------------------------------*\
9898
| Get prefered theme from settings manager |
9999
\*-------------------------------------------------*/
100-
theme_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Setting_Theme");
100+
theme_settings = ResourceManager::get()->GetSettingsManager()->GetSettings("Theme");
101101

102102
/*-------------------------------------------------*\
103103
| Read the theme key and adjust accordingly |

0 commit comments

Comments
 (0)