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

Clang: don't shadow global int timezone

Browse Source
This commit is contained in:
Adriaan de Groot 2017-09-11 09:42:21 +02:00
parent d2964cc71c
commit 25de3aca6e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/locale/LocaleViewStep.cpp
View File

@ -132,12 +132,12 @@ LocaleViewStep::fetchGeoIpTimezone()
!map.value( "time_zone" ).toString().isEmpty() ) !map.value( "time_zone" ).toString().isEmpty() )
{ {
QString timezoneString = map.value( "time_zone" ).toString(); QString timezoneString = map.value( "time_zone" ).toString();
QStringList timezone = timezoneString.split( '/', QString::SkipEmptyParts ); QStringList tzParts = timezoneString.split( '/', QString::SkipEmptyParts );
if ( timezone.size() >= 2 ) if ( tzParts.size() >= 2 )
{ {
cDebug() << "GeoIP reporting" << timezoneString; cDebug() << "GeoIP reporting" << timezoneString;
QString region = timezone.takeFirst(); QString region = tzParts.takeFirst();
QString zone = timezone.join( '/' ); QString zone = tzParts.join( '/' );
m_startingTimezone = qMakePair( region, zone ); m_startingTimezone = qMakePair( region, zone );
} }
} }