From 009dfd7de58b0a857e4e1e5648bada2992616fcb Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 15 Apr 2019 10:03:12 -0400 Subject: [PATCH] [locale] Reduce warnings (shadowed global) --- src/modules/locale/timezonewidget/localeglobal.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/locale/timezonewidget/localeglobal.cpp b/src/modules/locale/timezonewidget/localeglobal.cpp index 6ac66357e..6303ffdcb 100644 --- a/src/modules/locale/timezonewidget/localeglobal.cpp +++ b/src/modules/locale/timezonewidget/localeglobal.cpp @@ -148,18 +148,18 @@ LocaleGlobal::initLocations() { continue; 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; - if (timezone.size() < 2) + if (timezoneParts.size() < 2) continue; QString countryCode = list.at(0).trimmed(); if (countryCode.size() != 2) continue; - location.region = timezone.takeFirst(); - location.zone = timezone.join( '/' ); + location.region = timezoneParts.takeFirst(); + location.zone = timezoneParts.join( '/' ); location.latitude = getRightGeoLocation(list.at(1).mid(0, cooSplitPos)); location.longitude = getRightGeoLocation(list.at(1).mid(cooSplitPos)); location.country = countryCode;