Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Include qgis_sip.h instead of qgis.h where possible (#8961)
This PR continues the work started in PR #8951.

This commit replaces occurences of #include "qgis.h" by #include "qgis_sip.h",
where possible = when files only depends on SIP_XXX features.
  • Loading branch information
peppsac authored and 3nids committed Jan 24, 2019
1 parent ff20d18 commit 25f2aba
Show file tree
Hide file tree
Showing 466 changed files with 445 additions and 444 deletions.
1 change: 1 addition & 0 deletions python/core/auto_generated/qgstranslationcontext.sip.in
Expand Up @@ -9,6 +9,7 @@




class QgsTranslationContext
{
%Docstring
Expand Down
Expand Up @@ -24,8 +24,6 @@ A widget for customizing conditional formatting options.
explicit QgsFieldConditionalFormatWidget( QWidget *parent /TransferThis/ = 0 );
%Docstring
Constructor for QgsFieldConditionalFormatWidget.

:param parent: parent widget
%End

void viewRules();
Expand Down
Expand Up @@ -10,6 +10,7 @@




class QgsStyleExportImportDialog : QDialog
{

Expand Down
1 change: 0 additions & 1 deletion src/analysis/interpolation/NormVecDecorator.h
Expand Up @@ -19,7 +19,6 @@

#include "TriDecorator.h"
#include "qgis_sip.h"
#include "qgis.h"
#include "TriangleInterpolator.h"
#include "MathUtils.h"
#include "qgslogger.h"
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/interpolation/TriDecorator.h
Expand Up @@ -18,7 +18,7 @@
#define TRIDECORATOR_H

#include "Triangulation.h"
#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"

#define SIP_NO_FILE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/interpolation/Triangulation.h
Expand Up @@ -18,7 +18,7 @@
#define TRIANGULATION_H

#include <QList>
#include "qgis.h"
#include "qgis_sip.h"
#include <QPainter>
#include "TriangleInterpolator.h"
#include "qgis_analysis.h"
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_sip.h"
#include "qgis_analysis.h"

class QgsGraph;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/network/qgsgraphbuilder.h
Expand Up @@ -17,7 +17,7 @@
#define QGSGRAPHBUILDER_H

#include "qgsgraphbuilderinterface.h"
#include "qgis.h"
#include "qgis_sip.h"

#include "qgsspatialindex.h"
#include "qgis_analysis.h"
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/network/qgsgraphdirector.h
Expand Up @@ -20,7 +20,7 @@
#include <QVector>
#include <QList>

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsfeedback.h"
#include "qgsnetworkstrategy.h"
#include "qgis_analysis.h"
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmaddincrementalfield.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmarrayoffsetlines.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmassignprojection.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmboundary.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmboundingbox.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmbuffer.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmcategorizeusingstyle.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

class QgsCategorizedSymbolRenderer;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmcentroid.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmclip.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmconvexhull.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmdbscanclustering.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
#include "qgsprocessingalgorithm.h"
#include <unordered_map>
Expand Down
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmdissolve.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmdrape.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmdropgeometry.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmdropmzvalues.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmexplode.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmexplodehstore.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextendlines.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextenttolayer.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractbinary.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
#include "qgsprocessingalgorithm.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractbyattribute.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractbyexpression.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractbyextent.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractbylocation.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractvertices.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractzmvalues.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsstatisticalsummary.h"
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmfiledownloader.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

class QgsProcessingFeedback;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmfilter.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

class QgsProcessingModelAlgorithm;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmfiltervertices.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsmaptopixelgeometrysimplifier.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmfixgeometries.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmforcerhr.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmimportphotos.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
#include "qgsprocessingalgorithm.h"

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithminterpolatepoint.h
Expand Up @@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"

///@cond PRIVATE
Expand Down

0 comments on commit 25f2aba

Please sign in to comment.