on xenial help sign in
Olsen TZ fixes (missing Greenland + a typo)
commitdede4d91ce26f39f4e473f945878f0ff4383154d authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 16 Feb 2016, 02:58 (11 years ago) parent4d151b7
1 file changed+4−4
plugins/Wizard/timezonemodel.cpp+4−4
plugins/Wizard/timezonemodel.cpp+4−4
@@ -201,7 +201,7 @@ static QByteArrayList olsenTimezones = {
201201 "America/Whitehorse",
202202 "America/Winnipeg",
203203 "America/Yellowknife",
204− "Ameriica/Swift_Current",
204+ "America/Swift_Current",
205205 "Arctic/Longyearbyen",
206206 "Asia/Aden",
207207 "Asia/Almaty",
@@ -403,7 +403,8 @@ static QByteArrayList olsenTimezones = {
403403 "Pacific/Tongatapu",
404404 "Pacific/Truk",
405405 "Pacific/Wake",
406− "Pacific/Wallis"
406+ "Pacific/Wallis",
407+ "America/Godthab"
407408};
408409
409410TimeZoneLocationModel::TimeZoneLocationModel(QObject *parent):
@@ -522,8 +523,8 @@ QJsonArray TimeZoneLocationModel::timezoneAndOffsetAtMapPoint(int x, int y, cons
522523 qWarning() << "Clicked the water!";
523524 return QJsonArray();
524525 }
525− const int zoneIndex = ((red & 248) << 1) + ((green >> 4) & 15);
526526
527+ const int zoneIndex = ((red & 248) << 1) + ((green >> 4) & 15);
527528 qDebug() << "Zone index:" << zoneIndex;
528529 if (zoneIndex >= 0 && zoneIndex < olsenTimezones.count()) {
529530 const QByteArray tzId = olsenTimezones.at(zoneIndex);
@@ -533,7 +534,6 @@ QJsonArray TimeZoneLocationModel::timezoneAndOffsetAtMapPoint(int x, int y, cons
533534 QJsonArray result;
534535 result.append(qUtf8Printable(tzId));
535536 result.append(static_cast<double>(tz.standardTimeOffset(QDateTime::currentDateTime())) / 3600);
536− qDebug() << "!!! timezone and offset" << result.at(0) << result.at(1);
537537 return result;
538538 }
539539 qWarning() << Q_FUNC_INFO << "Invalid timezone" << tzId;