-UTC -> Europe/London when referring to no timezone

-special handling for allDay Event in OPImEvent, avoid setting timezone
 as it is by default UTC
-No timezone set by default for an Event
-Recurrence is UTC (no timezone)
-Provide upgrade path from DateBook as by default events were in the current timezone but didn't have the timezone attribute
-unified handling of timezones, compatible with QtopiaDesktop
-do less conversions
-...

1 files changed, 5 insertions, 5 deletions

diff --git a/libopie2/opiepim/core/opimrecurrence.cpp b/libopie2/opiepim/core/opimrecurrence.cpp
index 4b1d886..c3ae350 100644
--- a/libopie2/opiepim/core/opimrecurrence.cpp
+++ b/libopie2/opiepim/core/opimrecurrence.cpp
@@ -638,10 +638,10 @@ QMap<int, QString> OPimRecurrence::toMap() const
     retMap.insert( OPimRecurrence::RPosition, QString::number(data->pos ) );
     retMap.insert( OPimRecurrence::RFreq, QString::number( data->freq ) );
     retMap.insert( OPimRecurrence::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) );
     if( data -> hasEnd )
-            retMap.insert( OPimRecurrence::EndDate, QString::number( OPimTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) );
-    retMap.insert( OPimRecurrence::Created, QString::number( OPimTimeZone::utc().fromUTCDateTime( data->create ) ) );
+            retMap.insert( OPimRecurrence::EndDate, QString::number( OPimTimeZone::current().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) );
+    retMap.insert( OPimRecurrence::Created, QString::number( OPimTimeZone::current().fromUTCDateTime( data->create ) ) );
     
     if ( data->list.isEmpty() ) return retMap;
 
     // save exceptions list here!!
@@ -669,13 +669,13 @@ void OPimRecurrence::fromMap( const QMap<int, QString>& map )
     data -> days  = (char) map[ OPimRecurrence::RWeekdays ].toInt();
     data -> pos   = map[ OPimRecurrence::RPosition ].toInt();
     data -> freq = map[ OPimRecurrence::RFreq ].toInt();
     data -> hasEnd= map[ OPimRecurrence::RHasEndDate ].toInt() ? true : false;
-    OPimTimeZone utc = OPimTimeZone::utc();
+    OPimTimeZone cur = OPimTimeZone::current();
     if ( data -> hasEnd ){
-            data -> end = utc.fromUTCDateTime( (time_t) map[ OPimRecurrence::EndDate ].toLong() ).date();
+            data -> end = cur.fromUTCDateTime( (time_t) map[ OPimRecurrence::EndDate ].toLong() ).date();
     }
-    data -> create = utc.fromUTCDateTime( (time_t) map[ OPimRecurrence::Created ].toLong() ).date();
+    data -> create = cur.fromUTCDateTime( (time_t) map[ OPimRecurrence::Created ].toLong() ).date();
 
 #if 0
     // FIXME: Exceptions currently not supported...
     // Convert the list of exceptions from QString into ExceptionList