Merge pull request #7793 from m-kuhn/vectorlayerinclude

Only include qgsvectorlayer.h where required
qgis · Sep 5, 2018 · 4b411e0 · 4b411e0
2 parents f38400d + 4445c38
commit 4b411e0
Show file tree

Hide file tree

Showing 123 changed files with 199 additions and 93 deletions.
diff --git a/.ci/travis/code_layout/script.sh b/.ci/travis/code_layout/script.sh
@@ -20,6 +20,6 @@ pushd build
 export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
 export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
 
-python3 "${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py" xvfb-run ctest -V --output-on-failure -S "${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest"
+python3 "${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py" xvfb-run ctest -VV --output-on-failure -S "${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest"
 
 popd
diff --git a/python/core/auto_generated/layout/qgslayoutreportcontext.sip.in b/python/core/auto_generated/layout/qgslayoutreportcontext.sip.in
@@ -7,6 +7,7 @@
  ************************************************************************/
 
 
+
 class QgsLayoutReportContext : QObject
 {
 %Docstring

diff --git a/python/core/auto_generated/qgsjsonutils.sip.in b/python/core/auto_generated/qgsjsonutils.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsJsonExporter
 {
 %Docstring

diff --git a/python/core/auto_generated/qgsvectorlayerundopassthroughcommand.sip.in b/python/core/auto_generated/qgsvectorlayerundopassthroughcommand.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsVectorLayerUndoPassthroughCommand : QgsVectorLayerUndoCommand
 {
 %Docstring

diff --git a/python/gui/auto_generated/qgsfieldvalueslineedit.sip.in b/python/gui/auto_generated/qgsfieldvalueslineedit.sip.in
@@ -10,6 +10,8 @@
 
 
 
+
+
 class QgsFieldValuesLineEdit: QgsFilterLineEdit
 {
 %Docstring

diff --git a/python/gui/auto_generated/qgsnewauxiliarylayerdialog.sip.in b/python/gui/auto_generated/qgsnewauxiliarylayerdialog.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsNewAuxiliaryLayerDialog: QDialog
 {
 %Docstring

diff --git a/src/analysis/processing/qgsalgorithmextractbylocation.cpp b/src/analysis/processing/qgsalgorithmextractbylocation.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsalgorithmextractbylocation.h"
 #include "qgsgeometryengine.h"
+#include "qgsvectorlayer.h"
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmimportphotos.cpp b/src/analysis/processing/qgsalgorithmimportphotos.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsalgorithmimportphotos.h"
 #include "qgsogrutils.h"
+#include "qgsvectorlayer.h"
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmmergevector.cpp b/src/analysis/processing/qgsalgorithmmergevector.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsalgorithmmergevector.h"
+#include "qgsvectorlayer.h"
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmpackage.cpp b/src/analysis/processing/qgsalgorithmpackage.cpp
@@ -19,6 +19,7 @@
 #include "qgsgeometryengine.h"
 #include "qgsogrutils.h"
 #include "qgsvectorfilewriter.h"
+#include "qgsvectorlayer.h"
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp b/src/analysis/processing/qgsalgorithmsaveselectedfeatures.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsalgorithmsaveselectedfeatures.h"
+#include "qgsvectorlayer.h"
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp
@@ -17,6 +17,7 @@
 #include "qgscurvepolygon.h"
 #include "qgsgeometrycheck.h"
 #include "qgsfeaturepool.h"
+#include "qgsvectorlayer.h"
 
 QgsGeometryCheckerContext::QgsGeometryCheckerContext( int _precision, const QgsCoordinateReferenceSystem &_mapCrs, const QMap<QString, QgsFeaturePool *> &_featurePools )
   : tolerance( std::pow( 10, -_precision ) )

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheck.h b/src/analysis/vector/geometry_checker/qgsgeometrycheck.h
@@ -23,7 +23,6 @@
 #include <QStringList>
 #include "qgis_analysis.h"
 #include "qgsfeature.h"
-#include "qgsvectorlayer.h"
 #include "geometry/qgsgeometry.h"
 #include "qgsgeometrycheckerutils.h"
 

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -18,6 +18,7 @@
 #include "qgsgeometrycheck.h"
 #include "qgsfeaturepool.h"
 #include "qgsproject.h"
+#include "qgsvectorlayer.h"
 
 #include <QtConcurrentMap>
 #include <QFutureWatcher>

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
@@ -22,6 +22,8 @@
 #include "qgsgeos.h"
 #include "qgsgeometrycollection.h"
 #include "qgssurface.h"
+#include "qgsvectorlayer.h"
+
 #include <qmath.h>
 
 namespace QgsGeometryCheckerUtils
@@ -45,7 +47,22 @@ namespace QgsGeometryCheckerUtils
   double LayerFeature::layerToMapUnits() const { return mFeaturePool->getLayerToMapUnits(); }
   const QgsCoordinateTransform &LayerFeature::layerToMapTransform() const { return mFeaturePool->getLayerToMapTransform(); }
 
-/////////////////////////////////////////////////////////////////////////////
+  QString LayerFeature::id() const
+  {
+    return QString( "%1:%2" ).arg( layer().name() ).arg( mFeature.id() );
+  }
+
+  bool LayerFeature::operator==( const LayerFeature &other ) const
+  {
+    return layer().id() == other.layer().id() && feature().id() == other.feature().id();
+  }
+
+  bool LayerFeature::operator!=( const LayerFeature &other ) const
+  {
+    return layer().id() != other.layer().id() || feature().id() != other.feature().id();
+  }
+
+  /////////////////////////////////////////////////////////////////////////////
 
   LayerFeatures::iterator::iterator( const QStringList::const_iterator &layerIt, const LayerFeatures *parent )
     : mLayerIt( layerIt )

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
@@ -20,7 +20,6 @@
 #define QGS_GEOMETRYCHECKERUTILS_H
 
 #include "qgsfeature.h"
-#include "qgsvectorlayer.h"
 #include "geometry/qgsabstractgeometry.h"
 #include "geometry/qgspoint.h"
 #include <qmath.h>
@@ -41,9 +40,9 @@ namespace QgsGeometryCheckerUtils
       const QgsCoordinateTransform &layerToMapTransform() const;
       const QgsAbstractGeometry *geometry() const { return mGeometry; }
       QString geometryCrs() const { return mMapCrs ? layerToMapTransform().destinationCrs().authid() : layerToMapTransform().sourceCrs().authid(); }
-      QString id() const { return QString( "%1:%2" ).arg( layer().name() ).arg( mFeature.id() ); }
-      bool operator==( const LayerFeature &other ) const { return layer().id() == other.layer().id() && feature().id() == other.feature().id(); }
-      bool operator!=( const LayerFeature &other ) const { return layer().id() != other.layer().id() || feature().id() != other.feature().id(); }
+      QString id() const;
+      bool operator==( const LayerFeature &other ) const;
+      bool operator!=( const LayerFeature &other ) const;
 
     private:
       const QgsFeaturePool *mFeaturePool;

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp
@@ -16,6 +16,7 @@
 #include "qgsgeometryengine.h"
 #include "qgsgeometrycontainedcheck.h"
 #include "qgsfeaturepool.h"
+#include "qgsvectorlayer.h"
 
 
 void QgsGeometryContainedCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h b/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h
@@ -19,6 +19,7 @@
 #define QGS_GEOMETRY_COVER_CHECK_H
 
 #include "qgsgeometrycheck.h"
+#include "qgsvectorlayer.h"
 
 class ANALYSIS_EXPORT QgsGeometryContainedCheckError : public QgsGeometryCheckError
 {

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsgeometrydanglecheck.h"
 #include "qgslinestring.h"
+#include "qgsvectorlayer.h"
 
 void QgsGeometryDangleCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &/*messages*/, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const
 {

diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp
@@ -18,6 +18,7 @@
 #include "qgsspatialindex.h"
 #include "qgsgeometry.h"
 #include "qgsfeaturepool.h"
+#include "qgsvectorlayer.h"
 
 QString QgsGeometryDuplicateCheckError::duplicatesString( const QMap<QString, QgsFeaturePool *> &featurePools, const QMap<QString, QList<QgsFeatureId>> &duplicates )
 {

diff --git a/src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.cpp
@@ -17,7 +17,7 @@
 #include "qgsgeometryengine.h"
 #include "qgsproject.h"
 #include "qgsspatialindex.h"
-
+#include "qgsvectorlayer.h"
 
 QgsGeometryFollowBoundariesCheck::QgsGeometryFollowBoundariesCheck( QgsGeometryCheckerContext *context, QgsVectorLayer *checkLayer )
   : QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::PolygonGeometry}, context )

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
@@ -17,6 +17,8 @@
 #include "qgsgeometrygapcheck.h"
 #include "qgsgeometrycollection.h"
 #include "qgsfeaturepool.h"
+#include "qgsvectorlayer.h"
+
 #include "geos_c.h"
 
 void QgsGeometryGapCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &messages, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsgeometrylineintersectioncheck.h"
 #include "qgslinestring.h"
+#include "qgsvectorlayer.h"
 
 void QgsGeometryLineIntersectionCheck::collectErrors( QList<QgsGeometryCheckError *> &errors, QStringList &/*messages*/, QAtomicInt *progressCounter, const QMap<QString, QgsFeatureIds> &ids ) const
 {

diff --git a/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h b/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.h
@@ -19,6 +19,7 @@
 #define QGS_GEOMETRY_OVERLAP_CHECK_H
 
 #include "qgsgeometrycheck.h"
+#include "qgsvectorlayer.h"
 
 class ANALYSIS_EXPORT QgsGeometryOverlapCheckError : public QgsGeometryCheckError
 {

diff --git a/src/app/layout/qgslayoutmapgridwidget.cpp b/src/app/layout/qgslayoutmapgridwidget.cpp
@@ -26,6 +26,7 @@
 #include "qgslayout.h"
 #include "qgsmapsettings.h"
 #include "qgsexpressionbuilderdialog.h"
+#include "qgsvectorlayer.h"
 
 QgsLayoutMapGridWidget::QgsLayoutMapGridWidget( QgsLayoutItemMapGrid *mapGrid, QgsLayoutItemMap *map )
   : QgsLayoutItemBaseWidget( nullptr, mapGrid )

diff --git a/src/app/layout/qgslayoutpagepropertieswidget.cpp b/src/app/layout/qgslayoutpagepropertieswidget.cpp
@@ -20,6 +20,7 @@
 #include "qgslayout.h"
 #include "qgslayoutpagecollection.h"
 #include "qgslayoutundostack.h"
+#include "qgsvectorlayer.h"
 
 QgsLayoutPagePropertiesWidget::QgsLayoutPagePropertiesWidget( QWidget *parent, QgsLayoutItem *layoutItem )
   : QgsLayoutItemBaseWidget( parent, layoutItem )

diff --git a/src/app/layout/qgslayoutpolygonwidget.cpp b/src/app/layout/qgslayoutpolygonwidget.cpp
@@ -21,6 +21,7 @@
 #include "qgssymbollayerutils.h"
 #include "qgslayoutitemregistry.h"
 #include "qgslayoutundostack.h"
+#include "qgsvectorlayer.h"
 
 QgsLayoutPolygonWidget::QgsLayoutPolygonWidget( QgsLayoutItemPolygon *polygon )
   : QgsLayoutItemBaseWidget( nullptr, polygon )

diff --git a/src/app/layout/qgslayoutpolylinewidget.cpp b/src/app/layout/qgslayoutpolylinewidget.cpp
@@ -21,6 +21,7 @@
 #include "qgslayoutitemregistry.h"
 #include "qgslayout.h"
 #include "qgslayoutundostack.h"
+#include "qgsvectorlayer.h"
 
 #include <QButtonGroup>
 #include <QFileDialog>

diff --git a/src/app/layout/qgslayoutshapewidget.cpp b/src/app/layout/qgslayoutshapewidget.cpp
@@ -20,6 +20,7 @@
 #include "qgslayoutitemshape.h"
 #include "qgslayout.h"
 #include "qgslayoutundostack.h"
+#include "qgsvectorlayer.h"
 
 QgsLayoutShapeWidget::QgsLayoutShapeWidget( QgsLayoutItemShape *shape )
   : QgsLayoutItemBaseWidget( nullptr, shape )

diff --git a/src/app/qgsattributesformproperties.h b/src/app/qgsattributesformproperties.h
@@ -30,7 +30,6 @@
 #include <QHBoxLayout>
 #include <QFormLayout>
 
-#include "qgsvectorlayer.h"
 #include "ui_qgsattributesformproperties.h"
 #include "qgis_app.h"
 #include "qgsaddattrdialog.h"

diff --git a/src/app/qgslayercapabilitiesmodel.cpp b/src/app/qgslayercapabilitiesmodel.cpp
@@ -19,6 +19,7 @@
 
 #include "qgslayertree.h"
 #include "qgslayertreemodel.h"
+#include "qgsvectorlayer.h"
 
 QgsLayerCapabilitiesModel::QgsLayerCapabilitiesModel( QgsProject *project, QObject *parent )
   : QSortFilterProxyModel( parent )

diff --git a/src/app/qgsloadstylefromdbdialog.h b/src/app/qgsloadstylefromdbdialog.h
@@ -19,7 +19,6 @@
 #include "ui_qgsloadstylefromdbdialog.h"
 #include "qgsguiutils.h"
 #include "qgis_app.h"
-#include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 
 class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadStyleFromDBDialogLayout

diff --git a/src/app/qgsmaptoolselectutils.h b/src/app/qgsmaptoolselectutils.h
@@ -16,11 +16,12 @@ email                : jpalmer at linz dot govt dot nz
 #ifndef QGSMAPTOOLSELECTUTILS_H
 #define QGSMAPTOOLSELECTUTILS_H
 
-#include "qgsvectorlayer.h"
 #include <Qt>
 #include <QRect>
 #include <QPoint>
 
+#include "qgsvectorlayer.h"
+
 class QMouseEvent;
 class QgsMapCanvas;
 class QgsVectorLayer;

diff --git a/src/app/qgssourcefieldsproperties.cpp b/src/app/qgssourcefieldsproperties.cpp
@@ -15,6 +15,7 @@
  ***************************************************************************/
 
 #include "qgssourcefieldsproperties.h"
+#include "qgsvectorlayer.h"
 
 QgsSourceFieldsProperties::QgsSourceFieldsProperties( QgsVectorLayer *layer, QWidget *parent )
   : QWidget( parent )

diff --git a/src/app/qgssourcefieldsproperties.h b/src/app/qgssourcefieldsproperties.h
@@ -31,7 +31,6 @@
 #include <QHBoxLayout>
 #include <QFormLayout>
 
-#include "qgsvectorlayer.h"
 #include "ui_qgssourcefieldsproperties.h"
 #include "qgis_app.h"
 #include "qgsaddattrdialog.h"

diff --git a/src/app/qgsstatisticalsummarydockwidget.h b/src/app/qgsstatisticalsummarydockwidget.h
@@ -26,6 +26,8 @@
 #include "qgsfeedback.h"
 #include "qgsvectorlayerutils.h"
 #include "qgstaskmanager.h"
+#include "qgsvectorlayer.h"
+
 #include "qgis_app.h"
 
 class QMenu;

diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -24,7 +24,6 @@
 #include "qgsguiutils.h"
 #include "qgshelp.h"
 #include "qgsmaplayerstylemanager.h"
-#include "qgsvectorlayer.h"
 #include "qgsvectorlayerjoininfo.h"
 #include "layertree/qgslayertree.h"
 #include "layertree/qgslayertreemodel.h"

diff --git a/src/core/expression/qgsexpressionutils.cpp b/src/core/expression/qgsexpressionutils.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsexpressionutils.h"
 #include "qgsexpressionnode.h"
+#include "qgsvectorlayer.h"
 
 ///@cond PRIVATE
 
@@ -35,3 +36,5 @@ QgsExpressionUtils::TVL QgsExpressionUtils::OR[3][3] =
 QgsExpressionUtils::TVL QgsExpressionUtils::NOT[3] = { True, False, Unknown };
 
 ///@endcond
+
+
diff --git a/src/core/expression/qgsexpressionutils.h b/src/core/expression/qgsexpressionutils.h
@@ -22,12 +22,11 @@
 #include "qgsfeature.h"
 #include "qgsexpression.h"
 #include "qgscolorramp.h"
-#include "qgsvectorlayer.h"
 #include "qgsvectorlayerfeatureiterator.h"
 #include "qgsrasterlayer.h"
 #include "qgsproject.h"
 #include "qgsrelationmanager.h"
-
+#include "qgsvectorlayer.h"
 
 #define ENSURE_NO_EVAL_ERROR   {  if ( parent->hasEvalError() ) return QVariant(); }
 #define SET_EVAL_ERROR(x)   { parent->setEvalErrorString( x ); return QVariant(); }

diff --git a/src/core/layout/qgsabstractreportsection.cpp b/src/core/layout/qgsabstractreportsection.cpp
@@ -19,6 +19,7 @@
 #include "qgsreport.h"
 #include "qgsreportsectionfieldgroup.h"
 #include "qgsreportsectionlayout.h"
+#include "qgsvectorlayer.h"
 
 ///@cond NOT_STABLE
 

diff --git a/src/core/layout/qgscompositionconverter.cpp b/src/core/layout/qgscompositionconverter.cpp
@@ -29,6 +29,7 @@
 #include "qgssymbollayer.h"
 #include "qgsproject.h"
 #include "qgsmaplayerstylemanager.h"
+#include "qgsvectorlayer.h"
 
 #include "qgsprintlayout.h"
 #include "qgslayoutatlas.h"

diff --git a/src/core/layout/qgslayout.cpp b/src/core/layout/qgslayout.cpp
@@ -28,6 +28,7 @@
 #include "qgslayoutitemmap.h"
 #include "qgslayoutundostack.h"
 #include "qgscompositionconverter.h"
+#include "qgsvectorlayer.h"
 
 QgsLayout::QgsLayout( QgsProject *project )
   : mProject( project )