Skip to content

Commit d64670f

Browse files
author
g_j_m
committed
Tidy up #includes
- move to CaptialWords format for Qt includes - use forward declarations where possible - removed many unnecessary #includes in *.h files git-svn-id: http://svn.osgeo.org/qgis/trunk@4992 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 73b5e3a commit d64670f

29 files changed

+81
-126
lines changed

src/gui/qgisapp.cpp

+2-22
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,20 @@
2525
#include <QAction>
2626
#include <QApplication>
2727
#include <QBitmap>
28-
#include <QByteArray>
2928
#include <QCheckBox>
3029
#include <QClipboard>
3130
#include <QColor>
3231
#include <QCursor>
3332
#include <QDesktopWidget>
3433
#include <QDialog>
3534
#include <QDir>
36-
#include <QErrorMessage>
3735
#include <QEvent>
3836
#include <QFile>
3937
#include <QFileInfo>
40-
#include <QGridLayout>
41-
#include <QImage>
4238
#include <QInputDialog>
4339
#include <QKeyEvent>
4440
#include <QLabel>
45-
#include <QLayout>
4641
#include <QLibrary>
47-
#include <QListView>
48-
#include <QMatrix>
4942
#include <QMenu>
5043
#include <QMenuBar>
5144
#include <QMenuItem>
@@ -57,24 +50,15 @@
5750
#include <QPrinter>
5851
#include <QProcess>
5952
#include <QProgressBar>
60-
#include <QPushButton>
61-
#include <QRect>
62-
#include <QRegExp>
63-
#include <QScrollArea>
6453
#include <QSettings>
65-
#include <QSplitter>
66-
#include <QStatusBar>
67-
#include <QStatusBar>
6854
#include <QStringList>
6955
#include <QTcpSocket>
7056
#include <QTextStream>
71-
#include <QTimer>
72-
#include <QToolBar>
73-
#include <QToolBox>
7457
#include <QToolButton>
7558
#include <QToolTip>
7659
#include <QVBoxLayout>
7760
#include <QWhatsThis>
61+
#include <QSplashScreen>
7862
//
7963
// QGIS Specific Includes
8064
//
@@ -119,6 +103,7 @@
119103
#include "qgsvectorfilewriter.h"
120104
#include "qgsvectorlayer.h"
121105
#include "qgisplugin.h"
106+
#include "qgsvectordataprovider.h"
122107
#include "../../images/themes/default/qgis.xpm"
123108

124109
//
@@ -150,11 +135,6 @@
150135
#include "qgsmaptoolzoom.h"
151136
#include "qgsmeasure.h"
152137

153-
154-
//#include "qgssisydialog.h"
155-
// XXX deprecated?? #include "qgslegenditem.h"
156-
157-
158138
//
159139
// Conditional Includes
160140
//

src/gui/qgisapp.h

+13-25
Original file line numberDiff line numberDiff line change
@@ -19,44 +19,35 @@
1919
#ifndef QGISAPP_H
2020
#define QGISAPP_H
2121

22-
//Added by qt3to4:
23-
#include <QMenu>
24-
#include <QKeyEvent>
25-
#include <QEvent>
26-
#include <QPixmap>
27-
#include <QLabel>
28-
#include <QSplashScreen>
29-
class QCanvas;
3022
class QRect;
31-
class QCanvasView;
3223
class QStringList;
33-
class QScrollView;
34-
class QgsPoint;
35-
class QgsLegend;
36-
class QgsLegendView;
37-
class QVBox;
3824
class QCursor;
3925
class QLabel;
40-
class QListView;
4126
class Q3ListViewItem;
4227
class QProgressBar;
4328
class QFileInfo;
44-
class QgsMapLayer;
4529
class QSettings;
4630
class QTcpSocket;
31+
class QCheckBox;
32+
class QToolButton;
33+
class QKeyEvent;
34+
class QMenu;
35+
class QPixmap;
36+
class QSplashScreen;
37+
38+
class QgsPoint;
39+
class QgsLegend;
40+
class QgsMapLayer;
4741
class QgsProviderRegistry;
4842
class QgsHelpViewer;
4943
class QgsMapCanvas;
5044
class QgsMapLayerRegistry;
5145
class QgsRasterLayer;
52-
class QCheckBox;
53-
class QEvent;
5446
class QgsComposer;
55-
class QPushButton;
56-
class QToolButton;
47+
5748
#include "qgisiface.h"
58-
#include "qgsconfig.h"
59-
#include "qgsvectordataprovider.h"
49+
//#include "qgsconfig.h"
50+
6051
#include "qgsclipboard.h"
6152

