OSDN Git Service

Clang: don't shadow global int timezone
authorAdriaan de Groot <groot@kde.org>
Mon, 11 Sep 2017 07:42:21 +0000 (09:42 +0200)
committerAdriaan de Groot <groot@kde.org>
Mon, 11 Sep 2017 07:42:21 +0000 (09:42 +0200)
src/modules/locale/LocaleViewStep.cpp

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