Skip to content
Permalink
Browse files

header cleanups

  • Loading branch information
jef-n committed Mar 4, 2017
1 parent ecc5bb5 commit 0a1517bfaa74a13d9cfeeae951a33a22332230ef
Showing with 35 additions and 38 deletions.
  1. +2 −2 src/app/qgslabelpropertydialog.cpp
  2. +0 −1 src/app/qgsmeasuretool.cpp
  3. +0 −1 src/app/qgsmergeattributesdialog.cpp
  4. +4 −3 src/app/qgspluginregistry.cpp
  5. +0 −1 src/app/qgsprojectlayergroupdialog.cpp
  6. +0 −1 src/app/qgsrasterlayerproperties.cpp
  7. +1 −0 src/core/composer/qgscomposition.cpp
  8. +0 −1 src/core/qgsdataitem.cpp
  9. +1 −1 src/core/qgsvectorlayerrenderer.cpp
  10. +0 −1 src/gui/qgsconfigureshortcutsdialog.cpp
  11. +0 −1 src/gui/qgsexpressionbuilderwidget.cpp
  12. +1 −3 src/gui/qgshelp.cpp
  13. +0 −1 src/gui/qgsidentifymenu.cpp
  14. +0 −1 src/gui/qgsmanageconnectionsdialog.cpp
  15. +1 −0 src/gui/qgsmapcanvassnapper.cpp
  16. +1 −0 src/gui/qgsmapcanvastracer.cpp
  17. +3 −3 src/gui/qgsmessageviewer.h
  18. +0 −1 src/gui/qgsprojectionselectionwidget.cpp
  19. +1 −0 src/plugins/geometry_checker/qgsgeometrycheckfactory.cpp
  20. +2 −0 src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
  21. +1 −0 src/plugins/grass/qgsgrasstools.cpp
  22. +0 −1 src/plugins/spatialquery/qgsspatialquerydialog.cpp
  23. +1 −2 src/providers/db2/qgsdb2dataitems.cpp
  24. +3 −3 src/providers/db2/qgsdb2sourceselect.cpp
  25. +4 −4 src/providers/gdal/qgsgdalprovider.cpp
  26. +1 −1 src/providers/gdal/qgsgdalproviderbase.cpp
  27. +0 −1 src/providers/grass/qgsgrass.cpp
  28. +0 −2 src/providers/mssql/qgsmssqldataitems.cpp
  29. +2 −2 src/providers/mssql/qgsmssqlsourceselect.cpp
  30. +2 −0 tests/src/app/testqgisappclipboard.cpp
  31. +1 −0 tests/src/app/testqgsmaptoolidentifyaction.cpp
  32. +1 −0 tests/src/core/testqgsdataitem.cpp
  33. +1 −0 tests/src/core/testqgsfield.cpp
  34. +1 −0 tests/src/core/testziplayer.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"
@@ -22,7 +22,6 @@
#include "qgssnappingutils.h"
#include "qgstolerance.h"
#include "qgscsexception.h"

#include "qgsmeasuredialog.h"
#include "qgsmeasuretool.h"
#include "qgscursors.h"
@@ -15,7 +15,6 @@
* *
***************************************************************************/


#include "qgsmergeattributesdialog.h"
#include "qgisapp.h"
#include "qgsapplication.h"
@@ -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();
@@ -16,7 +16,6 @@
#include "qgsproject.h"
#include "qgisapp.h"
#include "qgsapplication.h"

#include "qgslayertree.h"
#include "qgslayertreemodel.h"
#include "qgslayertreeutils.h"
@@ -56,7 +56,6 @@

#include <QTableWidgetItem>
#include <QHeaderView>

#include <QTextStream>
#include <QFileDialog>
#include <QMessageBox>
@@ -57,6 +57,7 @@
#include <QDir>

#include <limits>

#include "gdal.h"
#include "cpl_conv.h"

@@ -30,7 +30,6 @@

#include "qgis.h"
#include "qgsdataitem.h"

