1 files changed, 21 insertions, 14 deletions

diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 13cd084..caff3b2 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -1,243 +1,250 @@
 /*
     This file is part of KAddressBook.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <kabc/geo.h>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #else //KAB_EMBEDDED
 
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <QPaintEvent>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <QMouseEvent>
 #include <kglobal.h>
 #endif //KAB_EMBEDDED
 
+#include <QDesktopWidget>
+
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
 #include <qcheckbox.h>
 #include <qfile.h>
 #include <qapplication.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <stdlib.h>
 
 #include "geowidget.h"
 
 GeoWidget::GeoWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QLabel *label = 0;
 
-  QGridLayout *topLayout = new QGridLayout( this, 4, 3 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 4, 3 );
   topLayout->setMargin( KDialog::marginHint() );
   topLayout->setSpacing( KDialog::spacingHint() );
 
   label = new QLabel( this );
 //US ambiguous call to loadIcon. Add an additional parameter  
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop ) );
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, 0 ) );
   label->setAlignment( Qt::AlignTop );
   topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
   mGeoIsValid = new QCheckBox( i18n( "Use geo data" ), this );
   topLayout->addMultiCellWidget( mGeoIsValid, 0, 0, 1, 2 );
 
   label = new QLabel( i18n( "Latitude:" ), this );
   topLayout->addWidget( label, 1, 1 );
 
   mLatitudeBox = new KDoubleSpinBox( -90, 90, 1, 0, 6, this );
   mLatitudeBox->setEnabled( false );
   mLatitudeBox->setSuffix( "" );
   topLayout->addWidget( mLatitudeBox, 1, 2 );
   label->setBuddy( mLatitudeBox );
 
   label = new QLabel( i18n( "Longitude:" ), this );
   topLayout->addWidget( label, 2, 1 );
 
   mLongitudeBox = new KDoubleSpinBox( -180, 180, 1, 0, 6, this );
   mLongitudeBox->setEnabled( false );
   mLongitudeBox->setSuffix( "" );
   topLayout->addWidget( mLongitudeBox, 2, 2 );
   label->setBuddy( mLongitudeBox );
 
   mExtendedButton = new QPushButton( i18n( "Edit Geo Data..." ), this );
   mExtendedButton->setEnabled( false );
   topLayout->addMultiCellWidget( mExtendedButton, 3, 3, 1, 2 );
 
   connect( mLatitudeBox, SIGNAL( valueChanged( double ) ),
            SIGNAL( changed() ) );
   connect( mLongitudeBox, SIGNAL( valueChanged( double ) ),
            SIGNAL( changed() ) );
   connect( mExtendedButton, SIGNAL( clicked() ),
            SLOT( editGeoData() ) );
 
   connect( mGeoIsValid, SIGNAL( toggled( bool ) ),
            mLatitudeBox, SLOT( setEnabled( bool ) ) );
   connect( mGeoIsValid, SIGNAL( toggled( bool ) ),
            mLongitudeBox, SLOT( setEnabled( bool ) ) );
   connect( mGeoIsValid, SIGNAL( toggled( bool ) ),
            mExtendedButton, SLOT( setEnabled( bool ) ) );
   connect( mGeoIsValid, SIGNAL( toggled( bool ) ),
            SIGNAL( changed() ) );
 
 #ifndef KAB_EMBEDDED
   KAcceleratorManager::manage( this );
 #endif //KAB_EMBEDDED
 }
 
 GeoWidget::~GeoWidget()
 {
 }
 
 void GeoWidget::setGeo( const KABC::Geo &geo )
 {
   if ( geo.isValid() ) {
     mGeoIsValid->setChecked( true );
     mLatitudeBox->setValue( geo.latitude() );
     mLongitudeBox->setValue( geo.longitude() );
   } else
     mGeoIsValid->setChecked( false );
 }
 
 KABC::Geo GeoWidget::geo() const
 {
   KABC::Geo geo;
 
   if ( mGeoIsValid->isChecked() ) {
     geo.setLatitude( mLatitudeBox->value() );
     geo.setLongitude( mLongitudeBox->value() );
   } else {
     geo.setLatitude( 91 );
     geo.setLongitude( 181 );
   }
 
   return geo;
 }
 
 void GeoWidget::editGeoData()
 {
   GeoDialog dlg( this );
 
   dlg.setLatitude( mLatitudeBox->value() );
   dlg.setLongitude( mLongitudeBox->value() );
 
   if ( dlg.exec() ) {
     mLatitudeBox->setValue( dlg.latitude() );
     mLongitudeBox->setValue( dlg.longitude() );
 
     emit changed();
   }
 }
 
 
 
 GeoDialog::GeoDialog( QWidget *parent, const char *name )
   : KDialogBase( Plain, i18n( "Geo Data Input" ), Ok | Cancel, Ok,
                  parent, name, true, true ),
     mUpdateSexagesimalInput( true )
 {
-  QFrame *page = plainPage();
+  Q3Frame *page = plainPage();
 
-  QGridLayout *topLayout = new QGridLayout( page, 1, 1, marginHintSmall(),
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 1, 1, marginHintSmall(),
                                             spacingHint() );
   //topLayout->setRowStretch( 1, 1 );
 
   mMapWidget = new GeoMapWidget( page );
   mCityCombo = new KComboBox( page );
-  QGroupBox *sexagesimalGroup = new QGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
-  QGridLayout *sexagesimalLayout = new QGridLayout( sexagesimalGroup->layout(),
+  Q3GroupBox *sexagesimalGroup = new Q3GroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
+  Q3GridLayout *sexagesimalLayout = new Q3GridLayout( sexagesimalGroup->layout(),
                                                     2, 5, spacingHint() );
   QLabel *label;
   if ( QApplication::desktop()->width() < 320 ) {
       label = new QLabel( i18n( "La." ), sexagesimalGroup );
       sexagesimalLayout->setSpacing ( spacingHintSmall() );
       sexagesimalLayout->setMargin ( marginHintSmall() );
       topLayout->setMargin ( 0 );
       mCityCombo->setMaximumWidth( 220 );
       sexagesimalGroup->setMaximumWidth( 220 );
   }
   else
       label = new QLabel( i18n( "Latitude:" ), sexagesimalGroup );
   sexagesimalLayout->addWidget( label, 0, 0 );
 
   int maxWid = 60;
   if ( QApplication::desktop()->width() < 320 )
       maxWid = 40;
   mLatDegrees = new QSpinBox( 0, 90, 1, sexagesimalGroup );
   mLatDegrees->setSuffix( "" );
   mLatDegrees->setWrapping( false );
   sexagesimalLayout->addWidget( mLatDegrees, 0, 1 );
   mLatDegrees->setMaximumWidth( maxWid );
 
   mLatMinutes = new QSpinBox( 0, 59, 1, sexagesimalGroup );
   mLatMinutes->setSuffix( "'" );
   sexagesimalLayout->addWidget( mLatMinutes, 0, 2 );
   mLatMinutes->setMaximumWidth( maxWid  );
 
   mLatSeconds = new QSpinBox( 0, 59, 1, sexagesimalGroup );
   mLatSeconds->setSuffix( "\"" );
   sexagesimalLayout->addWidget( mLatSeconds, 0, 3 );
   mLatSeconds->setMaximumWidth( maxWid  );
 
   mLatDirection = new KComboBox( sexagesimalGroup );
   mLatDirection->insertItem( i18n( "North" ) );
   mLatDirection->insertItem( i18n( "South" ) );
   sexagesimalLayout->addWidget( mLatDirection, 0, 4 );
 
 
   if ( QApplication::desktop()->width() < 320 )
       label = new QLabel( i18n( "Lo." ), sexagesimalGroup );
   else
       label = new QLabel( i18n( "Longitude:" ), sexagesimalGroup );
 
 
   sexagesimalLayout->addWidget( label, 1, 0 );
 
   mLongDegrees = new QSpinBox( 0, 180, 1, sexagesimalGroup );
   mLongDegrees->setSuffix( "" );
   sexagesimalLayout->addWidget( mLongDegrees, 1, 1 );
   mLongDegrees->setMaximumWidth( maxWid  );
 
   mLongMinutes = new QSpinBox( 0, 59, 1, sexagesimalGroup );
   mLongMinutes->setSuffix( "'" );
   sexagesimalLayout->addWidget( mLongMinutes, 1, 2 );
   mLongMinutes->setMaximumWidth( maxWid  );
 
   mLongSeconds = new QSpinBox( 0, 59, 1, sexagesimalGroup );
   mLongSeconds->setSuffix( "\"" );
   sexagesimalLayout->addWidget( mLongSeconds, 1, 3 );
   mLongSeconds->setMaximumWidth( maxWid  );
 
   mLongDirection = new KComboBox( sexagesimalGroup );
   mLongDirection->insertItem( i18n( "East" ) );
@@ -368,262 +375,262 @@ void GeoDialog::updateInputs()
     int degrees, minutes, seconds;
     double latitude = mLatitude;
     double longitude = mLongitude;
 
     latitude *= ( mLatitude < 0 ? -1 : 1 );
     longitude *= ( mLongitude < 0 ? -1 : 1 );
 
     degrees = (int)( latitude * 1 );
     minutes = (int)( ( latitude - degrees ) * 60 );
     seconds = (int)( (double)( (double)latitude - (double)degrees - ( (double)minutes / (double)60 ) ) * (double)3600 );
 
     mLatDegrees->setValue( degrees );
     mLatMinutes->setValue( minutes );
     mLatSeconds->setValue( seconds );
 
     mLatDirection->setCurrentItem( mLatitude < 0 ? 1 : 0 );
 
     degrees = (int)( longitude * 1 );
     minutes = (int)( ( longitude - degrees ) * 60 );
     seconds = (int)( (double)( longitude - (double)degrees - ( (double)minutes / 60 ) ) * 3600 );
 
     mLongDegrees->setValue( degrees );
     mLongMinutes->setValue( minutes );
     mLongSeconds->setValue( seconds );
     mLongDirection->setCurrentItem( mLongitude < 0 ? 1 : 0 );
   }
   mUpdateSexagesimalInput = true;
 
   int pos = nearestCity( mLongitude, mLatitude );
   if ( pos != -1 )
     mCityCombo->setCurrentItem( pos + 1 );
   else
     mCityCombo->setCurrentItem( 0 );
 
   mCityCombo->blockSignals( false );
   mLatDegrees->blockSignals( false );
   mLatMinutes->blockSignals( false );
   mLatSeconds->blockSignals( false );
   mLatDirection->blockSignals( false );
   mLongDegrees->blockSignals( false );
   mLongMinutes->blockSignals( false );
   mLongSeconds->blockSignals( false );
   mLongDirection->blockSignals( false );
 }
 
 void GeoDialog::loadCityList()
 {
   mCityCombo->clear();
   mGeoDataMap.clear();
 
   QString fileName ;
 #ifdef DESKTOP_VERSION
 #ifndef _WIN32_
     fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/zone.tab";
 #else
     fileName   = qApp->applicationDirPath () + "\\kdepim\\kaddressbook\\zone.tab";
 #endif
 #else
     fileName = getenv("QPEDIR");
     fileName += "/pics/kdepim/kaddressbook/zone.tab";
 #endif
 
     QFile file( fileName);
     
-  if ( file.open( IO_ReadOnly ) ) {
-    QTextStream s( &file );
+  if ( file.open( QIODevice::ReadOnly ) ) {
+    Q3TextStream s( &file );
 
     QString line, country;
     QRegExp coord( "[+-]\\d+[+-]\\d+" );
     QRegExp name( "[^\\s]+/[^\\s]+" );
     int posc, posn, pos;
 
    while ( !s.eof() ) {
       line = s.readLine().stripWhiteSpace();
       if ( line.isEmpty() || line[ 0 ] == '#' )
         continue;
 
       country = line.left( 2 );
       QString c, n;
 #ifdef DESKTOP_VERSION
       posc = coord.search( line, 0 );
 #else
       posc = coord.find( line, 0 );
 #endif
       // if ( pos >= 0 )
       //c = line.mid( pos, coord.matchedLength() );
 
 #ifdef DESKTOP_VERSION
       posn = name.search(line, posc);
 #else
       posn = name.find(line, posc);
 #endif
       if ( posn > 0 ) {
           c = line.mid( posc, posn-posc ).stripWhiteSpace();
           //qDebug("*%s* ", c.latin1());
           int nend = line.find(" ", posn );
           if ( nend < 0 )
               nend = line.length();
         n = line.mid( posn, nend-posn).stripWhiteSpace();
         //n.replace( '_', " " );
       }
 
       if ( !c.isEmpty() && !n.isEmpty() ) {
         pos = c.find( "+", 1 );
         if ( pos < 0 )
           pos = c.find( "-", 1 );
         if ( pos > 0 ) {
           GeoData data;
           data.latitude = calculateCoordinate( c.left( pos ) );
           data.longitude = calculateCoordinate( c.mid( pos ) );
           data.country = country;
 
           mGeoDataMap.insert( n, data );
         }
       }
     }
 //US I have no mGeoDataMap.keys().
 //US QStringList items( mGeoDataMap.keys() );
     QStringList items;
     
     QMap<QString, GeoData>::ConstIterator it;
     for( it = mGeoDataMap.begin(); it != mGeoDataMap.end(); ++it )
       items << it.key().latin1();
     
     items.prepend( i18n( "Undefined" ) );
     mCityCombo->insertStringList( items );
 
     file.close();
   }
 }
 
 double GeoDialog::calculateCoordinate( const QString &coordinate )
 {
   int neg;
   int d = 0, m = 0, s = 0;
   QString str = coordinate;
 
   neg = str.left( 1 ) == "-";
   str.remove( 0, 1 );
 
   switch ( str.length() ) {
     case 4:
       d = str.left( 2 ).toInt();
       m = str.mid( 2 ).toInt();
       break;
     case 5:
       d = str.left( 3 ).toInt();
       m = str.mid( 3 ).toInt();
       break;
     case 6:
       d = str.left( 2 ).toInt();
       m = str.mid( 2, 2 ).toInt();
       s = str.right( 2 ).toInt();
       break;
     case 7:
       d = str.left( 3 ).toInt();
       m = str.mid( 3, 2 ).toInt();
       s = str.right( 2 ).toInt();
       break;
     default:
       break;
   }
 
   if ( neg )
     return - ( d + m / 60.0 + s / 3600.0 );
   else
     return d + m / 60.0 + s / 3600.0;
 }
 
 int GeoDialog::nearestCity( double x, double y )
 {
   QMap<QString, GeoData>::Iterator it;
   int pos = 0;
   for ( it = mGeoDataMap.begin(); it != mGeoDataMap.end(); ++it, pos++ ) {
     double dist = ( (*it).longitude - x ) * ( (*it).longitude - x ) +
                   ( (*it).latitude - y ) * ( (*it).latitude - y );
     if ( dist < 1.5 )
       return pos;
   }
 
   return -1;
 }
 
 
 GeoMapWidget::GeoMapWidget( QWidget *parent, const char *name )
   : QWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 )
 {
-  setBackgroundMode( NoBackground );
+  setBackgroundMode( Qt::NoBackground );
 
   setFixedSize( 240, 120 );
 
   update();
 }
 
 GeoMapWidget::~GeoMapWidget()
 {
 }
 
 void GeoMapWidget::setLatitude( double latitude )
 {
   mLatitude = latitude;
 }
 
 double GeoMapWidget::latitude()const
 {
   return mLatitude;
 }
 
 void GeoMapWidget::setLongitude( double longitude )
 {
   mLongitude = longitude;
 }
 
 double GeoMapWidget::longitude()const
 {
   return mLongitude;
 }
 
 void GeoMapWidget::mousePressEvent( QMouseEvent *event )
 {
   double latMid = height() / 2;
   double longMid = width() / 2;
 
   double latOffset = latMid - event->y();
   double longOffset = event->x() - longMid;
 
   mLatitude = ( latOffset * 90 ) / latMid;
   mLongitude = ( longOffset * 180 ) / longMid;
 
   emit changed();
 }
 
 void GeoMapWidget::paintEvent( QPaintEvent* )
 {
   uint w = width();
   uint h = height();
 
   QPixmap world = KGlobal::iconLoader()->loadIcon( "world", KIcon::Desktop, 0 );
 
   QPainter p;
   p.begin( &world, this );
 
   p.setPen( QColor( 255, 0, 0 ) );
   p.setBrush( QColor( 255, 0, 0 ) );
 
   double latMid = h / 2;
   double longMid = w / 2;
 
   double latOffset = ( mLatitude * latMid ) / 90;
   double longOffset = ( mLongitude * longMid ) / 180;
 
   int x = (int)(longMid + longOffset);
   int y = (int)(latMid - latOffset);
   p.drawEllipse( x, y, 4, 4 );
 
   p.end();
   bitBlt( this, 0, 0, &world );
 }
 
-#ifndef KAB_EMBEDDED
-#include "geowidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_geowidget.cpp"
 #endif //KAB_EMBEDDED