[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/korganizer
From:       Allen Winter <winter () kde ! org>
Date:       2009-12-28 22:47:03
Message-ID: 1262040423.013563.20600.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1067094 by winterz:

in the tooltip, use the new TZMaps::timezoneToUtcOffset() convenience function

MERGE: 4.5 (must merge the tzmapping stuff in kcal first)



 M  +1 -6      timelabels.cpp  


--- branches/kdepim/enterprise4/kdepim/korganizer/timelabels.cpp #1067093:1067094
@@ -396,13 +396,8 @@
     toolTip += i18n( "Country Code: %1", tz.countryCode() );
   }
 
-#if defined(Q_OS_WIN32) //krazy:exclude=cpp
   QList<QByteArray> abbr =
-    TZMaps::utcOffsetToAbbreviation( TZMaps::winZoneToUtcOffset( tz.name() ) );
-#else
-  QList<QByteArray> abbr =
-    TZMaps::utcOffsetToAbbreviation( TZMaps::olsonToUtcOffset( tz.name() ) );
-#endif
+    TZMaps::utcOffsetToAbbreviation( TZMaps::timezoneToUtcOffset( tz.name() ) );
   if ( !abbr.isEmpty() ) {
     toolTip += "<br/>";
     toolTip += i18n( "Abbreviations:" );
[prev in list] [next in list] [prev in thread] [next in thread]