#include "qgsapplication.h"
#include "qgsdataitemprovider.h"
#include "qgsdataitemproviderregistry.h"
@@ -15,8 +15,8 @@

#include "qgsvectorlayerrenderer.h"

//#include "qgsfeatureiterator.h"
#include "diagram/qgsdiagram.h"

#include "qgsdiagramrenderer.h"
#include "qgsgeometrycache.h"
#include "qgsmessagelog.h"
@@ -22,7 +22,6 @@
#include <QKeyEvent>
#include <QKeySequence>
#include <QMessageBox>

#include <QShortcut>
#include <QDomDocument>
#include <QFileDialog>
@@ -35,7 +35,6 @@
#include <QPropertyAnimation>



QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
: QWidget( parent )
, mAutoSave( true )
@@ -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 )
{
@@ -16,7 +16,6 @@
#include <QMouseEvent>

#include "qgsidentifymenu.h"

#include "qgsapplication.h"
#include "qgsactionmanager.h"
#include "qgshighlight.h"
@@ -14,7 +14,6 @@
* *
***************************************************************************/


#include <QCloseEvent>
#include <QFileDialog>
#include <QMessageBox>
@@ -25,6 +25,7 @@
#include "qgslogger.h"
#include "qgsgeometry.h"


QgsMapCanvasSnapper::QgsMapCanvasSnapper( QgsMapCanvas *canvas )
: mMapCanvas( canvas )
, mSnapper( nullptr )
@@ -26,6 +26,7 @@

#include <QAction>


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


@@ -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
@@ -15,7 +15,6 @@

#include <QHBoxLayout>


#include "qgsprojectionselectionwidget.h"
#include "qgsapplication.h"
#include "qgsprojectionselectiondialog.h"
@@ -30,6 +30,7 @@
#include "checks/qgsgeometryselfintersectioncheck.h"
#include "checks/qgsgeometrysliverpolygoncheck.h"
#include "checks/qgsgeometrytypecheck.h"

#include "utils/qgsfeaturepool.h"


@@ -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"
@@ -40,6 +40,7 @@
//
#include "qgsdetaileditemdata.h"
#include "qgsdetaileditemdelegate.h"

#include <QSortFilterProxyModel>
#include <QStandardItem>

@@ -25,7 +25,6 @@
#include "qgsmaplayer.h"
#include "qgsproject.h"
#include "qgsvectordataprovider.h"

#include "qgsspatialquerydialog.h"
#include "qgsspatialquery.h"
#include "qgsrubberselectid.h"
@@ -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"
@@ -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"
@@ -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")
@@ -16,7 +16,7 @@
***************************************************************************/

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

#include "qgsapplication.h"
#include "qgslogger.h"
@@ -48,7 +48,6 @@
#include <QTextStream>
#include <QTemporaryFile>
#include <QHash>

#include <QTextCodec>

extern "C"
@@ -15,8 +15,6 @@
* *
***************************************************************************/



#include "qgsmssqldataitems.h"

#include "qgsmssqlsourceselect.h"
@@ -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
@@ -12,6 +12,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#include "qgstest.h"

#include <QApplication>
#include <QObject>
#include <QSplashScreen>
@@ -14,6 +14,7 @@
***************************************************************************/

#include "qgstest.h"

#include "qgsapplication.h"
#include "qgsvectorlayer.h"
#include "qgsrasterlayer.h"
@@ -13,6 +13,7 @@
* *
***************************************************************************/
#include "qgstest.h"

#include <QObject>
#include <QString>
#include <QStringList>
@@ -13,6 +13,7 @@
* *
***************************************************************************/
#include "qgstest.h"

#include <QObject>
#include <QString>
#include <QStringList>
@@ -13,6 +13,7 @@
* *
***************************************************************************/
#include "qgstest.h"

#include <QObject>
#include <QString>
#include <QApplication>

0 comments on commit 0a1517b

Please sign in to comment.
You can’t perform that action at this time.