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

[locale] Reduce warnings (shadowed global)

Browse Source
This commit is contained in:
Adriaan de Groot 2019-04-15 10:03:12 -04:00
parent 094110dccf
commit 009dfd7de5
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/timezonewidget/localeglobal.cpp
View File

@ -148,18 +148,18 @@ LocaleGlobal::initLocations() {
continue; continue;
Location location; Location location;
QStringList timezone = list.at(2).split('/', QString::SkipEmptyParts); QStringList timezoneParts = list.at(2).split('/', QString::SkipEmptyParts);
int cooSplitPos = QString(list.at(1)).remove(0, 1).indexOf(QRegExp("[-+]")) + 1; int cooSplitPos = QString(list.at(1)).remove(0, 1).indexOf(QRegExp("[-+]")) + 1;
if (timezone.size() < 2) if (timezoneParts.size() < 2)
continue; continue;
QString countryCode = list.at(0).trimmed(); QString countryCode = list.at(0).trimmed();
if (countryCode.size() != 2) if (countryCode.size() != 2)
continue; continue;
location.region = timezone.takeFirst(); location.region = timezoneParts.takeFirst();
location.zone = timezone.join( '/' ); location.zone = timezoneParts.join( '/' );
location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos)); location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos));
location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos)); location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos));
location.country = countryCode; location.country = countryCode;