-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, 7 insertions, 5 deletions

diff --git a/libopie2/opiepim/core/opimtimezone.cpp b/libopie2/opiepim/core/opimtimezone.cpp
index fefceb5..5b32b1f 100644
--- a/libopie2/opiepim/core/opimtimezone.cpp
+++ b/libopie2/opiepim/core/opimtimezone.cpp
@@ -39,46 +39,49 @@
 
 namespace Opie
 {
 
 QDateTime utcTime( time_t t )
 {
     tm * broken = ::gmtime( &t );
     QDateTime ret;
     ret.setDate( QDate( broken->tm_year + 1900, broken->tm_mon + 1, broken->tm_mday ) );
     ret.setTime( QTime( broken->tm_hour, broken->tm_min, broken->tm_sec ) );
     return ret;
 }
+
 QDateTime utcTime( time_t t, const QString& zone )
 {
     QCString org = ::getenv( "TZ" );
 #ifndef Q_OS_MACX   // Following line causes bus errors on Mac
 
     ::setenv( "TZ", zone.latin1(), true );
     ::tzset();
 
     tm* broken = ::localtime( &t );
     ::setenv( "TZ", org, true );
 #else
 #warning "Need a replacement for MacOSX!!"
 
     tm* broken = ::localtime( &t );
 #endif
 
     QDateTime ret;
     ret.setDate( QDate( broken->tm_year + 1900, broken->tm_mon + 1, broken->tm_mday ) );
     ret.setTime( QTime( broken->tm_hour, broken->tm_min, broken->tm_sec ) );
 
     return ret;
 }
+
+
 time_t to_Time_t( const QDateTime& utc, const QString& str )
 {
     QDate d = utc.date();
     QTime t = utc.time();
 
     tm broken;
     broken.tm_year = d.year() - 1900;
     broken.tm_mon = d.month() - 1;
     broken.tm_mday = d.day();
     broken.tm_hour = t.hour();
     broken.tm_min = t.minute();
     broken.tm_sec = t.second();
@@ -142,50 +145,49 @@ QDateTime OPimTimeZone::fromUTCDateTime( time_t t )
 QDateTime OPimTimeZone::toDateTime( time_t t )
 {
     return utcTime( t, m_name );
 }
 
 
 /*
  * convert dt to utc using zone.m_name
  * convert utc -> timeZoneDT using this->m_name
  */
 QDateTime OPimTimeZone::toDateTime( const QDateTime& dt, const OPimTimeZone& zone )
 {
-    time_t utc = to_Time_t( dt, zone.m_name );
-    owarn << "" << utc << " " << zone.m_name << "" << oendl;
-    return utcTime( utc, m_name );
+    time_t utc = to_Time_t( dt, m_name );
+    return utcTime( utc, zone.m_name );
 }
 
 
 time_t OPimTimeZone::fromDateTime( const QDateTime& time )
 {
     return to_Time_t( time, m_name );
 }
 
 
 time_t OPimTimeZone::fromUTCDateTime( const QDateTime& time )
 {
-    return to_Time_t( time, "UTC" );
+    return to_Time_t( time, "Europe/London" );
 }
 
 
 OPimTimeZone OPimTimeZone::current()
 {
     QCString str = ::getenv( "TZ" );
     OPimTimeZone zone( str );
     return zone;
 }
 
 
 OPimTimeZone OPimTimeZone::utc()
 {
-    return OPimTimeZone( "UTC" );
+    return OPimTimeZone( "Europe/London" );
 }
 
 
 QString OPimTimeZone::timeZone() const
 {
     return m_name;
 }
 
 }