6253
#include <map>
@@ -522,9 +513,6 @@ public slots:
522513
QMenu *toolPopupDisplay;
523514
//! Popup menu for the capture tools
524515
QMenu *toolPopupCapture;
525-
//! Legend list view control
526-
//doesnt see to be used...(TS)
527-
//QgsLegendView *mLegendView;
528516
//! Map canvas
529517
QgsMapCanvas *mMapCanvas;
530518
//! Map layer registry

src/gui/qgisinterface.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
****************************************************************************/
1818
/* $Id$ */
1919

20-
#include <iostream>
2120
#include "qgisinterface.h"
2221
#include "qgisapp.h"
2322

src/gui/qgisinterface.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919
#ifndef QGISINTERFACE_H
2020
#define QGISINTERFACE_H
2121

22-
#include <qaction.h>
22+
#include <QAction>
23+
#include <QWidget>
2324

24-
#include <qwidget.h>
25-
//Added by qt3to4:
26-
#include <Q3PopupMenu>
2725
#include <map>
26+
2827
class QgisApp;
2928
class QgsMapLayer;
30-
class Q3PopupMenu;
3129
class QgsMapCanvas;
3230
class QgsRasterLayer;
3331
class QgsMapLayerRegistry;

src/gui/qgsattributeaction.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <iostream>
2727
#include <vector>
2828

29-
#include <qstringlist.h>
30-
#include <qdom.h>
29+
#include <QStringList>
30+
#include <QDomElement>
3131

3232
#include "qgsattributeaction.h"
3333
#include "qgsrunprocess.h"

src/gui/qgsattributeaction.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#ifndef QGSATTRIBUTEACTION_H
2626
#define QGSATTRIBUTEACTION_H
2727

28-
#include <qstring.h>
29-
#include <qobject.h>
28+
#include <QString>
29+
#include <QObject>
3030

3131
#include <list>
3232
#include <vector>

src/gui/qgsattributetable.cpp

+10-11
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,21 @@
1616
* *
1717
***************************************************************************/
1818
/* $Id$ */
19-
#include <qapplication.h>
20-
#include <qcursor.h>
21-
#include <q3popupmenu.h>
22-
#include <qlabel.h>
23-
#include <qfont.h>
24-
#include <qglobal.h>
25-
#include <qclipboard.h>
19+
#include <QApplication>
20+
#include <QMouseEvent>
21+
#include <Q3PopupMenu>
22+
#include <QKeyEvent>
23+
#include <QLabel>
24+
#include <QFont>
25+
#include <QClipboard>
26+
#include <Q3ValueList>
27+
2628
#include "qgsattributetable.h"
2729
#include "qgsfeature.h"
2830
#include "qgsfield.h"
2931
#include "qgsvectordataprovider.h"
3032
#include "qgsvectorlayer.h"
31-
//Added by qt3to4:
32-
#include <QKeyEvent>
33-
#include <Q3ValueList>
34-
#include <QMouseEvent>
33+
3534
#include <iostream>
3635
#include <stdlib.h>
3736

src/gui/qgsattributetable.h

+5-6
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,17 @@
1919
#ifndef QGSATTRIBUTETABLE_H
2020
#define QGSATTRIBUTETABLE_H
2121

22-
#include <q3table.h>
23-
#include <qmap.h>
24-
//Added by qt3to4:
25-
#include <QMouseEvent>
26-
#include <QKeyEvent>
27-
#include <Q3PopupMenu>
22+
#include <Q3Table>
23+
#include <QMap>
24+
2825
#include <map>
2926
#include <set>
3027

3128
class Q3PopupMenu;
3229
class QgsVectorLayer;
3330
class QgsFeature;
31+
class QMouseEvent;
32+
class QKeyEvent;
3433

3534
#include "qgsattributeaction.h"
3635

src/gui/qgsclipboard.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#include <fstream>
2121
#include <iostream>
2222

23-
#include <qapplication.h>
24-
#include <qstring.h>
25-
#include <qstringlist.h>
26-
#include <qclipboard.h>
23+
#include <QApplication>
24+
#include <QString>
25+
#include <QStringList>
26+
#include <QClipboard>
2727

2828
#include "qgsclipboard.h"
2929

