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
@@ -14,75 +14,82 @@
 
     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 );
@@ -154,42 +161,42 @@ void GeoWidget::editGeoData()
 
   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 )
@@ -416,34 +423,34 @@ void GeoDialog::loadCityList()
   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
@@ -539,33 +546,33 @@ 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
@@ -611,19 +618,19 @@ void GeoMapWidget::paintEvent( QPaintEvent* )
   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