yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugins/nightlight: Unobfuscate code that reads geocoordinates

Browse source 
The current code is unreadable:

- it creates a lambda that captures two local variables for latitude and longitude
- then it copies values from the config to those local variables
- calls the lambda
- and finally copies the data from the local variables to the NightLightManager fields

That code can be simplified by simply calling checkLocation() directly
and using an if statement.
This commit is contained in:
Vlad Zahorodnii 2024-06-14 18:46:57 +03:00
parent e5528e9317
commit 3461d5bc3a
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/plugins/nightlight/nightlightmanager.cpp
View file

@ -255,26 +255,21 @@ void NightLightManager::readConfig()
m_dayTargetTemperature = std::clamp(settings->dayTemperature(), MIN_TEMPERATURE, DEFAULT_DAY_TEMPERATURE);
m_nightTargetTemperature = std::clamp(settings->nightTemperature(), MIN_TEMPERATURE, DEFAULT_DAY_TEMPERATURE);
double latitude, longitude;
auto correctReadin = [&latitude, &longitude]() {
if (!checkLocation(latitude, longitude)) {
// out of domain
latitude = 0;
longitude = 0;
}
};
// automatic
latitude = settings->latitudeAuto();
longitude = settings->longitudeAuto();
correctReadin();
m_latitudeAuto = latitude;
m_longitudeAuto = longitude;
// fixed location
latitude = settings->latitudeFixed();
longitude = settings->longitudeFixed();
correctReadin();
m_latitudeFixed = latitude;
m_longitudeFixed = longitude;
if (checkLocation(settings->latitudeAuto(), settings->longitudeAuto())) {
m_latitudeAuto = settings->latitudeAuto();
m_longitudeAuto = settings->longitudeAuto();
} else {
m_latitudeAuto = 0;
m_longitudeAuto = 0;
}
if (checkLocation(settings->latitudeFixed(), settings->longitudeFixed())) {
m_latitudeFixed = settings->latitudeFixed();
m_longitudeFixed = settings->longitudeFixed();
} else {
m_latitudeFixed = 0;
m_longitudeFixed = 0;
}
// fixed timings
QTime morning = QTime::fromString(settings->morningBeginFixed(), "hhmm");