initial public commit of qt4 portp1

1 files changed, 4 insertions, 0 deletions

diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 3d39691..5b64370 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -1,155 +1,159 @@
 /*
     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.
 */
 
 #ifndef GEOWIDGET_H
 #define GEOWIDGET_H
 
 #include <qmap.h>
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPaintEvent>
 #include <kdialogbase.h>
 
 namespace KABC {
 class Geo;
 }
 
 class GeoMapWidget;
 
 class KComboBox;
 class KDoubleSpinBox;
 
 class QCheckBox;
 class QLabel;
 class QSpinBox;
 class QPushButton;
 
 typedef struct {
   double latitude;
   double longitude;
   QString country;
 } GeoData;
 
 class GeoWidget : public QWidget
 {
   Q_OBJECT
 
   public:
     GeoWidget( QWidget *parent, const char *name = 0 );
     ~GeoWidget();
 
     /**
       Sets the geo object.
      */
     void setGeo( const KABC::Geo &geo );
 
     /**
       Returns a geo object.
      */
     KABC::Geo geo() const;
 
   signals:
     void changed();
 
   private slots:
     void editGeoData();
 
   private:
     KDoubleSpinBox *mLatitudeBox;
     KDoubleSpinBox *mLongitudeBox;
 
     QCheckBox *mGeoIsValid;
     QPushButton *mExtendedButton;
 };
 
 class GeoDialog : public KDialogBase
 {
   Q_OBJECT
 
   public:
     GeoDialog( QWidget *parent, const char *name = 0 );
     ~GeoDialog();
 
     void setLatitude( double latitude );
     double latitude() const;
 
     void setLongitude( double longitude );
     double longitude() const;
 
   private slots:
     void updateInputs();
 
     void sexagesimalInputChanged();
     void geoMapChanged();
     void cityInputChanged();
 
   private:
     void loadCityList();
     double calculateCoordinate( const QString& );
     int nearestCity( double, double );
 
     GeoMapWidget *mMapWidget;
     KComboBox *mCityCombo;
 
     QSpinBox *mLatDegrees;
     QSpinBox *mLatMinutes;
     QSpinBox *mLatSeconds;
     KComboBox *mLatDirection;
 
     QSpinBox *mLongDegrees;
     QSpinBox *mLongMinutes;
     QSpinBox *mLongSeconds;
     KComboBox *mLongDirection;
 
     double mLatitude;
     double mLongitude;
     QMap<QString, GeoData> mGeoDataMap;
     bool mUpdateSexagesimalInput;
 };
 
 class GeoMapWidget : public QWidget
 {
   Q_OBJECT
 
   public:
     GeoMapWidget( QWidget *parent, const char *name = 0 );
     ~GeoMapWidget();
 
     void setLatitude( double latitude );
     double latitude()const;
 
     void setLongitude( double longitude );
     double longitude()const;
 
   signals:
     void changed();
 
   protected:
     virtual void mousePressEvent( QMouseEvent* );
     virtual void paintEvent( QPaintEvent* );
 
   private:
     double mLatitude;
     double mLongitude;
 };
 
 #endif