3 files changed, 314 insertions, 302 deletions

diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp
index 721285d..d73bda1 100644
--- a/core/settings/citytime/citytime.cpp
+++ b/core/settings/citytime/citytime.cpp
@@ -14,48 +14,52 @@
 ** 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 "zonemap.h"
 #include "citytime.h"
 
+/* OPIE */
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/tzselect.h>
 #if !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 
+/* STD */
 #include <stdlib.h>
 
 CityTime::CityTime( QWidget *parent, const char* name,
                             WFlags fl )
     : CityTimeBase( parent, name, fl ),
       strRealTz(0),
       bAdded(false)
 {
     Config config( "qpe" );
     config.setGroup( "Time" );
     bWhichClock = config.readBoolEntry( "AMPM", TRUE );
-    qDebug( QString("%1").arg(bWhichClock) );
+    odebug << QString("%1").arg(bWhichClock) << oendl;
     frmMap->changeClock( bWhichClock );
 
     char *pEnv;
     pEnv = NULL;
     pEnv = getenv("TZ");
     if ( pEnv )
         strRealTz = pEnv;
     pEnv = NULL;
     pEnv = getenv("HOME");
     if ( pEnv )
         strHome = pEnv;
     // append the labels to their respective lists...
@@ -109,87 +113,87 @@ CityTime::CityTime( QWidget *parent, const char* name,
     bAdded = true;
     readInTimes();
     changed = FALSE;
     QObject::connect( qApp, SIGNAL( clockChanged(bool) ),
                       this, SLOT( changeClock(bool) ) );
     // now start the timer so we can update the time quickly every second
     timerEvent( 0 );
 }
 
 CityTime::~CityTime()
 {
     if ( changed ) {
-        Config cfg("CityTime");
-        cfg.setGroup("TimeZones");
-        QListIterator<QToolButton> itCity( listCities );
-        int i;
-        bool realTzWritten = FALSE;
-        for ( i = 0, itCity.toFirst();  i < CITIES; i++, ++itCity ) {
-            if ( !strCityTz[i].isNull() ) {
-                cfg.writeEntry("Zone"+QString::number(i), strCityTz[i]);
-                cfg.writeEntry("ZoneName"+QString::number(i), itCity.current()->text());
-                if ( strCityTz[i] == strRealTz )
-                    realTzWritten = TRUE;
-            }
-        }
-        if ( realTzWritten ) {
-            cfg.removeEntry("Zone"+QString::number(CITIES));
-            cfg.removeEntry("ZoneName"+QString::number(CITIES));
-        } else {
-            cfg.writeEntry("Zone"+QString::number(CITIES), strRealTz);
-            if ( nameRealTz.isEmpty() ) {
-                int i =  strRealTz.find( '/' );
-                nameRealTz = strRealTz.mid( i+1 );
-            }
-            cfg.writeEntry("ZoneName"+QString::number(CITIES), nameRealTz);
-        }
-        QCopEnvelope ( "QPE/System", "timeZoneListChange()" );
+    Config cfg("CityTime");
+    cfg.setGroup("TimeZones");
+    QListIterator<QToolButton> itCity( listCities );
+    int i;
+    bool realTzWritten = FALSE;
+    for ( i = 0, itCity.toFirst();  i < CITIES; i++, ++itCity ) {
+        if ( !strCityTz[i].isNull() ) {
+        cfg.writeEntry("Zone"+QString::number(i), strCityTz[i]);
+        cfg.writeEntry("ZoneName"+QString::number(i), itCity.current()->text());
+        if ( strCityTz[i] == strRealTz )
+            realTzWritten = TRUE;
+        }
+    }
+    if ( realTzWritten ) {
+        cfg.removeEntry("Zone"+QString::number(CITIES));
+        cfg.removeEntry("ZoneName"+QString::number(CITIES));
+    } else {
+        cfg.writeEntry("Zone"+QString::number(CITIES), strRealTz);
+        if ( nameRealTz.isEmpty() ) {
+        int i =  strRealTz.find( '/' );
+        nameRealTz = strRealTz.mid( i+1 );
+        }
+        cfg.writeEntry("ZoneName"+QString::number(CITIES), nameRealTz);
+    }
+    QCopEnvelope ( "QPE/System", "timeZoneListChange()" );
 
-        changed = FALSE;
+    changed = FALSE;
     }
     // restore the timezone, just in case we messed with it and
     // are destroyed at an inoppurtune moment
     if ( !strRealTz.isNull() ) {
         // this should be checked, but there is not much that can done at this
         //point if it fails
         setenv( "TZ", strRealTz, true );
     }
 }
 
 void CityTime::timerEvent( QTimerEvent *e )
 {
     if ( e )
-        killTimer( timerId );
+    killTimer( timerId );
     // change the time again!!
     showTime();
     int ms = 1000 - QTime::currentTime().msec();
     timerId = startTimer( ms );
 }
 
 void CityTime::mousePressEvent( QMouseEvent * )
 {
     // DEBUG enable this to get a look at the zone information DEBUG
 //    frmMap->showZones();
 }
 
 void CityTime::showTime( void )
 {
     int i;
     QListIterator<QLabel> itTime(listTimes);
 
     // traverse the list...
     for ( i = 0, itTime.toFirst(); i < CITIES; i++, ++itTime) {
         if ( !strCityTz[i].isNull() ) {
             if ( setenv( "TZ", strCityTz[i], true ) == 0 ) {
-              itTime.current()->setText( TimeString::shortTime( bWhichClock ) );
+          itTime.current()->setText( TimeString::shortTime( bWhichClock ) );
             } else {
                 QMessageBox::critical( this, tr( "Time Changing" ),
                 tr( "There was a problem setting timezone %1" )
                 .arg( QString::number( i + 1 ) ) );
             }
         }
     }
     // done playing around... put it all back
     unsetenv( "TZ" );
     if ( !strRealTz.isNull() ) {
         if ( setenv( "TZ", strRealTz, true ) != 0 ) {
             QMessageBox::critical( this, tr( "Restore Time Zone" ),
@@ -214,66 +218,66 @@ void CityTime::slotNewTz( const QString & strNewCountry,
     QListIterator<QToolButton> itCity(listCities);
     int i;
     // go through the list and make adjustments based on which button is on
     for ( i = 0, itCity.toFirst(); itCity.current(), i < CITIES; i++, ++itCity ) {
         QToolButton *cmdTmp = itCity.current();
         if ( cmdTmp->isOn() ) {
             strCityTz[i] = strNewCountry + strNewCity;
             QString s = strNewCity;
             cmdTmp->setText( s.replace( QRegExp("_"), " " ) );
             cmdTmp->toggle();
             // we can actually break, since there is only one button
             // that is ever pressed!
-            changed = TRUE;
+        changed = TRUE;
             break;
         }
     }
     showTime();
     buttonWidget->show();
     selWidget->hide();
 }
 
 void CityTime::readInTimes( void )
 {
     Config cfg("CityTime");
     cfg.setGroup("TimeZones");
     QListIterator<QToolButton> itCity( listCities );
     int i=0;
     nameRealTz = QString::null;
     QString zn;
     for ( ; i < CITIES ; i++ ) {
-        zn = cfg.readEntry("Zone"+QString::number(i), QString::null);
-        if ( zn.isNull() )
-            break;
-        QString nm = cfg.readEntry("ZoneName"+QString::number(i));
-        strCityTz[i] = zn;
-        itCity.current()->setText(nm);
-        if ( zn == strRealTz )
-            nameRealTz = nm;
-        ++itCity;
+    zn = cfg.readEntry("Zone"+QString::number(i), QString::null);
+    if ( zn.isNull() )
+        break;
+    QString nm = cfg.readEntry("ZoneName"+QString::number(i));
+    strCityTz[i] = zn;
+    itCity.current()->setText(nm);
+    if ( zn == strRealTz )
+        nameRealTz = nm;
+    ++itCity;
     }
     if ( i == 0 ) {
         // write in our own in a shameless self promotion and some humor
         QStringList list = timezoneDefaults();
         int i;
         QStringList::Iterator it = list.begin();
         for ( i = 0, itCity.toFirst(); i < CITIES && itCity.current();
               i++, ++itCity ) {
             strCityTz[i] = *it++;
             itCity.current()->setText( *it++ );
         }
     }
     if ( nameRealTz.isEmpty() ) {
-        //remember the current time zone even if we don't have room
-        //to show it.
-        zn = cfg.readEntry("Zone"+QString::number(CITIES), QString::null);
-        if ( zn == strRealTz )
-            nameRealTz = cfg.readEntry("ZoneName"+QString::number(CITIES));
-        i++;
+    //remember the current time zone even if we don't have room
+    //to show it.
+    zn = cfg.readEntry("Zone"+QString::number(CITIES), QString::null);
+    if ( zn == strRealTz )
+        nameRealTz = cfg.readEntry("ZoneName"+QString::number(CITIES));
+    i++;
     }
 }
 
 void CityTime::changeClock( bool newClock )
 {
     bWhichClock = newClock;
     showTime();
 }
diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp
index 323929b..77cb91d 100644
--- a/core/settings/citytime/citytimebase.cpp
+++ b/core/settings/citytime/citytimebase.cpp
@@ -1,34 +1,38 @@
 
 
 // changes by Maximilian Reiss <harlekin@handhelds.org>
 
 #include "citytimebase.h"
+#include "zonemap.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qlabel.h>
 #include <qtoolbutton.h>
-#include "zonemap.h"
 #include <qlayout.h>
 #include <qwhatsthis.h>
 
 
 /*
  *  Constructs a CityTimeBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
 CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     : QWidget( parent, name, WStyle_ContextHelp )
 {
     if ( !name )
-        setName( "CityTimeBase" );
+    setName( "CityTimeBase" );
     setCaption( tr( "City Time" ) );
     CityTimeBaseLayout = new QVBoxLayout( this );
     CityTimeBaseLayout->setSpacing( 3 );
     CityTimeBaseLayout->setMargin( 0 );
 
     frmMap = new ZoneMap( this, "frmMap" );
     frmMap->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, frmMap->sizePolicy().hasHeightForWidth() ) );
     CityTimeBaseLayout->addWidget( frmMap );
 
     buttonWidget = new QWidget( this );
     QWhatsThis::add( buttonWidget, tr( "Click on one of the set cities to replace it" ) );
     Layout2 = new QGridLayout( buttonWidget );
@@ -332,80 +336,80 @@ CityTimeBase::~CityTimeBase()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 /*
  *  Main event handler. Reimplemented to handle application
  *  font changes
  */
 bool CityTimeBase::event( QEvent* ev )
 {
     bool ret = QWidget::event( ev );
     if ( ev->type() == QEvent::ApplicationFontChange ) {
-        QFont cmdCity7_font(  cmdCity7->font() );
-        cmdCity7_font.setBold( TRUE );
-        cmdCity7->setFont( cmdCity7_font );
-        QFont lblCTime9_font(  lblCTime9->font() );
-        lblCTime9_font.setPointSize( 10 );
-        lblCTime9->setFont( lblCTime9_font );
-        QFont cmdCity8_font(  cmdCity8->font() );
-        cmdCity8_font.setBold( TRUE );
-        cmdCity8->setFont( cmdCity8_font );
-        QFont cmdCity2_font(  cmdCity2->font() );
-        cmdCity2_font.setBold( TRUE );
-        cmdCity2->setFont( cmdCity2_font );
-        QFont lblCTime6_font(  lblCTime6->font() );
-        lblCTime6_font.setPointSize( 10 );
-        lblCTime6->setFont( lblCTime6_font );
-        QFont cmdCity6_font(  cmdCity6->font() );
-        cmdCity6_font.setBold( TRUE );
-        cmdCity6->setFont( cmdCity6_font );
-        QFont cmdCity4_font(  cmdCity4->font() );
-        cmdCity4_font.setBold( TRUE );
-        cmdCity4->setFont( cmdCity4_font );
-        QFont lblCTime5_font(  lblCTime5->font() );
-        lblCTime5_font.setPointSize( 10 );
-        lblCTime5->setFont( lblCTime5_font );
-        QFont lblCTime2_font(  lblCTime2->font() );
-        lblCTime2_font.setPointSize( 10 );
-        lblCTime2->setFont( lblCTime2_font );
-        QFont lblCTime1_font(  lblCTime1->font() );
-        lblCTime1_font.setPointSize( 10 );
-        lblCTime1->setFont( lblCTime1_font );
-        QFont cmdCity3_font(  cmdCity3->font() );
-        cmdCity3_font.setBold( TRUE );
-        cmdCity3->setFont( cmdCity3_font );
-        QFont lblCTime8_font(  lblCTime8->font() );
-        lblCTime8_font.setPointSize( 10 );
-        lblCTime8->setFont( lblCTime8_font );
-        QFont cmdCity1_font(  cmdCity1->font() );
-        cmdCity1_font.setBold( TRUE );
-        cmdCity1->setFont( cmdCity1_font );
-        QFont lblCTime7_font(  lblCTime7->font() );
-        lblCTime7_font.setPointSize( 10 );
-        lblCTime7->setFont( lblCTime7_font );
-        QFont lblCTime4_font(  lblCTime4->font() );
-        lblCTime4_font.setPointSize( 10 );
-        lblCTime4->setFont( lblCTime4_font );
-        QFont cmdCity5_font(  cmdCity5->font() );
-        cmdCity5_font.setBold( TRUE );
-        cmdCity5->setFont( cmdCity5_font );
-        QFont lblCTime3_font(  lblCTime3->font() );
-        lblCTime3_font.setPointSize( 10 );
-        lblCTime3->setFont( lblCTime3_font );
-        QFont cmdCity9_font(  cmdCity9->font() );
-        cmdCity9_font.setBold( TRUE );
-        cmdCity9->setFont( cmdCity9_font );
+    QFont cmdCity7_font(  cmdCity7->font() );
+    cmdCity7_font.setBold( TRUE );
+    cmdCity7->setFont( cmdCity7_font );
+    QFont lblCTime9_font(  lblCTime9->font() );
+    lblCTime9_font.setPointSize( 10 );
+    lblCTime9->setFont( lblCTime9_font );
+    QFont cmdCity8_font(  cmdCity8->font() );
+    cmdCity8_font.setBold( TRUE );
+    cmdCity8->setFont( cmdCity8_font );
+    QFont cmdCity2_font(  cmdCity2->font() );
+    cmdCity2_font.setBold( TRUE );
+    cmdCity2->setFont( cmdCity2_font );
+    QFont lblCTime6_font(  lblCTime6->font() );
+    lblCTime6_font.setPointSize( 10 );
+    lblCTime6->setFont( lblCTime6_font );
+    QFont cmdCity6_font(  cmdCity6->font() );
+    cmdCity6_font.setBold( TRUE );
+    cmdCity6->setFont( cmdCity6_font );
+    QFont cmdCity4_font(  cmdCity4->font() );
+    cmdCity4_font.setBold( TRUE );
+    cmdCity4->setFont( cmdCity4_font );
+    QFont lblCTime5_font(  lblCTime5->font() );
+    lblCTime5_font.setPointSize( 10 );
+    lblCTime5->setFont( lblCTime5_font );
+    QFont lblCTime2_font(  lblCTime2->font() );
+    lblCTime2_font.setPointSize( 10 );
+    lblCTime2->setFont( lblCTime2_font );
+    QFont lblCTime1_font(  lblCTime1->font() );
+    lblCTime1_font.setPointSize( 10 );
+    lblCTime1->setFont( lblCTime1_font );
+    QFont cmdCity3_font(  cmdCity3->font() );
+    cmdCity3_font.setBold( TRUE );
+    cmdCity3->setFont( cmdCity3_font );
+    QFont lblCTime8_font(  lblCTime8->font() );
+    lblCTime8_font.setPointSize( 10 );
+    lblCTime8->setFont( lblCTime8_font );
+    QFont cmdCity1_font(  cmdCity1->font() );
+    cmdCity1_font.setBold( TRUE );
+    cmdCity1->setFont( cmdCity1_font );
+    QFont lblCTime7_font(  lblCTime7->font() );
+    lblCTime7_font.setPointSize( 10 );
+    lblCTime7->setFont( lblCTime7_font );
+    QFont lblCTime4_font(  lblCTime4->font() );
+    lblCTime4_font.setPointSize( 10 );
+    lblCTime4->setFont( lblCTime4_font );
+    QFont cmdCity5_font(  cmdCity5->font() );
+    cmdCity5_font.setBold( TRUE );
+    cmdCity5->setFont( cmdCity5_font );
+    QFont lblCTime3_font(  lblCTime3->font() );
+    lblCTime3_font.setPointSize( 10 );
+    lblCTime3->setFont( lblCTime3_font );
+    QFont cmdCity9_font(  cmdCity9->font() );
+    cmdCity9_font.setBold( TRUE );
+    cmdCity9->setFont( cmdCity9_font );
     }
     return ret;
 }
 
 void CityTimeBase::beginNewTz()
 {
-    qWarning( "CityTimeBase::beginNewTz(): Not implemented yet!" );
+    owarn << "CityTimeBase::beginNewTz(): Not implemented yet!" << oendl;
 }
 
 void CityTimeBase::slotNewTz(const QString &, const QString &)
 {
-    qWarning( "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" );
+    owarn << "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" << oendl;
 }
 
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,135 +14,139 @@
 ** 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;
 
 // the size of the dot to draw, and where to start it
 static const int iCITYSIZE = 3;
 const int iCITYOFFSET = 2;
 
 // the darkening function
 static inline void darken( QImage *pImage, int start, int stop, int row );
 static void dayNight( QImage *pImage );
 
 ZoneField::ZoneField( const QString& strLine )
 {
     // make a bunch of RegExp's to match the data from the line
-            QRegExp regCoord( "[-+][0-9]+" );// the latitude
+    QRegExp regCoord( "[-+][0-9]+" );   // the latitude
     QRegExp regCountry( "[A-Za-z]+/" ); // the country (not good enough)
     QRegExp regCity( "[A-Za-z_-]*" ); // the city
 
     int iStart,
-        iStop,
+    iStop,
         iLen,
         tmp;
     QString strTmp;
     // we should be able to assume that the country code is always the first
     // two chars, so just grap them and let it go...
     strCountryCode = strLine.left( 2 );
     iStart = regCoord.match( strLine, 0, &iLen );
     if ( iStart >= 0 ) {
-        strTmp = strLine.mid( iStart, iLen );
-        tmp = strTmp.toInt();
-        // okay, there are two versions of the format, make a decision based on
-        // the size...
-        // Oh BTW, we are storing everything in seconds!
-        if ( iLen < 7 ) {
-            _y = tmp / 100;
-            _y *= 60;
-            _y += tmp % 100;
-            _y *= 60;
-        } else {
-            _y = tmp / 10000;
-            _y *= 60;
-            tmp %= 10000;
-            _y += tmp / 100;
-            _y *= 60;
-            tmp %= 100;
-            _y += tmp;
-        }
+    strTmp = strLine.mid( iStart, iLen );
+    tmp = strTmp.toInt();
+    // okay, there are two versions of the format, make a decision based on
+    // the size...
+    // Oh BTW, we are storing everything in seconds!
+    if ( iLen < 7 ) {
+        _y = tmp / 100;
+        _y *= 60;
+        _y += tmp % 100;
+        _y *= 60;
+    } else {
+        _y = tmp / 10000;
+        _y *= 60;
+        tmp %= 10000;
+        _y += tmp / 100;
+        _y *= 60;
+        tmp %= 100;
+        _y += tmp;
+    }
     }
     iStart = regCoord.match( strLine, iStart + iLen, &iLen );
     if ( iStart >= 0 ) {
-        strTmp = strLine.mid( iStart, iLen );
-        tmp = strTmp.toInt();
-        if ( iLen < 8 ) {
-            _x = tmp / 100;
-            _x *= 60;
-            _x += tmp % 100;
-            _x *= 60;
-        } else {
-            _x = tmp / 10000;
-            _x *= 60;
-            tmp %= 10000;
-            _x += tmp / 100;
-            _x *= 60;
-            tmp %= 100;
-            _x += tmp;
-        }
+    strTmp = strLine.mid( iStart, iLen );
+    tmp = strTmp.toInt();
+    if ( iLen < 8 ) {
+        _x = tmp / 100;
+        _x *= 60;
+        _x += tmp % 100;
+        _x *= 60;
+    } else {
+        _x = tmp / 10000;
+        _x *= 60;
+        tmp %= 10000;
+        _x += tmp / 100;
+        _x *= 60;
+        tmp %= 100;
+        _x += tmp;
+    }
     }
     iStart = regCountry.match( strLine, 0, &iLen );
     // help with the shortcoming in 2.x regexp...
     iStop = strLine.findRev( '/' );
     if ( iStart >= 0 ) {
-        iLen = (iStop - iStart) + 1;
-        strCountry = strLine.mid( iStart, iLen );
+    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 );
+    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 ),
@@ -198,138 +202,138 @@ ZoneMap::ZoneMap( QWidget *parent, const char* name )
     // May as well read in the timezone information too...
     readZones();
 }
 
 ZoneMap::~ZoneMap()
 {
 }
 
 void ZoneMap::readZones( void )
 {
     QFile fZone( strZONEINFO );
     if ( !fZone.open( IO_ReadOnly ) ) {
-        QMessageBox::warning (this,
-                tr( "Unable to Find Timezone Info" ),
-                tr( "<p>Unable to find any timezone information in %1" )
-                .arg( strZONEINFO ));
-        exit(-1);
+    QMessageBox::warning (this,
+        tr( "Unable to Find Timezone Info" ),
+        tr( "<p>Unable to find any timezone information in %1" )
+        .arg( strZONEINFO ));
+    exit(-1);
     } else {
-        QTextStream tZone( &fZone );
-        while ( !tZone.atEnd() ) {
-            QString strLine = tZone.readLine();
-            // only pass on lines that aren't comments
-            if ( strLine[0] != '#' ) {
-                zones.append( new ZoneField( strLine ) );
-            }
-        }
-        fZone.close();
+    QTextStream tZone( &fZone );
+    while ( !tZone.atEnd() ) {
+        QString strLine = tZone.readLine();
+        // only pass on lines that aren't comments
+        if ( strLine[0] != '#' ) {
+        zones.append( new ZoneField( strLine ) );
+        }
+    }
+    fZone.close();
     }
 }
 
 void ZoneMap::viewportMousePressEvent( QMouseEvent* event )
 {
     // add the mouse event into the normalizer, and get the average,
     // pass it along
     slotRedraw();
     norm.start();
     norm.addEvent( event->pos() );
 }
 
 void ZoneMap::viewportMouseMoveEvent( QMouseEvent* event )
 {
     norm.addEvent( event->pos() );
 }
 
 void ZoneMap::viewportMouseReleaseEvent( QMouseEvent* )
 {
     // get the averaged points in case a timeout hasn't occurred,
     // more for "mouse clicks"
     norm.stop();
     if ( pLast != NULL ) {
-        emit signalTz( pLast->country(), pLast->city() );
-        pLast = NULL;
+    emit signalTz( pLast->country(), pLast->city() );
+    pLast = NULL;
     }
     tHide->start( 2000, true );
 }
 
 void ZoneMap::keyPressEvent( QKeyEvent *ke )
 {
     switch ( ke->key() ) {
-        case Key_Left:
-        case Key_Right:
-        case Key_Up:
-        case Key_Down: {
-                tHide->stop();
-                if ( !cursor )
-                    slotFindCity( QPoint( contentsWidth(), contentsHeight() ) / 2 );
-                ZoneField *city = findCityNear( cursor, ke->key() );
-                if ( city ) {
-                    cursor = city;
-                    int tmpx, tmpy;
-                    zoneToWin( cursor->x(), cursor->y(), tmpx, tmpy );
-                    ensureVisible( tmpx, tmpy );
-                    showCity( cursor );
-                    tHide->start( 3000, true );
-                }
-            }
-            break;
-
-        case Key_Space:
-        case Key_Enter:
-        case Key_Return:
-            if ( cursor ) {
-                emit signalTz( cursor->country(), cursor->city() );
-                tHide->start( 0, true );
-            }
-            break;
+    case Key_Left:
+    case Key_Right:
+    case Key_Up:
+    case Key_Down: {
+        tHide->stop();
+        if ( !cursor )
+            slotFindCity( QPoint( contentsWidth(), contentsHeight() ) / 2 );
+        ZoneField *city = findCityNear( cursor, ke->key() );
+        if ( city ) {
+            cursor = city;
+            int tmpx, tmpy;
+            zoneToWin( cursor->x(), cursor->y(), tmpx, tmpy );
+            ensureVisible( tmpx, tmpy );
+            showCity( cursor );
+            tHide->start( 3000, true );
+        }
+        }
+        break;
+
+    case Key_Space:
+    case Key_Enter:
+    case Key_Return:
+        if ( cursor ) {
+        emit signalTz( cursor->country(), cursor->city() );
+        tHide->start( 0, true );
+        }
+        break;
     }
 }
 
 ZoneField *ZoneMap::findCityNear( ZoneField *city, int key )
 {
     ZoneField *pZone;
     ZoneField *pClosest = 0;
     long ddist = LONG_MAX;
 
     QListIterator<ZoneField> it( zones );
     for (; it.current(); ++it) {
-        pZone = it.current();
-        long dx = (pZone->x() - city->x())/100;
-        long dy = (pZone->y() - city->y())/100;
-        switch ( key ) {
-            case Key_Right:
-            case Key_Left:
-                if ( key == Key_Left )
-                    dx = -dx;
-                if ( dx > 0 ) {
-                    long dist = QABS(dy)*4 + dx;
-                    if ( dist < ddist ) {
-                        ddist = dist;
-                        pClosest = pZone;
-                    }
-                }
-                break;
-            case Key_Down:
-            case Key_Up:
-                if ( key == Key_Down )
-                    dy = -dy;
-                if ( dy > 0 ) {
-                    long dist = QABS(dx)*4 + dy;
-                    if ( dist < ddist ) {
-                        ddist = dist;
-                        pClosest = pZone;
-                    }
-                }
-                break;
-        }
+    pZone = it.current();
+    long dx = (pZone->x() - city->x())/100;
+    long dy = (pZone->y() - city->y())/100;
+    switch ( key ) {
+        case Key_Right:
+        case Key_Left:
+        if ( key == Key_Left )
+            dx = -dx;
+        if ( dx > 0 ) {
+            long dist = QABS(dy)*4 + dx;
+            if ( dist < ddist ) {
+            ddist = dist;
+            pClosest = pZone;
+            }
+        }
+        break;
+        case Key_Down:
+        case Key_Up:
+        if ( key == Key_Down )
+            dy = -dy;
+        if ( dy > 0 ) {
+            long dist = QABS(dx)*4 + dy;
+            if ( dist < ddist ) {
+            ddist = dist;
+            pClosest = pZone;
+            }
+        }
+        break;
+    }
     }
 
     return pClosest;
 }
 
 void ZoneMap::slotFindCity( const QPoint &pos )
 {
     lblCity->hide();
     // given coordinates on the screen find the closest city and display the
     // label close to it
     int tmpx, tmpy, x, y;
     long lDistance,
@@ -342,145 +346,145 @@ void ZoneMap::slotFindCity( const QPoint &pos )
     }
     viewportToContents(pos.x(), pos.y(), tmpx, tmpy);
     winToZone( tmpx, tmpy, x, y );
     // Find city alogorithim: start out at an (near) infinite distance away and
     // then find the closest city, (similar to the Z-buffer technique, I guess)
     // the only problem is that this is all done with doubles, but I don't know
     // another way to do it at the moment.  Another problem is a linked list is
     // used obviously something indexed would help
     QListIterator<ZoneField> it( zones );
     pClosest = 0;
     lClosest = LONG_MAX;
     for (; it.current(); ++it) {
-        pZone = it.current();
-        // use the manhattenLength, a good enough of an appoximation here
-        lDistance = QABS( x - pZone->x() ) + QABS( y - pZone->y() );
-        // first to zero wins!
-        if ( lDistance < lClosest ) {
-            lClosest = lDistance;
-            pClosest = pZone;
-        }
+    pZone = it.current();
+    // use the manhattenLength, a good enough of an appoximation here
+    lDistance = QABS( x - pZone->x() ) + QABS( y - pZone->y() );
+    // first to zero wins!
+    if ( lDistance < lClosest ) {
+        lClosest = lDistance;
+        pClosest = pZone;
+    }
     }
 
     // Okay, we found the closest city, but it might still be too far away.
     if ( lClosest <= iTHRESHOLD ) {
-        showCity( pClosest );
-        cursor = pClosest;
+    showCity( pClosest );
+    cursor = pClosest;
     }
 }
 
 void ZoneMap::showCity( ZoneField *city )
 {
     pLast = city;
     // we'll use city and country a couple of times, get them to save some
     // time
     QString strCity = pLast->city();
     QString strCountry = pLast->country();
     // Display the time at this location by setting the environment timezone
     // getting the current time [there] and then swapping back the variable
     // so no one notices...
     QString strSave;
     char *p = getenv( "TZ" );
     if ( p ) {
-        strSave = p;
+    strSave = p;
     }
     // set the timezone :)
     setenv( "TZ", strCountry + strCity, true );
     lblCity->setText( strCity.replace( QRegExp("_"), " ") + "\n" +
-                      TimeString::shortTime( ampm ) );
+              TimeString::shortTime( ampm ) );
     lblCity->setMinimumSize( lblCity->sizeHint() );
     // undue our damage...
     unsetenv( "TZ" );
     if ( p )
-        setenv( "TZ", strSave, true );
+    setenv( "TZ", strSave, true );
     // Now decide where to move the label, x & y can be reused
     int tmpx, tmpy, x, y;
     zoneToWin( pLast->x(), pLast->y(), tmpx, tmpy );
     contentsToViewport(tmpx, tmpy, x, y);
     if ( lblCity->width() > drawableW - x ) {
-        // oops... try putting it on the right
-        x = x - lblCity->width() - iLABELOFFSET;
+    // oops... try putting it on the right
+    x = x - lblCity->width() - iLABELOFFSET;
     } else {
-        // the default...
-        x += iLABELOFFSET;
+    // the default...
+    x += iLABELOFFSET;
     }
     if ( lblCity->height() > drawableH - y ) {
-        // move it up...
-        y = y - lblCity->height() - iLABELOFFSET;
+    // move it up...
+    y = y - lblCity->height() - iLABELOFFSET;
     } else if ( y < 0 ) {
-        // the city is actually off the screen...
-        // this only happens on the a zoom when you are near the top,
-        // a quick workaround..
-        y = iLABELOFFSET;
+    // the city is actually off the screen...
+    // this only happens on the a zoom when you are near the top,
+    // a quick workaround..
+    y = iLABELOFFSET;
     } else {
-        // the default
-        y += iLABELOFFSET;
+    // the default
+    y += iLABELOFFSET;
     }
 
     // draw in the city and the label
     if ( pRepaint ) {
-        int repx,
-            repy;
-        zoneToWin( pRepaint->x(), pRepaint->y(), repx, repy );
-        updateContents( repx - iCITYOFFSET, repy - iCITYOFFSET,
-                        iCITYSIZE, iCITYSIZE );
+    int repx,
+        repy;
+    zoneToWin( pRepaint->x(), pRepaint->y(), repx, repy );
+    updateContents( repx - iCITYOFFSET, repy - iCITYOFFSET,
+            iCITYSIZE, iCITYSIZE );
     }
     updateContents( tmpx - iCITYOFFSET, tmpy - iCITYOFFSET, iCITYSIZE,
-                    iCITYSIZE );
+            iCITYSIZE );
     pRepaint = pLast;
 
     lblCity->move( x, y );
     lblCity->show();
 }
 
 void ZoneMap::resizeEvent( QResizeEvent *e )
 {
     // keep the zoom button down in the corner
     QSize _size = e->size();
     cmdZoom->move( _size.width() - cmdZoom->width(),
                    _size.height() - cmdZoom->height() );
     if ( !bZoom ) {
-        drawableW = width() - 2 * frameWidth();
-        drawableH = height() - 2 * frameWidth();
-        makeMap( drawableW, drawableH );
-        resizeContents( drawableW, drawableH );
+    drawableW = width() - 2 * frameWidth();
+    drawableH = height() - 2 * frameWidth();
+    makeMap( drawableW, drawableH );
+    resizeContents( drawableW, drawableH );
     }
 }
 
 void ZoneMap::showZones( void ) const
 {
     // go through the zones in the list and just display the values...
     QListIterator<ZoneField> itZone( zones );
     for ( itZone.toFirst(); itZone.current(); ++itZone ) {
-        ZoneField *pZone = itZone.current();
-        pZone->showStructure();
+    ZoneField *pZone = itZone.current();
+    pZone->showStructure();
     }
 }
 
 
 QWidget* ZoneMap::selectionWidget( QWidget *parent) {
 
     QWidget *returnWidget = new QWidget( parent );
 
     QVBoxLayout *layout = new QVBoxLayout( returnWidget );
     QHBox *hBox = new QHBox( returnWidget );
     QListView *continentView = new QListView( hBox );
     continentView->addColumn( tr("Continent") );
     QWhatsThis::add( continentView, tr("Select a continent/country here, then select a city") );
     connect ( continentView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( slotGetCities(QListViewItem*) ) );
 
     QStringList continentList;
     QListIterator<ZoneField> itZone( zones );
     for ( itZone.toFirst(); itZone.current(); ++itZone ) {
-        ZoneField *pZone = itZone.current();
+    ZoneField *pZone = itZone.current();
         if ( continentList.contains( pZone->country() ) == 0 ) {
             QString name;
             QListViewItem *item;
             if ( !(pZone->country().length() > 24) ) {
                 name = pZone->country().left(pZone->country().length()-1 );
             } else {
                 name = pZone->country().left( 24 );
             }
             item = new QListViewItem( continentView, name, pZone->country() );
             continentList.append( pZone->country() );
         }
     }
@@ -489,53 +493,53 @@ QWidget* ZoneMap::selectionWidget( QWidget *parent) {
     cityView->addColumn( tr("City") );
 
     layout->addWidget( hBox );
     return returnWidget;
 }
 
 void ZoneMap::slotGetCities( QListViewItem * contItem) {
 
     cityView->clear();
     selectedCont = contItem->text( 1 );
     QListIterator<ZoneField> itZone( zones );
     for ( itZone.toFirst(); itZone.current(); ++itZone ) {
-        ZoneField *pZone = itZone.current();
+    ZoneField *pZone = itZone.current();
         if ( pZone->country() == contItem->text( 1 ) ) {
             QListViewItem *item;
             item = new QListViewItem( cityView, pZone->city() );
             connect ( cityView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( slotCitySelected(QListViewItem*) ) );
         }
     }
 }
 
 void ZoneMap::slotCitySelected( QListViewItem *cityItem ) {
     if ( cityItem ) {
         emit signalTz( selectedCont, cityItem->text( 0 ) );
     }
 }
 
 void ZoneMap::drawCities( QPainter *p )
 {
     int x, y, j;
     // draw in the cities
     // for testing only as when you put it
     // on the small screen it looks awful and not to mention useless
     p->setPen( red );
     QListIterator<ZoneField> itZone( zones );
     for ( itZone.toFirst(), j = 0; itZone.current(); ++itZone, j++ ) {
-        ZoneField *pZone = itZone.current();
-        zoneToWin( pZone->x(), pZone->y(), x, y );
-        if ( x > wImg )
-            x = x - wImg;
-        p->drawRect( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
+    ZoneField *pZone = itZone.current();
+    zoneToWin( pZone->x(), pZone->y(), x, y );
+    if ( x > wImg )
+        x = x - wImg;
+    p->drawRect( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
     }
 }
 
 static void dayNight(QImage *pImage)
 {
     // create a mask the functions from sun.h
     double dJulian,
            dSunRad,
            dSunDecl,
            dSunRadius,
            dSunLong;
     int wImage = pImage->width(),
@@ -554,84 +558,84 @@ static void dayNight(QImage *pImage)
     pTm = gmtime( &tCurrent );
     dJulian = jtime( pTm );
     sunpos( dJulian, 0, &dSunRad, &dSunDecl, &dSunRadius, &dSunLong );
 
     // now get the projected illumination
     projillum( wtab, wImage, hImage, dSunDecl );
     relw = wImage - int( wImage * 0.0275 );
 
     // draw the map, keeping in mind that we may go too far off the map...
     iMid = ( relw * ( 24*60 - pTm->tm_hour * 60 - pTm->tm_min ) ) / ( 24*60 );
 
     for ( i = 0; i < hImage; i++ ) {
-        if ( wtab[i] > 0 ) {
-            iStart = iMid - wtab[i];
-            iStop = iMid + wtab[i];
-            if ( iStart < 0 ) {
-                darken( pImage, iStop, wImage + iStart, i );
-            } else if ( iStop > wImage ) {
-                darken( pImage, iStop - wImage, iStart, i );
-            } else {
-                darken( pImage, 0, iStart, i );
-                darken( pImage, iStop, wImage, i );
-            }
-        } else {
-            darken( pImage, 0, wImage, i );
-        }
+    if ( wtab[i] > 0 ) {
+        iStart = iMid - wtab[i];
+        iStop = iMid + wtab[i];
+        if ( iStart < 0 ) {
+        darken( pImage, iStop, wImage + iStart, i );
+        } else if ( iStop > wImage ) {
+        darken( pImage, iStop - wImage, iStart, i );
+        } else {
+        darken( pImage, 0, iStart, i );
+        darken( pImage, iStop, wImage, i );
+        }
+    } else {
+        darken( pImage, 0, wImage, i );
+    }
     }
 }
 
 static inline void darken( QImage *pImage, int start, int stop, int row )
 {
     int colors,
         j;
     uchar *p;
 
     // assume that the image is similar to the one we have...
     colors = pImage->numColors() / 2;
 
     p = pImage->scanLine( row );
     for ( j = start; j <= stop; j++ ) {
-        if ( p[j] < colors )
-            p[j] += colors;
+    if ( p[j] < colors )
+        p[j] += colors;
     }
 }
 
 void ZoneMap::makeMap( int w, int h )
 {
     QImage imgOrig = Resource::loadImage( strMAP );
     if ( imgOrig.isNull() ) {
-        QMessageBox::warning( this,
-                              tr( "Couldn't Find Map" ),
-                              tr( "<p>Couldn't load map: %1, exiting")
+    QMessageBox::warning( this,
+                          tr( "Couldn't Find Map" ),
+                          tr( "<p>Couldn't load map: %1, exiting")
                               .arg( strMAP ) );
-        exit(-1);
+    exit(-1);
     }
 
     // set up the color table for darkening...
     imgOrig = imgOrig.convertDepth( 8 );
     int numColors = imgOrig.numColors();
     // double the colors
     imgOrig.setNumColors( 2 * numColors );
     // darken the new ones...
     for ( int i = 0; i < numColors; i++ ) {
-        QRgb rgb = imgOrig.color( i );
-        imgOrig.setColor ( i + numColors, qRgb(  2 * qRed( rgb ) / 3,
-                           2 * qGreen( rgb ) / 3, 2 * qBlue( rgb ) / 3 ) );
+    QRgb rgb = imgOrig.color( i );
+    imgOrig.setColor ( i + numColors, qRgb(  2 * qRed( rgb ) / 3,
+                       2 * qGreen( rgb ) / 3, 2 * qBlue( rgb ) / 3 ) );
     }
 
     // else go one with making the map...
     if ( bIllum ) {
-        // do a daylight mask
-        dayNight(&imgOrig);
+    // do a daylight mask
+    dayNight(&imgOrig);
     }
     // redo the width and height
     wImg = w;
     hImg = h;
     ox = ( wImg / 2 ) - int( wImg * 0.0275 );
     oy = hImg / 2;
     pixCurr->convertFromImage( imgOrig.smoothScale(w, h),
                                QPixmap::ThresholdDither );
 }
 
 void ZoneMap::drawCity( QPainter *p, const ZoneField *pCity )
 {
@@ -645,56 +649,56 @@ void ZoneMap::drawCity( QPainter *p, const ZoneField *pCity )
 
 void ZoneMap::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
 {
     // if there is a need to resize, then do it...
     // get our drawable area
     drawableW = width() - 2 * frameWidth();
     drawableH = height() - 2 * frameWidth();
 
     int pixmapW = pixCurr->width(),
         pixmapH = pixCurr->height();
     if ( !bZoom &&  ( ( pixmapW != drawableW ) ||
                       ( pixmapH != drawableH) ) ) {
-        makeMap( drawableW, drawableH );
+    makeMap( drawableW, drawableH );
     }
 
     // taken from the scrollview example...
     int rowheight = pixCurr->height();
     int toprow = cy / rowheight;
     int bottomrow = ( cy + ch + rowheight - 1 ) / rowheight;
     int colwidth = pixCurr->width();
     int leftcol= cx / colwidth;
     int rightcol= ( cx + cw + colwidth - 1 ) / colwidth;
     for ( int r = toprow; r <= bottomrow; r++ ) {
-        int py = r * rowheight;
-        for ( int c = leftcol; c <= rightcol; c++ ) {
-            int px = c * colwidth;
-            p->drawPixmap( px, py, *pixCurr );
-        }
+    int py = r * rowheight;
+    for ( int c = leftcol; c <= rightcol; c++ ) {
+        int px = c * colwidth;
+        p->drawPixmap( px, py, *pixCurr );
+    }
     }
 
     // Draw that city!
     if ( pLast )
-        drawCity( p, pLast );
+    drawCity( p, pLast );
 }
 
 void ZoneMap::slotZoom( bool setZoom )
 {
     bZoom = setZoom;
     if ( bZoom ) {
-        makeMap( 2 * wImg , 2 * hImg );
-        resizeContents( wImg, hImg );
+    makeMap( 2 * wImg , 2 * hImg );
+    resizeContents( wImg, hImg );
     } else {
-        makeMap( drawableW, drawableH );
-        resizeContents( drawableW, drawableH );
+    makeMap( drawableW, drawableH );
+    resizeContents( drawableW, drawableH );
     }
 }
 
 void ZoneMap::slotIllum( bool setIllum )
 {
     bIllum = !setIllum;
     // make the map...
     makeMap( pixCurr->width(), pixCurr->height() );
     updateContents( 0, 0, wImg, hImg );
 }
 
 void ZoneMap::slotUpdate( void )
@@ -702,23 +706,23 @@ void ZoneMap::slotUpdate( void )
     // recalculate the light, most people will never see this,
     // but it is good to be complete
     makeMap ( pixCurr->width(), pixCurr->height() );
     updateContents( contentsX(), contentsY(), drawableW, drawableH );
 }
 
 void ZoneMap::slotRedraw( void )
 {
     // paint over that pesky city...
     int x,
         y;
     if ( pRepaint ) {
-        pLast = 0;
-        zoneToWin(pRepaint->x(), pRepaint->y(), x, y);
-        updateContents( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
+    pLast = 0;
+    zoneToWin(pRepaint->x(), pRepaint->y(), x, y);
+    updateContents( x - iCITYOFFSET, y - iCITYOFFSET, iCITYSIZE, iCITYSIZE);
         pRepaint = 0;
     }
 }
 
 void ZoneMap::changeClock( bool whichClock )
 {
     ampm = whichClock;
 }