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
@@ -28,8 +28,15 @@
 #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>
@@ -42,8 +49,8 @@
 #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>
@@ -60,5 +67,5 @@ GeoWidget::GeoWidget( QWidget *parent, const char *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() );
@@ -70,5 +77,5 @@ GeoWidget::GeoWidget( QWidget *parent, const char *name )
   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 );
@@ -168,7 +175,7 @@ GeoDialog::GeoDialog( QWidget *parent, const char *name )
     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 );
@@ -176,6 +183,6 @@ GeoDialog::GeoDialog( QWidget *parent, const char *name )
   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;
@@ -430,6 +437,6 @@ void GeoDialog::loadCityList()
     QFile file( fileName);
     
-  if ( file.open( IO_ReadOnly ) ) {
-    QTextStream s( &file );
+  if ( file.open( QIODevice::ReadOnly ) ) {
+    Q3TextStream s( &file );
 
     QString line, country;
@@ -553,5 +560,5 @@ GeoMapWidget::GeoMapWidget( QWidget *parent, const char *name )
   : QWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 )
 {
-  setBackgroundMode( NoBackground );
+  setBackgroundMode( Qt::NoBackground );
 
   setFixedSize( 240, 120 );
@@ -625,5 +632,5 @@ void GeoMapWidget::paintEvent( QPaintEvent* )
 }
 
-#ifndef KAB_EMBEDDED
-#include "geowidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_geowidget.cpp"
 #endif //KAB_EMBEDDED