| author | zautrix <zautrix> | 2004-10-05 13:34:33 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-05 13:34:33 (UTC) |
| commit | 191ced43b27c047b0a39f0acdc8ba1f8a58817df (patch) (unidiff) | |
| tree | d164ae32c16259d9a8d5c9fdfa74f975d1f10075 /libkcal | |
| parent | a946c09db6f71f595d8bdcb6b34ba3160c5497dc (diff) | |
| download | kdepimpi-191ced43b27c047b0a39f0acdc8ba1f8a58817df.zip kdepimpi-191ced43b27c047b0a39f0acdc8ba1f8a58817df.tar.gz kdepimpi-191ced43b27c047b0a39f0acdc8ba1f8a58817df.tar.bz2 | |
fix for filewatch and vcal timezone
| -rw-r--r-- | libkcal/vcalformat.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp index 4727a7a..309c699 100644 --- a/libkcal/vcalformat.cpp +++ b/libkcal/vcalformat.cpp | |||
| @@ -1479,17 +1479,17 @@ QDateTime VCalFormat::ISOToQDateTime(const QString & dtStr) | |||
| 1479 | tmpDate.setYMD(year, month, day); | 1479 | tmpDate.setYMD(year, month, day); |
| 1480 | tmpTime.setHMS(hour, minute, second); | 1480 | tmpTime.setHMS(hour, minute, second); |
| 1481 | 1481 | ||
| 1482 | ASSERT(tmpDate.isValid()); | 1482 | ASSERT(tmpDate.isValid()); |
| 1483 | ASSERT(tmpTime.isValid()); | 1483 | ASSERT(tmpTime.isValid()); |
| 1484 | QDateTime tmpDT(tmpDate, tmpTime); | 1484 | QDateTime tmpDT(tmpDate, tmpTime); |
| 1485 | // correct for GMT if string is in Zulu format | 1485 | // correct for GMT if string is in Zulu format |
| 1486 | if (dtStr.at(dtStr.length()-1) == 'Z') | 1486 | if (dtStr.at(dtStr.length()-1) == 'Z') |
| 1487 | tmpDT = tmpDT.addSecs(60*mCalendar->getTimeZone()); | 1487 | tmpDT = tmpDT.addSecs (KGlobal::locale()->localTimeOffset( tmpDT )*60); |
| 1488 | return tmpDT; | 1488 | return tmpDT; |
| 1489 | } | 1489 | } |
| 1490 | 1490 | ||
| 1491 | QDate VCalFormat::ISOToQDate(const QString &dateStr) | 1491 | QDate VCalFormat::ISOToQDate(const QString &dateStr) |
| 1492 | { | 1492 | { |
| 1493 | int year, month, day; | 1493 | int year, month, day; |
| 1494 | 1494 | ||
| 1495 | year = dateStr.left(4).toInt(); | 1495 | year = dateStr.left(4).toInt(); |