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.
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2019-01-24 17:33:22 +01:00 committed by Denis Rouzaud
parent ff20d1800e
commit 25f2aba44d
466 changed files with 445 additions and 444 deletions

View File

@ -9,6 +9,7 @@
class QgsTranslationContext
{
%Docstring

View File

@ -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();

View File

@ -10,6 +10,7 @@
class QgsStyleExportImportDialog : QDialog
{

View File

@ -19,7 +19,6 @@
#include "TriDecorator.h"
#include "qgis_sip.h"
#include "qgis.h"
#include "TriangleInterpolator.h"
#include "MathUtils.h"
#include "qgslogger.h"

View File

@ -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

View 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"

View File

@ -18,7 +18,7 @@
#include <QVector>
#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
class QgsGraph;

View File

@ -17,7 +17,7 @@
#define QGSGRAPHBUILDER_H
#include "qgsgraphbuilderinterface.h"
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsspatialindex.h"
#include "qgis_analysis.h"

View File

@ -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"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
class QgsCategorizedSymbolRenderer;

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -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>

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
#include "qgsprocessingalgorithm.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

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

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
class QgsProcessingFeedback;

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
class QgsProcessingModelAlgorithm;

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsmaptopixelgeometrysimplifier.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
#include "qgsprocessingalgorithm.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
#include "qgsprocessingalgorithm.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -21,7 +21,7 @@
#define SIP_NO_FILE
#include "qgis_core.h"
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsprocessingprovider.h"
#include "qgsprocessingutils.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsgraph.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -22,7 +22,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsrasterprojector.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsreclassifyutils.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsmaptopixelgeometrysimplifier.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsalgorithmnetworkanalysisbase.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsalgorithmnetworkanalysisbase.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsalgorithmnetworkanalysisbase.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsmaptopixelgeometrysimplifier.h"
#include "qgsapplication.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -21,7 +21,7 @@
#define SIP_NO_FILE
#include "qgis_core.h"
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
#include "qgsreclassifyutils.h"

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingalgorithm.h"
///@cond PRIVATE

View File

@ -19,7 +19,7 @@
#define QGSNATIVEALGORITHMS_H
#include "qgis_analysis.h"
#include "qgis.h"
#include "qgis_sip.h"
#include "qgsprocessingprovider.h"
/**

View File

@ -20,7 +20,7 @@
#define SIP_NO_FILE
#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_analysis.h"
#include "qgsrasterrange.h"
#include <QVector>

Some files were not shown because too many files have changed in this diff Show More