Speed up QGIS compilation by removing all Qt Module-wide includes

Refs https://www.kdab.com/beware-of-qt-module-wide-includes/
qgis · Mar 5, 2021 · c6370c7 · c6370c7
1 parent 9c721a6
commit c6370c7
Show file tree

Hide file tree

Showing 299 changed files with 532 additions and 48 deletions.
diff --git a/.github/workflows/code_layout.yml b/.github/workflows/code_layout.yml
@@ -99,6 +99,14 @@ jobs:
       - name: No brace initialization of QVariant variables
         run: ./tests/code_layout/test_qvariant_no_brace_init.sh
 
+  qt_module_wide_imports:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: No module-wide imports of Qt modules
+        run: ./tests/code_layout/test_qt_imports.sh
+
   doxygen_layout_check:
     runs-on: ubuntu-latest
     steps:

diff --git a/python/core/auto_generated/annotations/qgsannotation.sip.in b/python/core/auto_generated/annotations/qgsannotation.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsAnnotation : QObject
 {
 %Docstring

diff --git a/python/core/auto_generated/network/qgsfiledownloader.sip.in b/python/core/auto_generated/network/qgsfiledownloader.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsFileDownloader : QObject
 {
 %Docstring

diff --git a/python/core/auto_generated/network/qgsnetworkcontentfetcherregistry.sip.in b/python/core/auto_generated/network/qgsnetworkcontentfetcherregistry.sip.in
@@ -10,7 +10,6 @@
 
 
 
-
 class QgsFetchedContent : QObject
 {
 %Docstring

diff --git a/python/core/auto_generated/processing/qgsprocessingcontext.sip.in b/python/core/auto_generated/processing/qgsprocessingcontext.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsProcessingContext
 {
 %Docstring

diff --git a/python/core/auto_generated/qgspointlocator.sip.in b/python/core/auto_generated/qgspointlocator.sip.in
@@ -16,6 +16,7 @@
 
 
 
+
 class QgsPointLocator : QObject
 {
 %Docstring

diff --git a/python/core/auto_generated/qgsproxyprogresstask.sip.in b/python/core/auto_generated/qgsproxyprogresstask.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsProxyProgressTask : QgsTask
 {
 %Docstring

diff --git a/python/core/auto_generated/qgssourcecache.sip.in b/python/core/auto_generated/qgssourcecache.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsSourceCache : QgsAbstractContentCacheBase
 {
 %Docstring

diff --git a/python/core/auto_generated/symbology/qgssymbollayerutils.sip.in b/python/core/auto_generated/symbology/qgssymbollayerutils.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 typedef QMap<QString, QString> QgsStringMap;
 typedef QMap<QString, QgsSymbol * > QgsSymbolMap;
 

diff --git a/python/core/auto_generated/vector/qgsvectorlayerexporter.sip.in b/python/core/auto_generated/vector/qgsvectorlayerexporter.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsVectorLayerExporter : QgsFeatureSink
 {
 %Docstring

diff --git a/python/gui/auto_generated/attributetable/qgsdualview.sip.in b/python/gui/auto_generated/attributetable/qgsdualview.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsDualView : QStackedWidget
 {
 %Docstring

diff --git a/python/gui/auto_generated/qgsdoublevalidator.sip.in b/python/gui/auto_generated/qgsdoublevalidator.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsDoubleValidator : QRegularExpressionValidator
 {
 %Docstring

diff --git a/python/gui/auto_generated/raster/qgspalettedrendererwidget.sip.in b/python/gui/auto_generated/raster/qgspalettedrendererwidget.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsPalettedRendererWidget: QgsRasterRendererWidget
 {
 

diff --git a/src/3d/materials/qgsgoochmaterialsettings.cpp b/src/3d/materials/qgsgoochmaterialsettings.cpp
@@ -25,6 +25,7 @@
 #include <Qt3DRender/QEffect>
 #include <Qt3DRender/QTechnique>
 #include <Qt3DRender/QGraphicsApiFilter>
+#include <QUrl>
 
 QString QgsGoochMaterialSettings::type() const
 {

diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -36,6 +36,7 @@
 #include <Qt3DRender/QCullFace>
 #include <Qt3DRender/QDepthTest>
 #include <QSurface>
+#include <QUrl>
 
 #include <QOpenGLContext>
 #include <QOpenGLFunctions>

diff --git a/src/3d/qgspostprocessingentity.cpp b/src/3d/qgspostprocessingentity.cpp
@@ -23,6 +23,7 @@
 #include <Qt3DRender/QTechnique>
 #include <Qt3DRender/QGraphicsApiFilter>
 #include <Qt3DRender/QDepthTest>
+#include <QUrl>
 
 #include "qgsshadowrenderingframegraph.h"
 

diff --git a/src/3d/qgsrulebased3drenderer.h b/src/3d/qgsrulebased3drenderer.h
@@ -21,8 +21,8 @@
 #include "qgs3drendererregistry.h"
 #include "qgsabstractvectorlayer3drenderer.h"
 #include "qgsabstract3dsymbol.h"
-
 #include "qgsmaplayerref.h"
+#include <QUuid>
 
 class Qgs3DRenderContext;
 class QgsFeature3DHandler;

diff --git a/src/3d/qgsrulebasedchunkloader_p.h b/src/3d/qgsrulebasedchunkloader_p.h
@@ -31,6 +31,7 @@
 #include "qgsfeature3dhandler_p.h"
 #include "qgschunkedentity_p.h"
 #include "qgsrulebased3drenderer.h"
+#include <QFutureWatcher>
 
 #define SIP_NO_FILE
 

diff --git a/src/3d/qgsskyboxentity.cpp b/src/3d/qgsskyboxentity.cpp
@@ -29,6 +29,7 @@
 #include <Qt3DRender/QSeamlessCubemap>
 #include <Qt3DRender/QParameter>
 #include <Qt3DRender/QTextureImage>
+#include <QUrl>
 
 #include "qgsimagecache.h"
 #include "qgsimagetexture.h"

diff --git a/src/3d/symbols/qgspoint3dbillboardmaterial.cpp b/src/3d/symbols/qgspoint3dbillboardmaterial.cpp
@@ -21,6 +21,7 @@
 #include <Qt3DRender/QBlendEquationArguments>
 #include <Qt3DRender/QBlendEquation>
 #include <Qt3DRender/QNoDepthMask>
+#include <QUrl>
 
 #include "qgslogger.h"
 #include "qgspoint3dbillboardmaterial.h"

diff --git a/src/3d/symbols/qgspointcloud3dsymbol_p.cpp b/src/3d/symbols/qgspointcloud3dsymbol_p.cpp
@@ -33,6 +33,7 @@
 #include <Qt3DRender/QGraphicsApiFilter>
 #include <Qt3DRender/QEffect>
 #include <QPointSize>
+#include <QUrl>
 
 QgsPointCloud3DGeometry::QgsPointCloud3DGeometry( Qt3DCore::QNode *parent, unsigned int byteStride )
   : Qt3DRender::QGeometry( parent )

diff --git a/src/analysis/processing/qgsalgorithmexportmesh.cpp b/src/analysis/processing/qgsalgorithmexportmesh.cpp
@@ -27,6 +27,8 @@
 #include "qgsrasterfilewriter.h"
 #include "qgslinestring.h"
 
+#include <QTextStream>
+
 ///@cond PRIVATE
 
 

diff --git a/src/analysis/processing/qgsalgorithmimportphotos.cpp b/src/analysis/processing/qgsalgorithmimportphotos.cpp
@@ -18,6 +18,9 @@
 #include "qgsalgorithmimportphotos.h"
 #include "qgsogrutils.h"
 #include "qgsvectorlayer.h"
+#include <QDirIterator>
+#include <QFileInfo>
+#include <QRegularExpression>
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmnearestneighbouranalysis.cpp b/src/analysis/processing/qgsalgorithmnearestneighbouranalysis.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsalgorithmnearestneighbouranalysis.h"
 #include "qgsapplication.h"
+#include <QTextStream>
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmpointstopaths.cpp b/src/analysis/processing/qgsalgorithmpointstopaths.cpp
@@ -19,6 +19,9 @@
 #include "qgsvectorlayer.h"
 #include "qgsmultipoint.h"
 
+#include <QCollator>
+#include <QTextStream>
+
 ///@cond PRIVATE
 
 QString QgsPointsToPathsAlgorithm::name() const

diff --git a/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp b/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsalgorithmrasterlayeruniquevalues.h"
 #include "qgsstringutils.h"
+#include <QTextStream>
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmrasterstatistics.cpp b/src/analysis/processing/qgsalgorithmrasterstatistics.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "qgsalgorithmrasterstatistics.h"
-
+#include <QTextStream>
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmrastersurfacevolume.cpp b/src/analysis/processing/qgsalgorithmrastersurfacevolume.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsalgorithmrastersurfacevolume.h"
 #include "qgsstringutils.h"
+#include <QTextStream>
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmsavefeatures.cpp b/src/analysis/processing/qgsalgorithmsavefeatures.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsalgorithmsavefeatures.h"
 #include "qgsvectorfilewriter.h"
+#include <QRegularExpression>
 
 ///@cond PRIVATE
 

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

diff --git a/src/analysis/processing/qgsalgorithmsplitfeaturesbyattributecharacter.cpp b/src/analysis/processing/qgsalgorithmsplitfeaturesbyattributecharacter.cpp
@@ -21,6 +21,7 @@
 #include "qgscircularstring.h"
 #include "qgscompoundcurve.h"
 #include "qgsgeometrycollection.h"
+#include <QRegularExpression>
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/processing/qgsalgorithmsplitfeaturesbyattributecharacter.h b/src/analysis/processing/qgsalgorithmsplitfeaturesbyattributecharacter.h
@@ -23,6 +23,8 @@
 #include "qgis_sip.h"
 #include "qgsprocessingalgorithm.h"
 
+#include <QRegularExpression>
+
 ///@cond PRIVATE
 
 /**

diff --git a/src/analysis/processing/qgsalgorithmwritevectortiles.cpp b/src/analysis/processing/qgsalgorithmwritevectortiles.cpp
@@ -18,6 +18,7 @@
 #include "qgsprocessingparametervectortilewriterlayers.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectortilewriter.h"
+#include <QUrl>
 
 ///@cond PRIVATE
 

diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
@@ -24,6 +24,8 @@
 #include "qgsreadwritelocker.h"
 
 #include <QMutexLocker>
+#include <QThread>
+
 
 
 QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer )

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -18,6 +18,7 @@
 #include <QFutureWatcher>
 #include <QMutex>
 #include <QTimer>
+#include <QTextStream>
 
 #include "qgsgeometrycheckcontext.h"
 #include "qgsgeometrychecker.h"

diff --git a/src/app/3d/qgs3dicongenerator.cpp b/src/app/3d/qgs3dicongenerator.cpp
@@ -15,6 +15,7 @@
 
 #include "qgs3dicongenerator.h"
 #include "qgsapplication.h"
+#include <QDir>
 
 Qgs3DIconGenerator::Qgs3DIconGenerator( QObject *parent )
   : QgsAbstractStyleEntityIconGenerator( parent )

diff --git a/src/app/3d/qgsrulebased3drendererwidget.cpp b/src/app/3d/qgsrulebased3drendererwidget.cpp
@@ -27,7 +27,7 @@
 #include <QAction>
 #include <QClipboard>
 #include <QMessageBox>
-
+#include <QMimeData>
 
 QgsRuleBased3DRendererWidget::QgsRuleBased3DRendererWidget( QWidget *parent )
   : QgsPanelWidget( parent )

diff --git a/src/app/browser/qgsinbuiltdataitemproviders.cpp b/src/app/browser/qgsinbuiltdataitemproviders.cpp
@@ -49,6 +49,7 @@
 #include <QDesktopServices>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QUrl>
 
 QString QgsAppDirectoryItemGuiProvider::name()
 {

diff --git a/src/app/devtools/networklogger/qgsnetworkloggernode.h b/src/app/devtools/networklogger/qgsnetworkloggernode.h
@@ -19,6 +19,7 @@
 #include <QElapsedTimer>
 #include <QVariant>
 #include <QColor>
+#include <QUrl>
 #include <memory>
 #include <deque>
 

diff --git a/src/app/devtools/networklogger/qgsnetworkloggerpanelwidget.cpp b/src/app/devtools/networklogger/qgsnetworkloggerpanelwidget.cpp
@@ -28,6 +28,7 @@
 #include <QScrollBar>
 #include <QToolButton>
 #include <QCheckBox>
+#include <QTextStream>
 
 #include <nlohmann/json.hpp>
 

diff --git a/src/app/georeferencer/qgsgeorefmainwindow.cpp b/src/app/georeferencer/qgsgeorefmainwindow.cpp
@@ -29,6 +29,7 @@
 #include <QPen>
 #include <QStringList>
 #include <QList>
+#include <QUrl>
 
 #include "qgssettings.h"
 #include "qgisinterface.h"

diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -69,7 +69,7 @@
 #include <QFileDialog>
 #include <QPixmap>
 #include <QPen>
-
+#include <QTimeZone>
 
 const int MAXACQUISITIONINTERVAL = 3000; // max gps information acquisition suspension interval (in seconds)
 const int MAXDISTANCETHRESHOLD = 200; // max gps distance threshold (in meters)

diff --git a/src/app/gps/qgsgpsinformationwidget.h b/src/app/gps/qgsgpsinformationwidget.h
@@ -32,6 +32,7 @@
 #include <qwt_polar_grid.h>
 #include <qwt_polar_marker.h>
 #endif
+#include <QTextStream>
 
 class QextSerialPort;
 class QgsGpsConnection;

diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -93,6 +93,8 @@
 #include <QWidgetAction>
 #include <QProgressBar>
 #include <QClipboard>
+#include <QRegularExpression>
+#include <QUrl>
 
 #ifdef Q_OS_MACX
 #include <ApplicationServices/ApplicationServices.h>

diff --git a/src/app/layout/qgslayoutimagedrophandler.cpp b/src/app/layout/qgslayoutimagedrophandler.cpp
@@ -20,6 +20,8 @@
 #include "qgslayoutitempicture.h"
 
 #include <QImageReader>
+#include <QFileInfo>
+#include <QMimeData>
 
 QgsLayoutImageDropHandler::QgsLayoutImageDropHandler( QObject *parent )
   : QgsLayoutCustomDropHandler( parent )

diff --git a/src/app/locator/qgsinbuiltlocatorfilters.cpp b/src/app/locator/qgsinbuiltlocatorfilters.cpp
@@ -21,6 +21,7 @@
 #include <QString>
 #include <QToolButton>
 #include <QUrl>
+#include <QRegularExpression>
 
 #include "qgsapplication.h"
 #include "qgscoordinatereferencesystem.h"

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -33,6 +33,7 @@
 #include <QDesktopWidget>
 #include <QImageReader>
 #include <QMessageBox>
+#include <QStandardPaths>
 
 #include <cstdio>
 #include <cstdlib>