src/gui/qgscontinuouscolorrenderer.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
#include "qgssymbologyutils.h"
2424
#include "qgsmarkercatalogue.h"
2525
#include "qgssymbol.h"
26-
#include <qdom.h>
26+
27+
#include <QDomElement>
28+
#include <QPainter>
29+
#include <QPixmap>
2730

2831
QgsContinuousColorRenderer::QgsContinuousColorRenderer(QGis::VectorType type): mMinimumSymbol(0), mMaximumSymbol(0)
2932
{

src/gui/qgscontinuouscolorrenderer.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@
1919
#define QGSCONTINUOUSCOLORRENDERER_H
2020

2121
#include "qgsrenderer.h"
22-
#include <qpainter.h>
2322
#include "qgsmaptopixel.h"
2423
#include "qgspoint.h"
2524
#include "qgsfeature.h"
26-
#include <QPixmap>
27-
#include <iostream>
2825

2926
class QgsSymbol;
27+
class QPainter;
28+
class QPixmap;
3029

3130
/**Renderer class which interpolates rgb values linear between the minimum and maximum value of the classification field*/
3231
class QgsContinuousColorRenderer: public QgsRenderer

src/gui/qgscoordinatetransform.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
#include "qgscoordinatetransform.h"
2020

2121
//qt includes
22-
#include <qdom.h>
22+
#include <QDomNode>
23+
#include <QDomElement>
2324

2425
// Qt4-only includes to go here
2526
#include <QTextOStream>

src/gui/qgscoordinatetransform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define QGSCOORDINATETRANSFORM_H
2020

2121
//qt includes
22-
#include <qobject.h>
22+
#include <QObject>
2323

2424
//qgis includes
2525
#include "qgspoint.h"

src/gui/qgsdelattrdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "qgsdelattrdialog.h"
1919
#include "qgsfield.h"
20-
#include <q3header.h>
20+
#include <Q3Header>
2121

2222
QgsDelAttrDialog::QgsDelAttrDialog(Q3Header* header): QgsDelAttrDialogBase()
2323
{

src/gui/qgsgraduatedsymbolrenderer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "qgslegendsymbologyitem.h"
2323
#include "qgssymbologyutils.h"
2424
#include "qgssvgcache.h"
25-
#include <qdom.h>
26-
#include <qpixmap.h>
27-
#include <q3picture.h>
25+
#include <QDomNode>
26+
#include <QDomElement>
27+
#include <QPixmap>
2828

2929

3030
QgsGraduatedSymbolRenderer::QgsGraduatedSymbolRenderer(QGis::VectorType type)

src/gui/qgslabel.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
#include <fstream>
1818
#include <math.h> //needed for win32 build (ts)
1919

20-
#include <qstring.h>
21-
#include <qfont.h>
22-
#include <qfontmetrics.h>
20+
#include <QString>
21+
#include <QFont>
22+
#include <QFontMetrics>
2323

24-
#include <qpainter.h>
25-
#include <qmatrix.h>
26-
#include <qdom.h>
24+
#include <QPainter>
25+
#include <QDomNode>
26+
#include <QDomElement>
2727

2828
#include "qgis.h"
2929
#include "qgsfeature.h"

src/gui/qgsmaplayerinterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**
1919
* Interface class for map layer plugins
2020
*/
21-
#include <qobject.h>
21+
#include <QObject>
2222
#include "qgisapp.h"
2323
class Q3MainWindow;
2424

src/gui/qgsmarkerdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <QDir>
2424
#include <QFileDialog>
25-
#include <q3iconview.h>
25+
#include <Q3IconView>
2626
#include <QPixmap>
2727

2828
#include "qgsconfig.h"

src/gui/qgsnewconnection.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
***************************************************************************/
1717
/* $Id$ */
1818
#include <iostream>
19-
#include <qsettings.h>
20-
#include <qlineedit.h>
21-
#include <qcheckbox.h>
22-
#include <qmessagebox.h>
19+
20+
#include <QSettings>
21+
#include <QMessageBox>
22+
2323
#include "qgsnewconnection.h"
2424
#include "qgscontexthelp.h"
2525
extern "C"

src/gui/qgsoptions.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "qgisapp.h"
2323
#include "qgslayerprojectionselector.h"
2424
#include "qgssvgcache.h"
25+
#include "qgsspatialrefsys.h"
2526
#include <QFileDialog>
2627
#include <QSettings>
2728
#include <QColorDialog>

0 commit comments

Comments
 (0)