diff --git a/resources/kolab/pimkolab/kolabformatV2/event.cpp b/resources/kolab/pimkolab/kolabformatV2/event.cpp --- a/resources/kolab/pimkolab/kolabformatV2/event.cpp +++ b/resources/kolab/pimkolab/kolabformatV2/event.cpp @@ -102,7 +102,7 @@ { if (endDate.length() > 10) { // This is a date + time - setEndDate(stringToDateTime(endDate)); + setEndDate(stringToKDateTime(endDate)); } else { // This is only a date setEndDate(stringToDate(endDate)); diff --git a/resources/kolab/pimkolab/kolabformatV2/incidence.cpp b/resources/kolab/pimkolab/kolabformatV2/incidence.cpp --- a/resources/kolab/pimkolab/kolabformatV2/incidence.cpp +++ b/resources/kolab/pimkolab/kolabformatV2/incidence.cpp @@ -120,7 +120,7 @@ { if (startDate.length() > 10) { // This is a date + time - setStartDate(stringToDateTime(startDate)); + setStartDate(stringToKDateTime(startDate)); } else { // This is only a date setStartDate(stringToDate(startDate)); diff --git a/resources/kolab/pimkolab/kolabformatV2/journal.cpp b/resources/kolab/pimkolab/kolabformatV2/journal.cpp --- a/resources/kolab/pimkolab/kolabformatV2/journal.cpp +++ b/resources/kolab/pimkolab/kolabformatV2/journal.cpp @@ -102,7 +102,7 @@ if (tagName == QLatin1String("summary")) { setSummary(element.text()); } else if (tagName == QLatin1String("start-date")) { - setStartDate(stringToDateTime(element.text())); + setStartDate(stringToKDateTime(element.text())); } else { // Not handled here return KolabBase::loadAttribute(element); diff --git a/resources/kolab/pimkolab/kolabformatV2/kolabbase.h b/resources/kolab/pimkolab/kolabformatV2/kolabbase.h --- a/resources/kolab/pimkolab/kolabformatV2/kolabbase.h +++ b/resources/kolab/pimkolab/kolabformatV2/kolabbase.h @@ -100,9 +100,11 @@ virtual int pilotSyncStatus() const; // String - Date conversion methods + static QString dateTimeToString(const QDateTime &time); static QString dateTimeToString(const KDateTime &time); static QString dateToString(const QDate &date); - static KDateTime stringToDateTime(const QString &time); + static QDateTime stringToDateTime(const QString &time); + static KDateTime stringToKDateTime(const QString &time); static QDate stringToDate(const QString &date); // String - Sensitivity conversion methods diff --git a/resources/kolab/pimkolab/kolabformatV2/kolabbase.cpp b/resources/kolab/pimkolab/kolabformatV2/kolabbase.cpp --- a/resources/kolab/pimkolab/kolabformatV2/kolabbase.cpp +++ b/resources/kolab/pimkolab/kolabformatV2/kolabbase.cpp @@ -110,7 +110,7 @@ creationDate = KDateTime::currentDateTime(KDateTime::Spec(mTimeZone)); qCDebug(PIMKOLAB_LOG) <<"Creation date set to current time"; } else { - creationDate = stringToDateTime(creationString); + creationDate = stringToKDateTime(creationString); qCDebug(PIMKOLAB_LOG) <<"Creation date loaded"; } KDateTime modified = KDateTime(addressee->revision(), mTimeZone); @@ -343,13 +343,13 @@ return true; } if (tagName == QLatin1String("creation-date")) { - setCreationDate(stringToDateTime(element.text())); + setCreationDate(stringToKDateTime(element.text())); return true; } break; case 'l': if (tagName == QLatin1String("last-modification-date")) { - setLastModified(stringToDateTime(element.text())); + setLastModified(stringToKDateTime(element.text())); return true; } break; @@ -431,6 +431,11 @@ return document; } +QString KolabBase::dateTimeToString(const QDateTime &time) +{ + return time.toString(Qt::ISODate); +} + QString KolabBase::dateTimeToString(const KDateTime &time) { return time.toString(KDateTime::ISODate); @@ -441,7 +446,12 @@ return date.toString(Qt::ISODate); } -KDateTime KolabBase::stringToDateTime(const QString &_date) +QDateTime KolabBase::stringToDateTime(const QString &time) +{ + return QDateTime::fromString(time, Qt::ISODate); +} + +KDateTime KolabBase::stringToKDateTime(const QString &_date) { const QString date(_date); return KDateTime::fromString(date, KDateTime::ISODate); diff --git a/resources/kolab/pimkolab/kolabformatV2/task.cpp b/resources/kolab/pimkolab/kolabformatV2/task.cpp --- a/resources/kolab/pimkolab/kolabformatV2/task.cpp +++ b/resources/kolab/pimkolab/kolabformatV2/task.cpp @@ -118,7 +118,7 @@ { if (date.length() > 10) { // This is a date + time - setDueDate(stringToDateTime(date)); + setDueDate(stringToKDateTime(date)); } else { // This is only a date setDueDate(stringToDate(date)); @@ -191,7 +191,7 @@ } else if (tagName == QLatin1String("parent")) { setParent(element.text()); } else if (tagName == QLatin1String("x-completed-date")) { - setCompletedDate(stringToDateTime(element.text())); + setCompletedDate(stringToKDateTime(element.text())); } else if (tagName == QLatin1String("start-date")) { setHasStartDate(true); setStartDate(element.text());