Skip to content

Commit

Permalink
Always use " for qgs header imports
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Aug 24, 2017
1 parent 3400325 commit 76a2272
Show file tree
Hide file tree
Showing 108 changed files with 252 additions and 254 deletions.
4 changes: 2 additions & 2 deletions src/analysis/interpolation/NormVecDecorator.h
Expand Up @@ -20,8 +20,8 @@
#include "TriDecorator.h"
#include "qgis_sip.h"
#include "qgis.h"
#include <TriangleInterpolator.h>
#include <MathUtils.h>
#include "TriangleInterpolator.h"
#include "MathUtils.h"
#include "qgslogger.h"
#include "qgis_analysis.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/interpolation/ParametricLine.cc
Expand Up @@ -15,7 +15,7 @@
***************************************************************************/

#include "ParametricLine.h"
#include <qgslogger.h>
#include "qgslogger.h"

void ParametricLine::add( ParametricLine *pl )
{
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/interpolation/TriangleInterpolator.h
Expand Up @@ -17,8 +17,8 @@
#ifndef TINTERPOLATOR_H
#define TINTERPOLATOR_H

#include <qgspoint.h>
#include <Vector3D.h>
#include "qgspoint.h"
#include "Vector3D.h"
#include "qgis_analysis.h"

/** \ingroup analysis
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/interpolation/Triangulation.h
Expand Up @@ -19,8 +19,8 @@

#include <QList>
#include "qgis.h"
#include <qpainter.h>
#include <TriangleInterpolator.h>
#include <QPainter>
#include "TriangleInterpolator.h"
#include "qgis_analysis.h"

class Line3D;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/network/qgsgraphanalyzer.h
Expand Up @@ -18,7 +18,7 @@

#include <QVector>

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

class QgsGraph;
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/network/qgsgraphbuilder.cpp
Expand Up @@ -21,8 +21,8 @@
#include "qgsgraphbuilder.h"
#include "qgsgraph.h"

#include <qgsfeature.h>
#include <qgsgeometry.h>
#include "qgsfeature.h"
#include "qgsgeometry.h"

QgsGraphBuilder::QgsGraphBuilder( const QgsCoordinateReferenceSystem &crs, bool otfEnabled, double topologyTolerance, const QString &ellipsoidID )
: QgsGraphBuilderInterface( crs, otfEnabled, topologyTolerance, ellipsoidID )
Expand Down
3 changes: 1 addition & 2 deletions src/analysis/network/qgsgraphbuilder.h
Expand Up @@ -19,8 +19,7 @@
#include "qgsgraphbuilderinterface.h"
#include "qgis.h"

#include <qgis.h>
#include <qgsspatialindex.h>
#include "qgsspatialindex.h"
#include "qgis_analysis.h"

class QgsDistanceArea;
Expand Down
6 changes: 3 additions & 3 deletions src/analysis/network/qgsgraphbuilderinterface.h
Expand Up @@ -19,9 +19,9 @@
#include <QVector>
#include <QVariant>

#include <qgspoint.h>
#include <qgscoordinatereferencesystem.h>
#include <qgsdistancearea.h>
#include "qgspoint.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsdistancearea.h"
#include "qgis_analysis.h"

#ifdef SIP_RUN
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/network/qgsnetworkdistancestrategy.h
Expand Up @@ -16,7 +16,7 @@
#ifndef QGSNETWORKDISTANCESTRATEGY_H
#define QGSNETWORKDISTANCESTRATEGY_H

#include <qgsnetworkstrategy.h>
#include "qgsnetworkstrategy.h"
#include "qgis_analysis.h"

/** \ingroup analysis
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/network/qgsnetworkspeedstrategy.h
Expand Up @@ -16,7 +16,7 @@
#ifndef QGSNETWORKSPEEDSTRATEGY_H
#define QGSNETWORKSPEEDSTRATEGY_H

#include <qgsnetworkstrategy.h>
#include "qgsnetworkstrategy.h"
#include "qgis_analysis.h"

/** \ingroup analysis
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/network/qgsnetworkstrategy.h
Expand Up @@ -18,8 +18,8 @@

#include <QVariant>

#include <qgsfeature.h>
#include <qgsfeaturerequest.h>
#include "qgsfeature.h"
#include "qgsfeaturerequest.h"
#include "qgis_analysis.h"

#ifdef SIP_RUN
Expand Down
2 changes: 1 addition & 1 deletion src/app/composer/qgscompositionwidget.cpp
Expand Up @@ -14,7 +14,7 @@
* *
***************************************************************************/

#include <qgis.h>
#include "qgis.h"
#include "qgscompositionwidget.h"
#include "qgscomposition.h"
#include "qgscomposermap.h"
Expand Down
2 changes: 1 addition & 1 deletion src/app/dwg/qgsdwgimporter.h
Expand Up @@ -20,7 +20,7 @@
#include <QString>
#include <ogr_api.h>

#include <qgsabstractgeometry.h>
#include "qgsabstractgeometry.h"

class QgsCompoundCurve;
class QgsQgsCoordinateReferenceSystem;
Expand Down
6 changes: 3 additions & 3 deletions src/app/gps/qgsgpsinformationwidget.h
Expand Up @@ -19,9 +19,9 @@

#include "ui_qgsgpsinformationwidgetbase.h"

#include <qgsmapcanvas.h>
#include <qgsgpsmarker.h>
#include <qgsmaptoolcapture.h>
#include "qgsmapcanvas.h"
#include "qgsgpsmarker.h"
#include "qgsmaptoolcapture.h"
#include <qwt_plot_curve.h>
#ifdef WITH_QWTPOLAR
#include <qwt_polar_plot.h>
Expand Down
2 changes: 1 addition & 1 deletion src/app/pluginmanager/qgsapppluginmanagerinterface.cpp
Expand Up @@ -16,7 +16,7 @@

#include "qgsapppluginmanagerinterface.h"
#include "qgspluginmanager.h"
#include <qgslogger.h>
#include "qgslogger.h"


QgsAppPluginManagerInterface::QgsAppPluginManagerInterface( QgsPluginManager *pluginManager )
Expand Down
10 changes: 5 additions & 5 deletions src/app/qgisapp.cpp
Expand Up @@ -71,11 +71,11 @@
#include <QWhatsThis>
#include <QWidgetAction>

#include <qgssettings.h>
#include <qgsnetworkaccessmanager.h>
#include <qgsapplication.h>
#include <qgscomposition.h>
#include <qgslayerstylingwidget.h>
#include "qgssettings.h"
#include "qgsnetworkaccessmanager.h"
#include "qgsapplication.h"
#include "qgscomposition.h"
#include "qgslayerstylingwidget.h"
#include "qgstaskmanager.h"
#include "qgsziputils.h"

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdecorationgrid.h
Expand Up @@ -19,7 +19,7 @@
#define QGSDECORATIONGRID_H

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

class QPainter;
class QgsLineSymbol;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsdiagramproperties.h
Expand Up @@ -20,7 +20,7 @@

#include <QDialog>
#include "qgsdiagramrenderer.h"
#include <ui_qgsdiagrampropertiesbase.h>
#include "ui_qgsdiagrampropertiesbase.h"
#include <QStyledItemDelegate>
#include "qgis_app.h"

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgslabelengineconfigdialog.cpp
Expand Up @@ -16,7 +16,7 @@

#include "qgslabelingenginesettings.h"
#include "qgsproject.h"
#include <pal/pal.h>
#include "pal/pal.h"

#include <QPushButton>

Expand Down
4 changes: 2 additions & 2 deletions src/app/qgslabelingwidget.h
Expand Up @@ -17,8 +17,8 @@

#include <QWidget>

#include <ui_qgslabelingwidget.h>
#include <qgspallabeling.h>
#include "ui_qgslabelingwidget.h"
#include "qgspallabeling.h"
#include "qgsvectorlayerlabeling.h"

#include "qgsmaplayerconfigwidget.h"
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmapcanvasdockwidget.h
Expand Up @@ -15,7 +15,7 @@
#ifndef QGSMAPCANVASDOCKWIDGET_H
#define QGSMAPCANVASDOCKWIDGET_H

#include <ui_qgsmapcanvasdockwidgetbase.h>
#include "ui_qgsmapcanvasdockwidgetbase.h"

#include "qgsdockwidget.h"
#include "qgspointxy.h"
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolpinlabels.cpp
Expand Up @@ -25,7 +25,7 @@

#include "qgsmaptoolselectutils.h"
#include "qgsrubberband.h"
#include <qgslogger.h>
#include "qgslogger.h"
#include <QMouseEvent>

QgsMapToolPinLabels::QgsMapToolPinLabels( QgsMapCanvas *canvas )
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolshowhidelabels.cpp
Expand Up @@ -25,7 +25,7 @@

#include "qgsmaptoolselectutils.h"
#include "qgsrubberband.h"
#include <qgslogger.h>
#include "qgslogger.h"

#include <QMouseEvent>

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsoptions.h
Expand Up @@ -24,7 +24,7 @@
#include "qgisapp.h"
#include "qgshelp.h"

#include <qgscoordinatereferencesystem.h>
#include "qgscoordinatereferencesystem.h"

#include <QList>
#include "qgis_app.h"
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsrulebasedlabelingwidget.h
Expand Up @@ -19,7 +19,7 @@

#include "qgspanelwidget.h"

#include <ui_qgsrulebasedlabelingwidget.h>
#include "ui_qgsrulebasedlabelingwidget.h"

#include "qgsrulebasedlabeling.h"
#include "qgis_app.h"
Expand Down
1 change: 0 additions & 1 deletion src/core/geometry/qgsrectangle.cpp
Expand Up @@ -23,7 +23,6 @@
#include <QTextStream>
#include <QTransform>
#include <QRegExp>
#include <qnumeric.h>

#include "qgspointxy.h"
#include "qgsrectangle.h"
Expand Down
2 changes: 1 addition & 1 deletion src/core/pal/util.cpp
Expand Up @@ -34,7 +34,7 @@
#include "feature.h"
#include "geomfunction.h"

#include <qgslogger.h>
#include "qgslogger.h"
#include <cfloat>

#ifndef M_PI
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsactionmanager.cpp
Expand Up @@ -27,7 +27,7 @@
#include "qgsrunprocess.h"
#include "qgsvectorlayer.h"
#include "qgsproject.h"
#include <qgslogger.h>
#include "qgslogger.h"
#include "qgsexpression.h"

#include <QList>
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsapplication.h
Expand Up @@ -20,8 +20,8 @@
#include <QEvent>
#include <QStringList>

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

class QgsActionScopeRegistry;
class QgsRuntimeProfiler;
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgslabelsearchtree.h
Expand Up @@ -23,8 +23,8 @@
#include "qgis_sip.h"
#include <QList>
#include <QVector>
#include <pointset.h>
#include <labelposition.h>
#include "pointset.h"
#include "labelposition.h"
#include "qgspallabeling.h"
#include "rtree.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgslocalec.cpp
Expand Up @@ -15,7 +15,7 @@
* *
***************************************************************************/

#include <qgslocalec.h>
#include "qgslocalec.h"

#include <locale>
#include <QByteArray>
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsmessagelog.cpp
Expand Up @@ -15,7 +15,7 @@

#include "qgsmessagelog.h"
#include "qgsapplication.h"
#include <qgslogger.h>
#include "qgslogger.h"
#include <QDateTime>
#include <QMetaType>
#include <iostream>
Expand Down
10 changes: 5 additions & 5 deletions src/core/qgsnetworkaccessmanager.cpp
Expand Up @@ -19,12 +19,12 @@
* *
***************************************************************************/

#include <qgsnetworkaccessmanager.h>
#include "qgsnetworkaccessmanager.h"

#include <qgsapplication.h>
#include <qgsmessagelog.h>
#include <qgslogger.h>
#include <qgis.h>
#include "qgsapplication.h"
#include "qgsmessagelog.h"
#include "qgslogger.h"
#include "qgis.h"
#include "qgssettings.h"
#include "qgsnetworkdiskcache.h"
#include "qgsauthmanager.h"
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsofflineediting.h
Expand Up @@ -20,8 +20,8 @@
#define QGS_OFFLINE_EDITING_H

#include "qgis_core.h"
#include <qgsfeature.h>
#include <qgsvectorlayer.h>
#include "qgsfeature.h"
#include "qgsvectorlayer.h"

#include <QObject>
#include <QString>
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspalgeometry.h
Expand Up @@ -17,7 +17,7 @@

#include "qgsgeometry.h"
#include "qgspallabeling.h"
#include <pal/feature.h>
#include "pal/feature.h"

#include "qgslabelingengine.h"

Expand Down

0 comments on commit 76a2272

Please sign in to comment.