napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[welcome] Remove name-tangle

Browse Source 
- use useful, not-single-letter, variable names
- don't rename inconsistently in the lambda capture
This commit is contained in:
Adriaan de Groot 2020-06-08 08:05:46 -04:00
parent 8255bc3fc1
commit f35fab24ac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/welcome/Config.cpp
View File

@ -336,7 +336,7 @@ setCountry( Config* config, const QString& countryCode, CalamaresUtils::GeoIP::H
}
static inline void
setGeoIP( Config* c, const QVariantMap& configurationMap )
setGeoIP( Config* config, const QVariantMap& configurationMap )
{
bool ok = false;
QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok );
@ -350,12 +350,12 @@ setGeoIP( Config* c, const QVariantMap& configurationMap )
if ( handler->type() != CalamaresUtils::GeoIP::Handler::Type::None )
{
auto* future = new FWString();
QObject::connect( future, &FWString::finished, [config = c, f = future, h = handler]() {
QString countryResult = f->future().result();
QObject::connect( future, &FWString::finished, [config, future, handler]() {
QString countryResult = future->future().result();
cDebug() << "GeoIP result for welcome=" << countryResult;
::setCountry( config, countryResult, h );
f->deleteLater();
delete h;
::setCountry( config, countryResult, handler );
future->deleteLater();
delete handler;
} );
future->setFuture( handler->queryRaw() );
}