Skip to content
Permalink
Browse files

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 25f2aba44dd45d2d09eba34194a8ed8df775a7cc
Showing 466 changed files with 445 additions and 444 deletions.
@@ -9,6 +9,7 @@




class QgsTranslationContext
{
%Docstring
@@ -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();
@@ -10,6 +10,7 @@




class QgsStyleExportImportDialog : QDialog
{

@@ -19,7 +19,6 @@

#include "TriDecorator.h"
#include "qgis_sip.h"
#include "qgis.h"
#include "TriangleInterpolator.h"
#include "MathUtils.h"
#include "qgslogger.h"
@@ -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
@@ -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"
@@ -18,7 +18,7 @@

#include <QVector>

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

class QgsGraph;
@@ -17,7 +17,7 @@
#define QGSGRAPHBUILDER_H

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

#include "qgsspatialindex.h"
#include "qgis_analysis.h"
@@ -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"
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

class QgsCategorizedSymbolRenderer;
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -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>
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsstatisticalsummary.h"
#include <functional>
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

class QgsProcessingFeedback;
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

class QgsProcessingModelAlgorithm;
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE
@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

@@ -20,7 +20,7 @@

#define SIP_NO_FILE

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

///@cond PRIVATE

0 comments on commit 25f2aba

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