Skip to content

Commit 0a1517b

Browse files
jef-njef-n
committedMar 4, 2017
header cleanups
·
ltr-3_40final-3_0_0
1 parent ecc5bb5 commit 0a1517b

34 files changed

+35
-38
lines changed
 

‎src/app/qgslabelpropertydialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
***************************************************************************/
1717

1818
#include "qgslabelpropertydialog.h"
19-
#include <qgsfontutils.h>
20-
#include <qgslogger.h>
19+
#include "qgsfontutils.h"
20+
#include "qgslogger.h"
2121
#include "qgsfeatureiterator.h"
2222
#include "qgsproject.h"
2323
#include "qgsvectorlayer.h"

‎src/app/qgsmeasuretool.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "qgssnappingutils.h"
2323
#include "qgstolerance.h"
2424
#include "qgscsexception.h"
25-
2625
#include "qgsmeasuredialog.h"
2726
#include "qgsmeasuretool.h"
2827
#include "qgscursors.h"

‎src/app/qgsmergeattributesdialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* *
1616
***************************************************************************/
1717

18-
1918
#include "qgsmergeattributesdialog.h"
2019
#include "qgisapp.h"
2120
#include "qgsapplication.h"

‎src/app/qgspluginregistry.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@
2828
#include "qgspluginregistry.h"
2929
#include "qgspluginmetadata.h"
3030
#include "qgisplugin.h"
31-
#ifdef WITH_BINDINGS
32-
#include "qgspythonutils.h"
33-
#endif
3431
#include "qgisapp.h"
3532
#include "qgslogger.h"
3633
#include "qgsmessagelog.h"
3734

35+
#ifdef WITH_BINDINGS
36+
#include "qgspythonutils.h"
37+
#endif
38+
3839
/* typedefs for plugins */
3940
typedef QgisPlugin *create_ui( QgisInterface *qI );
4041
typedef QString name_t();

‎src/app/qgsprojectlayergroupdialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "qgsproject.h"
1717
#include "qgisapp.h"
1818
#include "qgsapplication.h"
19-
2019
#include "qgslayertree.h"
2120
#include "qgslayertreemodel.h"
2221
#include "qgslayertreeutils.h"

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656

5757
#include <QTableWidgetItem>
5858
#include <QHeaderView>
59-
6059
#include <QTextStream>
6160
#include <QFileDialog>
6261
#include <QMessageBox>

‎src/core/composer/qgscomposition.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
#include <QDir>
5858

5959
#include <limits>
60+
6061
#include "gdal.h"
6162
#include "cpl_conv.h"
6263

‎src/core/qgsdataitem.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
#include "qgis.h"
3232
#include "qgsdataitem.h"
33-
3433
#include "qgsapplication.h"
3534
#include "qgsdataitemprovider.h"
3635
#include "qgsdataitemproviderregistry.h"

‎src/core/qgsvectorlayerrenderer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
#include "qgsvectorlayerrenderer.h"
1717

18-
//#include "qgsfeatureiterator.h"
1918
#include "diagram/qgsdiagram.h"
19+
2020
#include "qgsdiagramrenderer.h"
2121
#include "qgsgeometrycache.h"
2222
#include "qgsmessagelog.h"

‎src/gui/qgsconfigureshortcutsdialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <QKeyEvent>
2323
#include <QKeySequence>
2424
#include <QMessageBox>
25-
2625
#include <QShortcut>
2726
#include <QDomDocument>
2827
#include <QFileDialog>

‎src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include <QPropertyAnimation>
3636

3737

38-
3938
QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
4039
: QWidget( parent )
4140
, mAutoSave( true )

‎src/gui/qgshelp.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
#include <QRegularExpression>
2828
#include <QNetworkProxy>
2929
#include <QNetworkProxyFactory>
30+
3031
#include <memory>
3132

32-
#include "qgis.h"
33-
#include "qgsapplication.h"
34-
#include "qgsexpressioncontext.h"
3533

