Skip to content
Permalink
Browse files
Change all remaining Qt include filenames from qxxx.h to QXxx and adj…
…ust other Qt include statements as necessary. (GRASS provider/plugin not changed since it hasn't been updated from Qt3 to Qt4 yet.)

git-svn-id: http://svn.osgeo.org/qgis/trunk@8439 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
telwertowski committed May 15, 2008
1 parent 6f03494 commit acdbb66ac475f5c281b0819001639b45a656f9d3
Showing with 33 additions and 42 deletions.
  1. +1 −0 src/app/composer/qgscomposervectorlegend.cpp
  2. +1 −0 src/app/qgsattributetable.cpp
  3. +1 −2 src/app/qgsbookmarkitem.cpp
  4. +1 −0 src/app/qgsmaptooladdfeature.cpp
  5. +1 −0 src/app/qgsmaptooladdisland.cpp
  6. +1 −0 src/app/qgsmaptooladdring.cpp
  7. +1 −0 src/app/qgsmaptooladdvertex.cpp
  8. +1 −0 src/app/qgsmaptoolcapture.cpp
  9. +1 −0 src/app/qgsmaptooldeletevertex.cpp
  10. +1 −0 src/app/qgsmaptoolmovevertex.cpp
  11. +1 −0 src/app/qgsmaptoolsplitfeatures.cpp
  12. +2 −1 src/app/qgsmeasuredialog.cpp
  13. +1 −0 src/app/qgsmeasuretool.cpp
  14. +1 −2 src/app/qgspastetransformations.cpp
  15. +0 −2 src/app/qgspastetransformations.h
  16. +0 −1 src/app/qgspluginitem.cpp
  17. +1 −1 src/app/qgspluginitem.h
  18. +0 −1 src/app/qgspluginmetadata.cpp
  19. +1 −1 src/app/qgspluginmetadata.h
  20. +1 −7 src/app/qgspluginregistry.cpp
  21. +0 −1 src/app/qgspluginregistry.h
  22. +2 −1 src/core/qgis.h
  23. +1 −2 src/core/qgsexception.h
  24. +0 −4 src/core/qgsfield.cpp
  25. +0 −2 src/core/qgslabelattributes.h
  26. +0 −4 src/core/qgsline.cpp
  27. +0 −2 src/core/qgsline.h
  28. +1 −0 src/core/qgsmaprender.h
  29. +2 −3 src/core/qgsmaptopixel.cpp
  30. +1 −1 src/core/qgsprovidermetadata.h
  31. +0 −1 src/core/qgsscalecalculator.cpp
  32. +1 −0 src/core/qgssnapper.cpp
  33. +1 −0 src/core/renderer/qgsrenderer.h
  34. +1 −0 src/gui/qgsmaptoolemitpoint.cpp
  35. +1 −0 src/gui/qgsmaptoolpan.cpp
  36. +1 −0 src/plugins/georeferencer/qgspointdialog.cpp
  37. +1 −0 src/plugins/grass/qgsgrassedittools.cpp
  38. +1 −0 src/plugins/grass/qgsgrassregion.cpp
  39. +1 −1 src/plugins/spit/qgspgutil.h
  40. +0 −2 src/providers/postgres/qgspostgresprovider.h
@@ -25,6 +25,7 @@
#include "qgssymbol.h"
#include "qgsvectorlayer.h"

#include <QContextMenuEvent>
#include <QFontDialog>
#include <QGraphicsScene>
#include <QHeaderView>
@@ -29,6 +29,7 @@
#include <QApplication>
#include <QClipboard>
#include <QHeaderView>
#include <QKeyEvent>
#include <QMenu>


@@ -18,8 +18,7 @@
/* $Id$ */
#include <iostream>
#include <sqlite3.h>
#include <qstring.h>
#include <qtextstream.h>
#include <QTextStream>

#include <cassert>

@@ -27,6 +27,7 @@
#include "qgsvectorlayer.h"
#include "qgslogger.h"
#include <QMessageBox>
#include <QMouseEvent>

QgsMapToolAddFeature::QgsMapToolAddFeature(QgsMapCanvas* canvas, enum CaptureTool tool): QgsMapToolCapture(canvas, tool)
{
@@ -21,6 +21,7 @@
#include "qgsrubberband.h"
#include "qgsvectorlayer.h"
#include <QMessageBox>
#include <QMouseEvent>

QgsMapToolAddIsland::QgsMapToolAddIsland(QgsMapCanvas* canvas): QgsMapToolCapture(canvas, QgsMapToolCapture::CapturePolygon)
{
@@ -21,6 +21,7 @@
#include "qgsrubberband.h"
#include "qgsvectorlayer.h"
#include <QMessageBox>
#include <QMouseEvent>

QgsMapToolAddRing::QgsMapToolAddRing(QgsMapCanvas* canvas): QgsMapToolCapture(canvas, QgsMapToolCapture::CapturePolygon)
{
@@ -20,6 +20,7 @@
#include "qgsproject.h"
#include "qgsrubberband.h"
#include "qgsvectorlayer.h"
#include <QMouseEvent>

QgsMapToolAddVertex::QgsMapToolAddVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas), mRubberBand(0)
{
@@ -33,6 +33,7 @@
#include <QCursor>
#include <QPixmap>
#include <QMessageBox>
#include <QMouseEvent>


QgsMapToolCapture::QgsMapToolCapture(QgsMapCanvas* canvas, enum CaptureTool tool)
@@ -19,6 +19,7 @@
#include "qgsmapcanvas.h"
#include "qgsvertexmarker.h"
#include "qgsvectorlayer.h"
#include <QMouseEvent>

QgsMapToolDeleteVertex::QgsMapToolDeleteVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas), mCross(0)
{
@@ -20,6 +20,7 @@
#include "qgsproject.h"
#include "qgsrubberband.h"
#include "qgsvectorlayer.h"
#include <QMouseEvent>

QgsMapToolMoveVertex::QgsMapToolMoveVertex(QgsMapCanvas* canvas): QgsMapToolVertexEdit(canvas)
{
@@ -20,6 +20,7 @@
#include "qgsrubberband.h"
#include "qgsvectorlayer.h"
#include <QMessageBox>
#include <QMouseEvent>

QgsMapToolSplitFeatures::QgsMapToolSplitFeatures(QgsMapCanvas* canvas): QgsMapToolCapture(canvas, QgsMapToolCapture::CaptureLine)
{
@@ -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)
@@ -26,6 +26,7 @@
#include "qgscursors.h"

#include <QMessageBox>
#include <QMouseEvent>
#include <QSettings>

QgsMeasureTool::QgsMeasureTool(QgsMapCanvas* canvas, bool measureArea)
@@ -19,9 +19,8 @@

#include <iostream>

#include <QSettings>
#include <QComboBox>
#include <qglobal.h>
#include <QSettings>

#include "qgsfield.h"
#include "qgspastetransformations.h"
@@ -19,8 +19,6 @@
#ifndef QGSPASTETRANSFORMATIONS_H
#define QGSPASTETRANSFORMATIONS_H
#include "ui_qgspastetransformationsbase.h"
#include <QDialog>
#include <qstring.h>

#include "qgsmaplayer.h"

@@ -15,7 +15,6 @@
* *
***************************************************************************/
/* $Id$ */
#include <qstring.h>
#include "qgspluginitem.h"

QgsPluginItem::QgsPluginItem(QString _name, QString _description, QString _fullPath, QString _type, bool _python):
@@ -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
@@ -17,7 +17,6 @@
***************************************************************************/
/* $Id$ */

#include <qstring.h>
#include "../plugins/qgisplugin.h"
#include "qgspluginmetadata.h"
QgsPluginMetadata::QgsPluginMetadata(QString _libraryPath,
@@ -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
@@ -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()
@@ -20,7 +20,6 @@
#ifndef QGSPLUGINREGISTRY_H
#define QGSPLUGINREGISTRY_H
#include <map>
#include "qgspluginmetadata.h"
class QgsPluginMetadata;
class QgisPlugin;
class QString;
@@ -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
{
@@ -22,8 +22,7 @@
#include <string>
#include <list>

#include <qdom.h>
#include <qstring.h>
#include <QDomNode>

/**
Defines a qgis exception class
@@ -15,12 +15,8 @@
***************************************************************************/
/* $Id$ */

#include <iostream>
#include "qgsfield.h"

#include <qstring.h>
#include <iostream>

static const char * const ident_ =
"$Id$";

@@ -17,8 +17,6 @@
#ifndef QGSLABELATTRIBUTES_H
#define QGSLABELATTRIBUTES_H

#include <qnamespace.h>

#include <QBrush>
#include <QFont>
#include <QPen>
@@ -17,10 +17,6 @@
***************************************************************************/
/* $Id$ */


#include <iostream>

#include <qstring.h>
#include "qgsline.h"

QgsLine::QgsLine()
@@ -22,8 +22,6 @@

#include <iostream>

#include <qstring.h>

#include "qgspoint.h"

/*! \class QgsLine
@@ -17,6 +17,7 @@
#ifndef QGSMAPRENDER_H
#define QGSMAPRENDER_H

#include <QSize>
#include <QStringList>

#include "qgis.h"
@@ -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,
@@ -21,7 +21,7 @@
#define QGSPROVIDERMETADATA_H


#include <qstring.h>
#include <QString>


/** holds data provider key, description, and associated shared library file information
@@ -19,7 +19,6 @@

#include <assert.h>
#include <math.h>
#include <qstring.h>
#include "qgslogger.h"
#include "qgsrect.h"
#include "qgsscalecalculator.h"
@@ -20,6 +20,7 @@
#include "qgsmaptopixel.h"
#include "qgsvectorlayer.h"
#include <QMultiMap>
#include <QPoint>
#include <cmath>


@@ -27,6 +27,7 @@ class QDomDocument;
class QColor;

#include "qgis.h"
#include <QList>

class QgsSymbol;

@@ -17,6 +17,7 @@

#include "qgsmaptoolemitpoint.h"
#include "qgsmapcanvas.h"
#include <QMouseEvent>


QgsMapToolEmitPoint::QgsMapToolEmitPoint(QgsMapCanvas* canvas)
@@ -19,6 +19,7 @@
#include "qgscursors.h"
#include <QBitmap>
#include <QCursor>
#include <QMouseEvent>


QgsMapToolPan::QgsMapToolPan(QgsMapCanvas* canvas)
@@ -18,6 +18,7 @@
#include <QFileDialog>
#include <QFileInfo>
#include <QMessageBox>
#include <QMouseEvent>
#include <QPainter>
#include <QTextStream>

@@ -23,6 +23,7 @@
#include "qgsgrassattributes.h"
#include "../../src/providers/grass/qgsgrassprovider.h"
#include "qgsvertexmarker.h"
#include <QMouseEvent>

extern "C" {
#include <grass/gis.h>
@@ -40,6 +40,7 @@
#include <qspinbox.h>
#include <qglobal.h>

#include <QMouseEvent>
#include <QRubberBand>

#include <qgsrasterlayer.h>
@@ -16,7 +16,7 @@
#ifndef QGSPGUTIL_H
#define QGSPGUTIL_H
#include <map>
#include <qstringlist.h>
#include <QStringList>
extern "C"
{
#include <libpq-fe.h>
@@ -1,5 +1,3 @@
//Added by qt3to4:
#include <QCustomEvent>
/***************************************************************************
qgspostgresprovider.h - Data provider for PostgreSQL/PostGIS layers
-------------------

0 comments on commit acdbb66

Please sign in to comment.