Misc. Qt3 to Qt4 changes and #include tidy ups

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4774 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 29, 2006 · c74003a · c74003a
1 parent 94afb2d
commit c74003a
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 91 deletions.
diff --git a/src/gui/qgisiface.cpp b/src/gui/qgisiface.cpp
@@ -17,15 +17,13 @@
  ***************************************************************************/
 /* $Id$ */
 #include <iostream>
-#include <qstring.h>
-#include <qmenubar.h>
-#include <qglobal.h>
+#include <QString>
+#include <QMenu>
+
 #include "qgisinterface.h"
 #include "qgisapp.h"
 #include "qgsmaplayer.h"
 #include "qgsmapcanvas.h"
-//Added by qt3to4:
-#include <Q3PopupMenu>
 
 QgisIface::QgisIface(QgisApp * _qgis, const char *name):qgis(_qgis)
 {

diff --git a/src/gui/qgisiface.h b/src/gui/qgisiface.h
@@ -19,9 +19,8 @@
 #ifndef QGISIFACE_H
 #define QGISIFACE_H
 #include "qgisinterface.h"
-//Added by qt3to4:
-#include <QMenu>
 
+class QMenu;
 class QgsMapCanvas;
 class QgsMapLayer;
 /** \class QgisIface

diff --git a/src/gui/qgshelpviewer.cpp b/src/gui/qgshelpviewer.cpp
@@ -17,15 +17,10 @@
  ***************************************************************************/
  /* $Id$ */
 
+#include "qgshelpviewer.h"
 
+#include <QString>
 
-#include <qvariant.h>
-#include <qpushbutton.h>
-#include <q3textbrowser.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <q3whatsthis.h>
-#include "qgshelpviewer.h"
 QgsHelpViewer::QgsHelpViewer(QWidget * parent, Qt::WFlags fl)
 : QDialog(parent, fl)
 {

diff --git a/src/gui/qgshelpviewer.h b/src/gui/qgshelpviewer.h
@@ -20,21 +20,10 @@
 #ifndef QGSHELPVIEWER_H
 #define QGSHELPVIEWER_H
 
-#include <qvariant.h>
-#include <qdialog.h>
-//Added by qt3to4:
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QGridLayout>
 #include "ui_qgshelpviewerbase.h"
-#include <QDialog>
 
-class Q3VBoxLayout;
-class Q3HBoxLayout;
-class Q3GridLayout;
-class QPushButton;
-class Q3TextBrowser;
 class QString;
+
 class QgsHelpViewer : public QDialog, private Ui::QgsHelpViewerBase
 {
     Q_OBJECT

diff --git a/src/gui/qgsmaplayer.cpp b/src/gui/qgsmaplayer.cpp
@@ -22,13 +22,13 @@
 #include <cmath>
 
 #include <qgsapplication.h>
-#include <qdatetime.h>
-#include <qdom.h>
-#include <qfileinfo.h>
-#include <qlabel.h>
-#include <q3listview.h>
-#include <qpainter.h>
-#include <qevent.h>
+#include <QDateTime>
+#include <QDomNode>
+#include <QFileInfo>
+#include <QPainter>
+#include <QAction>
+#include <QKeyEvent>
+#include <QMenu>
 
 #include "qgisapp.h"
 #include "qgsmaptopixel.h"
@@ -38,12 +38,6 @@
 #include "qgsmaplayer.h"
 #include "qgslegendlayerfile.h"
 #include "qgslegendsymbologygroup.h"
-//Added by qt3to4:
-#include <QAction>
-#include <QPixmap>
-#include <QKeyEvent>
-#include <Q3Frame>
-
 
 
 

diff --git a/src/gui/qgsmaplayer.h b/src/gui/qgsmaplayer.h
@@ -21,33 +21,25 @@
 
 #include <vector>
 
-#include <qwidget.h>
-#include <qobject.h>
-#include <qpixmap.h>
-#include <qglobal.h>
+#include <QObject>
+#include <QPixmap>
 
 #include <qgsrect.h>
 #include <qgis.h>
 #include <qgsfield.h>
 
 #include <qgscoordinatetransform.h>
-//Added by qt3to4:
-#include <QEvent>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QMenu>
 
 class QAction;
 class QgisApp;
 class QgsMapToPixel;
 class QgsFeature;
-class Q3PopupMenu;
 class QgsLegendLayerFile;
 class QgsLegendSymbologyGroup;
 class QDomNode;
 class QDomDocument;
-class QEvent;
-class QLabel;
+class QKeyEvent;
+class QMenu;
 
 /** \class QgsMapLayer
  * \brief Base class for all map layer types.

diff --git a/src/gui/qgsmarkerdialog.cpp b/src/gui/qgsmarkerdialog.cpp
@@ -19,22 +19,20 @@
 #include "qgsmarkerdialog.h"
 #include "qgsapplication.h"
 #include "qgssvgcache.h"
-#include <qdir.h>
+
+#include <QDir>
 #include <QFileDialog>
 #include <q3iconview.h>
-#include <qlineedit.h>
-#include <q3picture.h>
-#include <qpushbutton.h>
-#include <qpainter.h>
-#include "qgsconfig.h"
-//Added by qt3to4:
 #include <QPixmap>
 
+#include "qgsconfig.h"
+
 QgsMarkerDialog::QgsMarkerDialog(QString startdir): 
   //paramters removed by Tim during qt4 ui port - FIXME!!!
   //QgsMarkerDialogBase(0,0,true,Qt::WStyle_StaysOnTop), mCurrentDir(startdir)
   QgsMarkerDialogBase(), mCurrentDir(startdir)
 {
+  setupUi(this);
     QObject::connect(mOkButton,SIGNAL(clicked()),this,SLOT(accept()));
     QObject::connect(mCancelButton,SIGNAL(clicked()),this,SLOT(reject()));
     QObject::connect(mBrowseDirectoriesButton,SIGNAL(clicked()),this,SLOT(changeDirectory()));

diff --git a/src/gui/qgsmarkerdialog.h b/src/gui/qgsmarkerdialog.h
@@ -20,8 +20,6 @@
 #ifndef QGSMARKERDIALOG_H
 #define QGSMARKERDIALOG_H
 #include "ui_qgsmarkerdialogbase.h"
-#include <QDialog>
-#include <qdir.h>
 
 /**A class for choosing marker images by clicking icons*/
 class QgsMarkerDialog: public QDialog, private Ui::QgsMarkerDialogBase

diff --git a/src/gui/qgspgquerybuilder.cpp b/src/gui/qgspgquerybuilder.cpp
@@ -15,9 +15,7 @@
 /* $Id$ */
 #include <iostream>
 #include <q3listbox.h>
-#include <qmessagebox.h>
-#include <q3textedit.h>
-#include <qlabel.h>
+#include <QMessageBox>
 #include "qgspgquerybuilder.h"
 // default constructor
 QgsPgQueryBuilder::QgsPgQueryBuilder(QWidget *parent, Qt::WFlags fl)

diff --git a/src/gui/qgsproject.cpp b/src/gui/qgsproject.cpp
@@ -16,8 +16,6 @@
  ***************************************************************************/
 
 #include "qgsproject.h"
-//Added by qt3to4:
-#include <QTextStream>
 
 #include <memory>
 #include <cassert>
@@ -37,14 +35,12 @@ using namespace std;
 #include "qgsprojectproperty.h"
 #include "qgsmapcanvas.h"
 
-#include <qapplication.h>
-#include <qfileinfo.h>
-#include <qdom.h>
-#include <q3dict.h>
-#include <qmessagebox.h>
-#include <qwidget.h>
-#include <qglobal.h>
-#include <qobject.h>
+#include <QApplication>
+#include <QFileInfo>
+#include <QDomNode>
+#include <QWidget>
+#include <QObject>
+#include <QTextStream>
 
 
 

diff --git a/src/gui/qgsproject.h b/src/gui/qgsproject.h
@@ -24,10 +24,6 @@
 
 #include <memory>
 
-#include <qmap.h>
-#include <q3valuelist.h>
-#include <qvariant.h>
-
 #include <qgsscalecalculator.h>
 
 

diff --git a/src/gui/qgssinglesymrenderer.cpp b/src/gui/qgssinglesymrenderer.cpp
@@ -25,10 +25,10 @@
 #include "qgslegenditem.h"
 #include "qgssymbologyutils.h"
 #include "qgssvgcache.h"
-#include <qdom.h>
-#include <qpainter.h>
-#include <q3picture.h>
-#include <qpixmap.h>
+
+#include <QDomNode>
+#include <QPainter>
+#include <QPixmap>
 
 QgsSingleSymRenderer::QgsSingleSymRenderer(QGis::VectorType type)
 {

diff --git a/src/gui/qgssinglesymrenderer.h b/src/gui/qgssinglesymrenderer.h
@@ -23,9 +23,10 @@
 #include "qgsrenderitem.h"
 #include "qgssymbol.h"
 #include "qgspoint.h"
-#include <qpainter.h>
-#include <QPixmap>
 #include "qgsmaptopixel.h"
+
+class QPainter;
+class QPixmap;
 class QgsFeature;
 
 /**Render class to display all the features with a single QgsSymbol*/

diff --git a/src/gui/qgsuniquevalrenderer.cpp b/src/gui/qgsuniquevalrenderer.cpp
@@ -24,10 +24,9 @@
 #include "qgssymbologyutils.h"
 #include "qgsuvaldialog.h"
 #include "qgssvgcache.h"
-#include <qdom.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <q3picture.h>
+#include <QDomNode>
+#include <QPainter>
+#include <QPixmap>
 #include <vector>
 
 QgsUniqueValRenderer::QgsUniqueValRenderer(QGis::VectorType type): mClassificationField(0)

diff --git a/src/gui/qgsuniquevalrenderer.h b/src/gui/qgsuniquevalrenderer.h
@@ -19,10 +19,11 @@
 #define QGSUNIQUEVALRENDERER_H
 
 #include "qgsrenderer.h"
-#include <qcolor.h>
 #include <map>
 
 class QgsSymbol;
+class QPixmap;
+class QPainter;
 
 class QgsUniqueValRenderer: public QgsRenderer
 {

diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -48,7 +48,6 @@
 #include <QPolygon>
 #include <QString>
 #include <QMessageBox>
-#include <q3popupmenu.h>
 #include <QProgressDialog>
 #include <QSettings>
 #include <QWidget>

diff --git a/src/gui/qgsvectorlayer.h b/src/gui/qgsvectorlayer.h
@@ -1,5 +1,3 @@
-//Added by qt3to4:
-#include <Q3PopupMenu>
 /***************************************************************************
                           qgsvectorlayer.h  -  description
                              -------------------