3634
void QgsHelp::openHelp( const QString &key )
3735
{

‎src/gui/qgsidentifymenu.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <QMouseEvent>
1717

1818
#include "qgsidentifymenu.h"
19-
2019
#include "qgsapplication.h"
2120
#include "qgsactionmanager.h"
2221
#include "qgshighlight.h"

‎src/gui/qgsmanageconnectionsdialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* *
1515
***************************************************************************/
1616

17-
1817
#include <QCloseEvent>
1918
#include <QFileDialog>
2019
#include <QMessageBox>

‎src/gui/qgsmapcanvassnapper.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "qgslogger.h"
2626
#include "qgsgeometry.h"
2727

28+
2829
QgsMapCanvasSnapper::QgsMapCanvasSnapper( QgsMapCanvas *canvas )
2930
: mMapCanvas( canvas )
3031
, mSnapper( nullptr )

‎src/gui/qgsmapcanvastracer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include <QAction>
2828

29+
2930
QHash<QgsMapCanvas *, QgsMapCanvasTracer *> QgsMapCanvasTracer::sTracers;
3031

3132

‎src/gui/qgsmessageviewer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#ifndef QGSMESSAGEVIEWER_H
1818
#define QGSMESSAGEVIEWER_H
1919

20-
#include <ui_qgsmessageviewer.h>
21-
#include <qgisgui.h>
20+
#include "ui_qgsmessageviewer.h"
21+
#include "qgisgui.h"
2222
#include "qgsmessageoutput.h"
23+
#include "qgis_gui.h"
2324

2425
#include <QString>
25-
#include "qgis_gui.h"
2626

2727

2828
/** \ingroup gui

‎src/gui/qgsprojectionselectionwidget.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
#include <QHBoxLayout>
1717

18-
1918
#include "qgsprojectionselectionwidget.h"
2019
#include "qgsapplication.h"
2120
#include "qgsprojectionselectiondialog.h"

‎src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "checks/qgsgeometryselfintersectioncheck.h"
3131
#include "checks/qgsgeometrysliverpolygoncheck.h"
3232
#include "checks/qgsgeometrytypecheck.h"
33+
3334
#include "utils/qgsfeaturepool.h"
3435

3536

‎src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222

2323
#include "qgsgeometrycheckerresulttab.h"
2424
#include "qgsgeometrycheckfixdialog.h"
25+
2526
#include "../qgsgeometrychecker.h"
2627
#include "../checks/qgsgeometrycheck.h"
2728
#include "../utils/qgsfeaturepool.h"
29+
2830
#include "qgsgeometry.h"
2931
#include "qgisinterface.h"
3032
#include "qgsmapcanvas.h"

‎src/plugins/grass/qgsgrasstools.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
//
4141
#include "qgsdetaileditemdata.h"
4242
#include "qgsdetaileditemdelegate.h"
43+
4344
#include <QSortFilterProxyModel>
4445
#include <QStandardItem>
4546

‎src/plugins/spatialquery/qgsspatialquerydialog.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "qgsmaplayer.h"
2626
#include "qgsproject.h"
2727
#include "qgsvectordataprovider.h"
28-
2928
#include "qgsspatialquerydialog.h"
3029
#include "qgsspatialquery.h"
3130
#include "qgsrubberselectid.h"

‎src/providers/db2/qgsdb2dataitems.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
#include "qgsdb2dataitems.h"
2020
#include "qgsdb2newconnection.h"
2121
#include "qgsdb2geometrycolumns.h"
22-
#include <qgslogger.h>
23-
//#include <qaction.h>
22+
#include "qgslogger.h"
2423
#include "qgsmimedatautils.h"
2524
#include "qgsvectorlayerimport.h"
2625
#include "qgsvectorlayer.h"

‎src/providers/db2/qgsdb2sourceselect.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
#include "qgsdb2sourceselect.h"
2121
#include "qgsdb2dataitems.h"
22-
#include "qgslogger.h"
23-
#include "qgsapplication.h"
24-
#include "qgscontexthelp.h"
2522
#include "qgsdb2provider.h"
2623
#include "qgsdb2newconnection.h"
2724
#include "qgsdb2geometrycolumns.h"
2825

26+
#include "qgslogger.h"
27+
#include "qgsapplication.h"
28+
#include "qgscontexthelp.h"
2929
#include "qgsmanageconnectionsdialog.h"
3030
#include "qgsquerybuilder.h"
3131
#include "qgsdatasourceuri.h"

‎src/providers/gdal/qgsgdalprovider.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
#include <QTextDocument>
4848
#include <QDebug>
4949

50-
#include "gdalwarper.h"
51-
#include "ogr_spatialref.h"
52-
#include "cpl_conv.h"
53-
#include "cpl_string.h"
50+
#include <gdalwarper.h>
51+
#include <ogr_spatialref.h>
52+
#include <cpl_conv.h>
53+
#include <cpl_string.h>
5454

5555
#define ERRMSG(message) QGS_ERROR_MESSAGE(message,"GDAL provider")
5656
#define ERR(message) QgsError(message,"GDAL provider")

‎src/providers/gdal/qgsgdalproviderbase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
***************************************************************************/
1717

1818
#define CPL_SUPRESS_CPLUSPLUS //#spellok
19-
#include "cpl_conv.h"
19+
#include <cpl_conv.h>
2020

2121
#include "qgsapplication.h"
2222
#include "qgslogger.h"

‎src/providers/grass/qgsgrass.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
#include <QTextStream>
4949
#include <QTemporaryFile>
5050
#include <QHash>
51-
5251
#include <QTextCodec>
5352

5453
extern "C"

‎src/providers/mssql/qgsmssqldataitems.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
* *
1616
***************************************************************************/
1717

18-
19-
2018
#include "qgsmssqldataitems.h"
2119

2220
#include "qgsmssqlsourceselect.h"

‎src/providers/mssql/qgsmssqlsourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include <QTextStream>
3636
#include <QHeaderView>
3737
#include <QStringList>
38-
#include <QtSql/QSqlDatabase>
39-
#include <QtSql/QSqlError>
38+
#include <QSqlDatabase>
39+
#include <QSqlError>
4040

4141
//! Used to create an editor for when the user tries to change the contents of a cell
4242
QWidget *QgsMssqlSourceSelectDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const

‎tests/src/app/testqgisappclipboard.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
* (at your option) any later version. *
1313
* *
1414
***************************************************************************/
15+
#include "qgstest.h"
16+
1517
#include <QApplication>
1618
#include <QObject>
1719
#include <QSplashScreen>

‎tests/src/app/testqgsmaptoolidentifyaction.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
***************************************************************************/
1515

1616
#include "qgstest.h"
17+
1718
#include "qgsapplication.h"
1819
#include "qgsvectorlayer.h"
1920
#include "qgsrasterlayer.h"

‎tests/src/core/testqgsdataitem.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* *
1414
***************************************************************************/
1515
#include "qgstest.h"
16+
1617
#include <QObject>
1718
#include <QString>
1819
#include <QStringList>

‎tests/src/core/testqgsfield.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* *
1414
***************************************************************************/
1515
#include "qgstest.h"
16+
1617
#include <QObject>
1718
#include <QString>
1819
#include <QStringList>

‎tests/src/core/testziplayer.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* *
1414
***************************************************************************/
1515
#include "qgstest.h"
16+
1617
#include <QObject>
1718
#include <QString>
1819
#include <QApplication>

0 commit comments

Comments
 (0)
Please sign in to comment.