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

List:       kde-commits
Subject:    KDE/kdebase/kicker/applets/clock
From:       David Faure <faure () kde ! org>
Date:       2005-07-04 21:49:14
Message-ID: 1120513754.379757.14831.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 431648 by dfaure:

Ported to KTimezones API change - make sure you have kdelibs rev >= 431647


 M  +6 -8      zone.cpp  


--- trunk/KDE/kdebase/kicker/applets/clock/zone.cpp #431647:431648
@@ -81,22 +81,20 @@
 
 void Zone::readZoneList(KListView *listView )
 {
-  const QPtrList<KTimezone> *zones = m_zoneDb.allZones();
+  const KTimezones::ZoneMap zones = m_zoneDb.allZones();
   QMap<QString, QListViewItem*> KontinentMap;
-  QListViewItem *Kontinent;
 
   listView->setRootIsDecorated(true);
-  QPtrListIterator<KTimezone> it(*zones);
-  KTimezone *zone;
-  while ((zone = it.current()))
+  for( KTimezones::ZoneMap::ConstIterator it = zones.begin(); it != zones.end(); ++it )
   {
+    const KTimezone *zone = it.data();
     QString tzName = zone->name();
     QString comment = zone->comment();
     if (!comment.isEmpty())
-      comment = i18n(comment.latin1());
+      comment = i18n(comment.utf8());
 
-    QStringList KontCity = QStringList::split("/", i18n(tzName.latin1()).replace("_", " "));
-    Kontinent = KontinentMap[KontCity[0]];
+    const QStringList KontCity = QStringList::split("/", i18n(tzName.latin1()).replace("_", " "));
+    QListViewItem* Kontinent = KontinentMap[KontCity[0]];
     if (!Kontinent) {
 	KontinentMap[KontCity[0]] = new QListViewItem(listView, KontCity[0]);
 	Kontinent = KontinentMap[KontCity[0]];
[prev in list] [next in list] [prev in thread] [next in thread]