header cleanups

2025-04-13 00:03:09 -04:00 · 2017-03-03 20:51:39 +01:00 · 2017-03-03 20:51:39 +01:00 · 0a1517bfaa
commit 0a1517bfaa
parent ecc5bb508e
34 changed files with 35 additions and 38 deletions
--- a/src/app/qgslabelpropertydialog.cpp
+++ b/src/app/qgslabelpropertydialog.cpp
@ -16,8 +16,8 @@
 ***************************************************************************/

 #include "qgslabelpropertydialog.h"
-#include <qgsfontutils.h>
-#include <qgslogger.h>
+#include "qgsfontutils.h"
+#include "qgslogger.h"
 #include "qgsfeatureiterator.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
--- a/src/app/qgsmeasuretool.cpp
+++ b/src/app/qgsmeasuretool.cpp
@ -22,7 +22,6 @@
 #include "qgssnappingutils.h"
 #include "qgstolerance.h"
 #include "qgscsexception.h"
-
 #include "qgsmeasuredialog.h"
 #include "qgsmeasuretool.h"
 #include "qgscursors.h"
--- a/src/app/qgsmergeattributesdialog.cpp
+++ b/src/app/qgsmergeattributesdialog.cpp
@ -15,7 +15,6 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "qgsmergeattributesdialog.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
--- a/src/app/qgspluginregistry.cpp
+++ b/src/app/qgspluginregistry.cpp
@ -28,13 +28,14 @@
 #include "qgspluginregistry.h"
 #include "qgspluginmetadata.h"
 #include "qgisplugin.h"
-#ifdef WITH_BINDINGS
-#include "qgspythonutils.h"
-#endif
 #include "qgisapp.h"
 #include "qgslogger.h"
 #include "qgsmessagelog.h"

+#ifdef WITH_BINDINGS
+#include "qgspythonutils.h"
+#endif
+
 /* typedefs for plugins */
 typedef QgisPlugin *create_ui( QgisInterface *qI );
 typedef QString name_t();
--- a/src/app/qgsprojectlayergroupdialog.cpp
+++ b/src/app/qgsprojectlayergroupdialog.cpp
@ -16,7 +16,6 @@
 #include "qgsproject.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
-
 #include "qgslayertree.h"
 #include "qgslayertreemodel.h"
 #include "qgslayertreeutils.h"
--- a/src/app/qgsrasterlayerproperties.cpp
+++ b/src/app/qgsrasterlayerproperties.cpp
@ -56,7 +56,6 @@

 #include <QTableWidgetItem>
 #include <QHeaderView>
-
 #include <QTextStream>
 #include <QFileDialog>
 #include <QMessageBox>
--- a/src/core/composer/qgscomposition.cpp
+++ b/src/core/composer/qgscomposition.cpp
@ -57,6 +57,7 @@
 #include <QDir>

 #include <limits>
+
 #include "gdal.h"
 #include "cpl_conv.h"

--- a/src/core/qgsdataitem.cpp
+++ b/src/core/qgsdataitem.cpp
@ -30,7 +30,6 @@

 #include "qgis.h"
 #include "qgsdataitem.h"
-
 #include "qgsapplication.h"
 #include "qgsdataitemprovider.h"
 #include "qgsdataitemproviderregistry.h"
--- a/src/core/qgsvectorlayerrenderer.cpp
+++ b/src/core/qgsvectorlayerrenderer.cpp
@ -15,8 +15,8 @@

 #include "qgsvectorlayerrenderer.h"

-//#include "qgsfeatureiterator.h"
 #include "diagram/qgsdiagram.h"
+
 #include "qgsdiagramrenderer.h"
 #include "qgsgeometrycache.h"
 #include "qgsmessagelog.h"
--- a/src/gui/qgsconfigureshortcutsdialog.cpp
+++ b/src/gui/qgsconfigureshortcutsdialog.cpp
@ -22,7 +22,6 @@
 #include <QKeyEvent>
 #include <QKeySequence>
 #include <QMessageBox>
-
 #include <QShortcut>
 #include <QDomDocument>
 #include <QFileDialog>
--- a/src/gui/qgsexpressionbuilderwidget.cpp
+++ b/src/gui/qgsexpressionbuilderwidget.cpp
@ -35,7 +35,6 @@
 #include <QPropertyAnimation>


-
 QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
  : QWidget( parent )
  , mAutoSave( true )
