Change all remaining Qt include filenames from qxxx.h to QXxx and adjust other Qt include statements as necessary. (GRASS provider/plugin not changed since it hasn't been updated from Qt3 to Qt4 yet.)

telwertowski · telwertowski · commit acdbb66ac475 · 2008-05-15T02:01:03.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@8439 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposervectorlegend.cpp b/src/app/composer/qgscomposervectorlegend.cpp
@@ -25,6 +25,7 @@
 #include "qgssymbol.h"
 #include "qgsvectorlayer.h"
 
+#include <QContextMenuEvent>
 #include <QFontDialog>
 #include <QGraphicsScene>
 #include <QHeaderView>
diff --git a/src/app/qgsattributetable.cpp b/src/app/qgsattributetable.cpp
@@ -29,6 +29,7 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QHeaderView>
+#include <QKeyEvent>
 #include <QMenu>
 
 
diff --git a/src/app/qgsbookmarkitem.cpp b/src/app/qgsbookmarkitem.cpp
@@ -18,8 +18,7 @@
  /* $Id$ */
 #include <iostream>
 #include <sqlite3.h>
-#include <qstring.h>
-#include <qtextstream.h>
+#include <QTextStream>
 
 #include <cassert>
 
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -27,6 +27,7 @@
 #include "qgsvectorlayer.h"
 #include "qgslogger.h"
 #include <QMessageBox>
+#include <QMouseEvent>
 
 QgsMapToolAddFeature::QgsMapToolAddFeature(QgsMapCanvas* canvas, enum CaptureTool tool): QgsMapToolCapture(canvas, tool)
 {
diff --git a/src/app/qgsmaptooladdisland.cpp b/src/app/qgsmaptooladdisland.cpp
@@ -21,6 +21,7 @@
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
 #include <QMessageBox>
+#include <QMouseEvent>
 
 QgsMapToolAddIsland::QgsMapToolAddIsland(QgsMapCanvas* canvas): QgsMapToolCapture(canvas, QgsMapToolCapture::CapturePolygon)
 {
diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp
@@ -21,6 +21,7 @@
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
 #include <QMessageBox>
+#include <QMouseEvent>
 
 QgsMapToolAddRing::QgsMapToolAddRing(QgsMapCanvas* canvas): QgsMapToolCapture(canvas, QgsMapToolCapture::CapturePolygon)
 {
diff --git a/src/app/qgsmaptooladdvertex.cpp b/src/app/qgsmaptooladdvertex.cpp
@@ -20,6 +20,7 @@
 #include "qgsproject.h"
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
+#include <QMouseEvent>
 
 QgsMapToolAddVertex::QgsMapToolAddVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas), mRubberBand(0)
 {
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -33,6 +33,7 @@
 #include <QCursor>
 #include <QPixmap>
 #include <QMessageBox>
+#include <QMouseEvent>
 
 
 QgsMapToolCapture::QgsMapToolCapture(QgsMapCanvas* canvas, enum CaptureTool tool)
diff --git a/src/app/qgsmaptooldeletevertex.cpp b/src/app/qgsmaptooldeletevertex.cpp
@@ -19,6 +19,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsvertexmarker.h"
 #include "qgsvectorlayer.h"
+#include <QMouseEvent>
 
 QgsMapToolDeleteVertex::QgsMapToolDeleteVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas), mCross(0)
 {
diff --git a/src/app/qgsmaptoolmovevertex.cpp b/src/app/qgsmaptoolmovevertex.cpp
@@ -20,6 +20,7 @@
 #include "qgsproject.h"
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
+#include <QMouseEvent>
 
 QgsMapToolMoveVertex::QgsMapToolMoveVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas)
 {
diff --git a/src/app/qgsmaptoolsplitfeatures.cpp b/src/app/qgsmaptoolsplitfeatures.cpp
@@ -20,6 +20,7 @@
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
 #include <QMessageBox>
+#include <QMouseEvent>
 
 QgsMapToolSplitFeatures::QgsMapToolSplitFeatures(QgsMapCanvas* canvas): QgsMapToolCapture(canvas, QgsMapToolCapture::CaptureLine)
 {
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
@@ -24,8 +24,9 @@
 #include "qgsmaprender.h"
 #include "qgsspatialrefsys.h"
 
-#include <QSettings>
+#include <QCloseEvent>
 #include <QLocale>
+#include <QSettings>
 
 
 QgsMeasureDialog::QgsMeasureDialog(QgsMeasureTool* tool, Qt::WFlags f)
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
@@ -26,6 +26,7 @@
 #include "qgscursors.h"
 
 #include <QMessageBox>
+#include <QMouseEvent>
 #include <QSettings>
 
 QgsMeasureTool::QgsMeasureTool(QgsMapCanvas* canvas, bool measureArea)
diff --git a/src/app/qgspastetransformations.cpp b/src/app/qgspastetransformations.cpp
@@ -19,9 +19,8 @@
 
 #include <iostream>
 
-#include <QSettings>
 #include <QComboBox>
-#include <qglobal.h>
+#include <QSettings>
 
 #include "qgsfield.h"
 #include "qgspastetransformations.h"
diff --git a/src/app/qgspastetransformations.h b/src/app/qgspastetransformations.h
@@ -19,8 +19,6 @@
 #ifndef QGSPASTETRANSFORMATIONS_H
 #define QGSPASTETRANSFORMATIONS_H
 #include "ui_qgspastetransformationsbase.h"
-#include <QDialog>
-#include <qstring.h>
 
 #include "qgsmaplayer.h"
 
diff --git a/src/app/qgspluginitem.cpp b/src/app/qgspluginitem.cpp
@@ -15,7 +15,6 @@
  *                                                                         *
  ***************************************************************************/
 /* $Id$ */
-#include <qstring.h>
 #include "qgspluginitem.h"
 
 QgsPluginItem::QgsPluginItem(QString _name, QString _description, QString _fullPath, QString _type, bool _python):
diff --git a/src/app/qgspluginitem.h b/src/app/qgspluginitem.h
@@ -17,7 +17,7 @@
 /* $Id$ */
 #ifndef QGSPLUGINITEM_H
 #define QGSPLUGINITEM_H
-class QString;
+#include <QString>
 /**
 Class to contain information about a loadable plugin, including its name, description and the full path to the shared library
 
diff --git a/src/app/qgspluginmetadata.cpp b/src/app/qgspluginmetadata.cpp
@@ -17,7 +17,6 @@
  ***************************************************************************/
  /* $Id$ */
 
-#include <qstring.h>
 #include "../plugins/qgisplugin.h"
 #include "qgspluginmetadata.h"
 QgsPluginMetadata::QgsPluginMetadata(QString _libraryPath, 
diff --git a/src/app/qgspluginmetadata.h b/src/app/qgspluginmetadata.h
@@ -19,8 +19,8 @@
  
 #ifndef QGSPLUGINMETADATA_H
 #define QGSPLUGINMETADATA_H
+#include <QString>
 class QgisPlugin;
-class QString;
 /**
 * \class QgsPluginMetadata
 * \brief Stores information about a loaded plugin, including a pointer to
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
@@ -17,14 +17,8 @@
  ***************************************************************************/
  /* $Id$ */
 
-#include <iostream>
-#include <qmessagebox.h>
-#include <qstring.h>
-#include <qdir.h>
-#include <qlibrary.h>
-#include <qapplication.h>
-#include "qgsprovidermetadata.h"
 #include "qgspluginregistry.h"
+#include "qgspluginmetadata.h"
 
 QgsPluginRegistry *QgsPluginRegistry::_instance = 0;
 QgsPluginRegistry *QgsPluginRegistry::instance()
diff --git a/src/app/qgspluginregistry.h b/src/app/qgspluginregistry.h
@@ -20,7 +20,6 @@
 #ifndef QGSPLUGINREGISTRY_H
 #define QGSPLUGINREGISTRY_H
 #include <map>
-#include "qgspluginmetadata.h"
 class QgsPluginMetadata;
 class QgisPlugin;
 class QString;
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -29,7 +29,8 @@
 * This API documentation provides information about all classes that make up QGIS.
 */
 
-#include <qevent.h>
+#include <QEvent>
+#include <QString>
 
 class CORE_EXPORT QGis
 { 
diff --git a/src/core/qgsexception.h b/src/core/qgsexception.h
@@ -22,8 +22,7 @@
 #include <string>
 #include <list>
 
-#include <qdom.h> 
-#include <qstring.h>
+#include <QDomNode> 
 
 /**
    Defines a qgis exception class
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
@@ -15,12 +15,8 @@
  ***************************************************************************/
 /* $Id$ */
 
-#include <iostream>
 #include "qgsfield.h"
 
-#include <qstring.h>
-#include <iostream>
-
 static const char * const ident_ = 
    "$Id$";
 
diff --git a/src/core/qgslabelattributes.h b/src/core/qgslabelattributes.h
@@ -17,8 +17,6 @@
 #ifndef QGSLABELATTRIBUTES_H
 #define QGSLABELATTRIBUTES_H
 
-#include <qnamespace.h>
-
 #include <QBrush>
 #include <QFont>
 #include <QPen>
diff --git a/src/core/qgsline.cpp b/src/core/qgsline.cpp
@@ -17,10 +17,6 @@
  ***************************************************************************/
 /* $Id$ */
 
-
-#include <iostream>
-
-#include <qstring.h>
 #include "qgsline.h"
 
 QgsLine::QgsLine()
diff --git a/src/core/qgsline.h b/src/core/qgsline.h
@@ -22,8 +22,6 @@
 
 #include <iostream>
 
-#include <qstring.h>
-
 #include "qgspoint.h"
 
 /*! \class QgsLine
diff --git a/src/core/qgsmaprender.h b/src/core/qgsmaprender.h
@@ -17,6 +17,7 @@
 #ifndef QGSMAPRENDER_H
 #define QGSMAPRENDER_H
 
+#include <QSize>
 #include <QStringList>
 
 #include "qgis.h"
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
@@ -15,10 +15,9 @@
  *                                                                         *
  ***************************************************************************/
  /* $Id$ */
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qpoint.h>
 #include "qgsmaptopixel.h"
+#include <QPoint>
+#include <QTextStream>
 
 QgsMapToPixel::QgsMapToPixel(double mupp, 
 				    double ymax,
diff --git a/src/core/qgsprovidermetadata.h b/src/core/qgsprovidermetadata.h
@@ -21,7 +21,7 @@
 #define QGSPROVIDERMETADATA_H
 
 
-#include <qstring.h>
+#include <QString>
 
 
 /** holds data provider key, description, and associated shared library file information
diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
@@ -19,7 +19,6 @@
 
 #include <assert.h>
 #include <math.h>
-#include <qstring.h>
 #include "qgslogger.h"
 #include "qgsrect.h"
 #include "qgsscalecalculator.h"
diff --git a/src/core/qgssnapper.cpp b/src/core/qgssnapper.cpp
@@ -20,6 +20,7 @@
 #include "qgsmaptopixel.h"
 #include "qgsvectorlayer.h"
 #include <QMultiMap>
+#include <QPoint>
 #include <cmath>
 
 
diff --git a/src/core/renderer/qgsrenderer.h b/src/core/renderer/qgsrenderer.h
@@ -27,6 +27,7 @@ class QDomDocument;
 class QColor;
 
 #include "qgis.h"
+#include <QList>
 
 class QgsSymbol;
 
diff --git a/src/gui/qgsmaptoolemitpoint.cpp b/src/gui/qgsmaptoolemitpoint.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsmaptoolemitpoint.h"
 #include "qgsmapcanvas.h"
+#include <QMouseEvent>
 
 
 QgsMapToolEmitPoint::QgsMapToolEmitPoint(QgsMapCanvas* canvas)
diff --git a/src/gui/qgsmaptoolpan.cpp b/src/gui/qgsmaptoolpan.cpp
@@ -19,6 +19,7 @@
 #include "qgscursors.h"
 #include <QBitmap>
 #include <QCursor>
+#include <QMouseEvent>
 
 
 QgsMapToolPan::QgsMapToolPan(QgsMapCanvas* canvas)
diff --git a/src/plugins/georeferencer/qgspointdialog.cpp b/src/plugins/georeferencer/qgspointdialog.cpp
@@ -18,6 +18,7 @@
 #include <QFileDialog>
 #include <QFileInfo>
 #include <QMessageBox>
+#include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
 
diff --git a/src/plugins/grass/qgsgrassedittools.cpp b/src/plugins/grass/qgsgrassedittools.cpp
@@ -23,6 +23,7 @@
 #include "qgsgrassattributes.h"
 #include "../../src/providers/grass/qgsgrassprovider.h"
 #include "qgsvertexmarker.h"
+#include <QMouseEvent>
 
 extern "C" {
 #include <grass/gis.h>
diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
@@ -40,6 +40,7 @@
 #include <qspinbox.h>
 #include <qglobal.h>
 
+#include <QMouseEvent>
 #include <QRubberBand>
 
 #include <qgsrasterlayer.h>
diff --git a/src/plugins/spit/qgspgutil.h b/src/plugins/spit/qgspgutil.h
@@ -16,7 +16,7 @@
 #ifndef QGSPGUTIL_H
 #define QGSPGUTIL_H
 #include <map>
-#include <qstringlist.h>
+#include <QStringList>
 extern "C"
 {
   #include <libpq-fe.h>
diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -1,5 +1,3 @@
-//Added by qt3to4:
-#include <QCustomEvent>
 /***************************************************************************
       qgspostgresprovider.h  -  Data provider for PostgreSQL/PostGIS layers
                              -------------------

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#include "qgsvectorlayer.h"`
`28`	`28`	`#include "qgslogger.h"`
`29`	`29`	`#include <QMessageBox>`
	`30`	`+#include <QMouseEvent>`
`30`	`31`
`31`	`32`	`QgsMapToolAddFeature::QgsMapToolAddFeature(QgsMapCanvas* canvas, enum CaptureTool tool): QgsMapToolCapture(canvas, tool)`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`#include "qgsrubberband.h"`
`22`	`22`	`#include "qgsvectorlayer.h"`
`23`	`23`	`#include <QMessageBox>`
	`24`	`+#include <QMouseEvent>`
`24`	`25`
`25`	`26`	`QgsMapToolAddIsland::QgsMapToolAddIsland(QgsMapCanvas* canvas): QgsMapToolCapture(canvas, QgsMapToolCapture::CapturePolygon)`
`26`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include "qgsproject.h"`
`21`	`21`	`#include "qgsrubberband.h"`
`22`	`22`	`#include "qgsvectorlayer.h"`
	`23`	`+#include <QMouseEvent>`
`23`	`24`
`24`	`25`	`QgsMapToolAddVertex::QgsMapToolAddVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas), mRubberBand(0)`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include "qgsmapcanvas.h"`
`20`	`20`	`#include "qgsvertexmarker.h"`
`21`	`21`	`#include "qgsvectorlayer.h"`
	`22`	`+#include <QMouseEvent>`
`22`	`23`
`23`	`24`	`QgsMapToolDeleteVertex::QgsMapToolDeleteVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas), mCross(0)`
`24`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@`
`29`	`29`	`* This API documentation provides information about all classes that make up QGIS.`
`30`	`30`	`*/`
`31`	`31`
`32`		`-#include <qevent.h>`
	`32`	`+#include <QEvent>`
	`33`	`+#include <QString>`
`33`	`34`
`34`	`35`	`class CORE_EXPORT QGis`
`35`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#ifndef QGSPGUTIL_H`
`17`	`17`	`#define QGSPGUTIL_H`
`18`	`18`	`#include <map>`
`19`		`-#include <qstringlist.h>`
	`19`	`+#include <QStringList>`
`20`	`20`	`extern "C"`
`21`	`21`	`{`
`22`	`22`	`#include <libpq-fe.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-//Added by qt3to4:`
`2`		`-#include <QCustomEvent>`
`3`	`1`	`/***************************************************************************`
`4`	`2`	`qgspostgresprovider.h - Data provider for PostgreSQL/PostGIS layers`
`5`	`3`	`-------------------`