1 files changed, 8 insertions, 4 deletions

diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp
index b6843d2..e4a25ef 100644
--- a/core/settings/citytime/zonemap.cpp
+++ b/core/settings/citytime/zonemap.cpp
@@ -14,38 +14,42 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 // changes by Maximilian Reiss <harlekin@handhelds.org>
 
 #include "sun.h"
 #include "zonemap.h"
 
+/* OPIE */
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qfile.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qtimer.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qlistview.h>
 #include <qwhatsthis.h>
 
+/* STD */
 #include <limits.h>
 
 // the map file...
 static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab";
 static const char strMAP[] = "citytime/simple_grid_400";
 
 // the maximum distance we'll allow the pointer to be away from a city
 // and still show the city's time
 static const int iTHRESHOLD = 50000;
 
 // The label offset (how far away from pointer)
 static const int iLABELOFFSET = 8;
@@ -121,28 +125,28 @@ ZoneField::ZoneField( const QString& strLine )
         iLen = (iStop - iStart) + 1;
         strCountry = strLine.mid( iStart, iLen );
     }
     // now match the city...
     iStart = regCity.match( strLine, iStart + iLen, &iLen );
     if ( iStart >= 0 ) {
         strCity = strLine.mid( iStart, iLen );
     }
 }
 
 void ZoneField::showStructure( void ) const
 {
-    qDebug( "Country: %s", strCountry.latin1() );
-    qDebug( "City: %s", strCity.latin1() );
-    qDebug( "x: %d", _x );
-    qDebug( "y: %d\n", _y );
+    odebug << "Country: " << strCountry << "" << oendl;
+    odebug << "City: " << strCity << "" << oendl;
+    odebug << "x: " << _x << "" << oendl;
+    odebug << "y: " << _y << "\n" << oendl;
 }
 
 ZoneMap::ZoneMap( QWidget *parent, const char* name )
     : QScrollView( parent, name ),
       pLast( 0 ),
       pRepaint( 0 ),
       ox( 0 ),
       oy( 0 ),
       drawableW( -1 ),
       drawableH( -1 ),
       bZoom( FALSE ),
       bIllum( TRUE ),