--- a/src/gui/qgshelp.cpp
+++ b/src/gui/qgshelp.cpp
@ -27,11 +27,9 @@
 #include <QRegularExpression>
 #include <QNetworkProxy>
 #include <QNetworkProxyFactory>
+
 #include <memory>

-#include "qgis.h"
-#include "qgsapplication.h"
-#include "qgsexpressioncontext.h"

 void QgsHelp::openHelp( const QString &key )
 {
--- a/src/gui/qgsidentifymenu.cpp
+++ b/src/gui/qgsidentifymenu.cpp
@ -16,7 +16,6 @@
 #include <QMouseEvent>

 #include "qgsidentifymenu.h"
-
 #include "qgsapplication.h"
 #include "qgsactionmanager.h"
 #include "qgshighlight.h"
--- a/src/gui/qgsmanageconnectionsdialog.cpp
+++ b/src/gui/qgsmanageconnectionsdialog.cpp
@ -14,7 +14,6 @@
 *                                                                         *
 ***************************************************************************/

-
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMessageBox>
--- a/src/gui/qgsmapcanvassnapper.cpp
+++ b/src/gui/qgsmapcanvassnapper.cpp
@ -25,6 +25,7 @@
 #include "qgslogger.h"
 #include "qgsgeometry.h"

+
 QgsMapCanvasSnapper::QgsMapCanvasSnapper( QgsMapCanvas *canvas )
  : mMapCanvas( canvas )
  , mSnapper( nullptr )
--- a/src/gui/qgsmapcanvastracer.cpp
+++ b/src/gui/qgsmapcanvastracer.cpp
@ -26,6 +26,7 @@

 #include <QAction>

+
 QHash<QgsMapCanvas *, QgsMapCanvasTracer *> QgsMapCanvasTracer::sTracers;


--- a/src/gui/qgsmessageviewer.h
+++ b/src/gui/qgsmessageviewer.h
@ -17,12 +17,12 @@
 #ifndef QGSMESSAGEVIEWER_H
 #define QGSMESSAGEVIEWER_H

-#include <ui_qgsmessageviewer.h>
-#include <qgisgui.h>
+#include "ui_qgsmessageviewer.h"
+#include "qgisgui.h"
 #include "qgsmessageoutput.h"
+#include "qgis_gui.h"

 #include <QString>
-#include "qgis_gui.h"


 /** \ingroup gui
--- a/src/gui/qgsprojectionselectionwidget.cpp
+++ b/src/gui/qgsprojectionselectionwidget.cpp
@ -15,7 +15,6 @@

 #include <QHBoxLayout>

-
 #include "qgsprojectionselectionwidget.h"
 #include "qgsapplication.h"
 #include "qgsprojectionselectiondialog.h"
--- a/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
+++ b/src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
@ -30,6 +30,7 @@
 #include "checks/qgsgeometryselfintersectioncheck.h"
 #include "checks/qgsgeometrysliverpolygoncheck.h"
 #include "checks/qgsgeometrytypecheck.h"
+
 #include "utils/qgsfeaturepool.h"


--- a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
+++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
@ -22,9 +22,11 @@

 #include "qgsgeometrycheckerresulttab.h"
 #include "qgsgeometrycheckfixdialog.h"
+
 #include "../qgsgeometrychecker.h"
 #include "../checks/qgsgeometrycheck.h"
 #include "../utils/qgsfeaturepool.h"
+
 #include "qgsgeometry.h"
 #include "qgisinterface.h"
 #include "qgsmapcanvas.h"
--- a/src/plugins/grass/qgsgrasstools.cpp
+++ b/src/plugins/grass/qgsgrasstools.cpp
@ -40,6 +40,7 @@
 //
 #include "qgsdetaileditemdata.h"
 #include "qgsdetaileditemdelegate.h"
+
 #include <QSortFilterProxyModel>
 #include <QStandardItem>

--- a/src/plugins/spatialquery/qgsspatialquerydialog.cpp
+++ b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@ -25,7 +25,6 @@
 #include "qgsmaplayer.h"
 #include "qgsproject.h"
 #include "qgsvectordataprovider.h"
-
 #include "qgsspatialquerydialog.h"
 #include "qgsspatialquery.h"
 #include "qgsrubberselectid.h"
--- a/src/providers/db2/qgsdb2dataitems.cpp
+++ b/src/providers/db2/qgsdb2dataitems.cpp
@ -19,8 +19,7 @@
 #include "qgsdb2dataitems.h"
 #include "qgsdb2newconnection.h"
 #include "qgsdb2geometrycolumns.h"
-#include <qgslogger.h>
-//#include <qaction.h>
+#include "qgslogger.h"
 #include "qgsmimedatautils.h"
 #include "qgsvectorlayerimport.h"
 #include "qgsvectorlayer.h"
--- a/src/providers/db2/qgsdb2sourceselect.cpp
+++ b/src/providers/db2/qgsdb2sourceselect.cpp
@ -19,13 +19,13 @@

 #include "qgsdb2sourceselect.h"
 #include "qgsdb2dataitems.h"
-#include "qgslogger.h"
-#include "qgsapplication.h"
-#include "qgscontexthelp.h"
 #include "qgsdb2provider.h"
 #include "qgsdb2newconnection.h"
 #include "qgsdb2geometrycolumns.h"

+#include "qgslogger.h"
+#include "qgsapplication.h"
+#include "qgscontexthelp.h"
 #include "qgsmanageconnectionsdialog.h"
 #include "qgsquerybuilder.h"
 #include "qgsdatasourceuri.h"
--- a/src/providers/gdal/qgsgdalprovider.cpp
+++ b/src/providers/gdal/qgsgdalprovider.cpp
@ -47,10 +47,10 @@
 #include <QTextDocument>
 #include <QDebug>

-#include "gdalwarper.h"
-#include "ogr_spatialref.h"
-#include "cpl_conv.h"
-#include "cpl_string.h"
+#include <gdalwarper.h>
+#include <ogr_spatialref.h>
+#include <cpl_conv.h>
+#include <cpl_string.h>

 #define ERRMSG(message) QGS_ERROR_MESSAGE(message,"GDAL provider")
 #define ERR(message) QgsError(message,"GDAL provider")
--- a/src/providers/gdal/qgsgdalproviderbase.cpp
+++ b/src/providers/gdal/qgsgdalproviderbase.cpp
@ -16,7 +16,7 @@
 ***************************************************************************/

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

 #include "qgsapplication.h"
 #include "qgslogger.h"
--- a/src/providers/grass/qgsgrass.cpp
+++ b/src/providers/grass/qgsgrass.cpp
@ -48,7 +48,6 @@
 #include <QTextStream>
 #include <QTemporaryFile>
 #include <QHash>
-
 #include <QTextCodec>

 extern "C"
--- a/src/providers/mssql/qgsmssqldataitems.cpp
+++ b/src/providers/mssql/qgsmssqldataitems.cpp
@ -15,8 +15,6 @@
 *                                                                         *
 ***************************************************************************/

-
-
 #include "qgsmssqldataitems.h"

 #include "qgsmssqlsourceselect.h"
--- a/src/providers/mssql/qgsmssqlsourceselect.cpp
+++ b/src/providers/mssql/qgsmssqlsourceselect.cpp
@ -35,8 +35,8 @@
 #include <QTextStream>
 #include <QHeaderView>
 #include <QStringList>
-#include <QtSql/QSqlDatabase>
-#include <QtSql/QSqlError>
+#include <QSqlDatabase>
+#include <QSqlError>

 //! Used to create an editor for when the user tries to change the contents of a cell
 QWidget *QgsMssqlSourceSelectDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const
--- a/tests/src/app/testqgisappclipboard.cpp
+++ b/tests/src/app/testqgisappclipboard.cpp
@ -12,6 +12,8 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
+#include "qgstest.h"
+
 #include <QApplication>
 #include <QObject>
 #include <QSplashScreen>
--- a/tests/src/app/testqgsmaptoolidentifyaction.cpp
+++ b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@ -14,6 +14,7 @@
 ***************************************************************************/

 #include "qgstest.h"
+
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
 #include "qgsrasterlayer.h"
--- a/tests/src/core/testqgsdataitem.cpp
+++ b/tests/src/core/testqgsdataitem.cpp
@ -13,6 +13,7 @@
 *                                                                         *
 ***************************************************************************/
 #include "qgstest.h"
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
--- a/tests/src/core/testqgsfield.cpp
+++ b/tests/src/core/testqgsfield.cpp
@ -13,6 +13,7 @@
 *                                                                         *
 ***************************************************************************/
 #include "qgstest.h"
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
--- a/tests/src/core/testziplayer.cpp
+++ b/tests/src/core/testziplayer.cpp
@ -13,6 +13,7 @@
 *                                                                         *
 ***************************************************************************/
 #include "qgstest.h"
+
 #include <QObject>
 #include <QString>
 #include <QApplication>