Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove include "qgsapplication.h" from qgswkbptr.h
qgswkbptr.h is included indirectly by a large number of source files.
So this commit does the following:
  - remove #include "qgsapplication.h" from qgswkbptr.h, and copy-paste the swap_endian
    function where it's used.
  - add the missing #include "qgsapplication.h" in other files

The rationale for this change is:
  - qgswkbptr.h doesn't really needs QgsApplication, since it only used swap_endian.
    We don't need to add a fake dependency on QgsApplication on every (indirect) "includers"
    of qgswkbptr.h
 - qgsapplication.h depends on qgsconfig.h which itself changes quite often (on every git op
   at least). Before this change, a 'git commit' would trigger a rebuild of about 3500 files.
   With this change we're down to ~700.
  • Loading branch information
peppsac committed Jan 22, 2019
1 parent 1cd7bde commit f1760ee
Show file tree
Hide file tree
Showing 127 changed files with 142 additions and 23 deletions.
Expand Up @@ -11,6 +11,7 @@




typedef QVector< QgsPoint > QgsPointSequence;
typedef QVector< QVector< QgsPoint > > QgsRingSequence;
typedef QVector< QVector< QVector< QgsPoint > > > QgsCoordinateSequence;
Expand Down
1 change: 1 addition & 0 deletions python/core/auto_generated/geometry/qgswkbptr.sip.in
Expand Up @@ -38,6 +38,7 @@ class QgsConstWkbPtr




public:
QgsConstWkbPtr( const unsigned char *p /Array/, int size /ArraySize/ );

Expand Down
1 change: 1 addition & 0 deletions python/core/auto_generated/qgsabstractcontentcache.sip.in
Expand Up @@ -9,6 +9,7 @@




class QgsAbstractContentCacheEntry
{
%Docstring
Expand Down
1 change: 0 additions & 1 deletion python/core/auto_generated/qgsapplication.sip.in
Expand Up @@ -503,7 +503,6 @@ Gets application icon
Returns whether this machine uses big or little endian
%End


static QString reportStyleSheet();
%Docstring
Returns a standard css style sheet for reports.
Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmbuffer.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmcentroid.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmclip.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmconvexhull.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmdifference.h
Expand Up @@ -19,6 +19,7 @@
#define SIP_NO_FILE

#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmdissolve.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmextractbylocation.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmextractvertices.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmintersection.h
Expand Up @@ -19,6 +19,7 @@
#define SIP_NO_FILE

#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmlineintersection.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmloadlayer.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmmeancoordinates.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmmergevector.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmnetworkanalysisbase.h
Expand Up @@ -26,6 +26,7 @@
#include "qgsgraph.h"
#include "qgsgraphbuilder.h"
#include "qgsvectorlayerdirector.h"
#include "qgsapplication.h"

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmpointonsurface.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmpromotetomultipart.h
Expand Up @@ -22,6 +22,7 @@

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

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmsimplify.h
Expand Up @@ -23,6 +23,7 @@
#include "qgis.h"
#include "qgsprocessingalgorithm.h"
#include "qgsmaptopixelgeometrysimplifier.h"
#include "qgsapplication.h"

///@cond PRIVATE

Expand Down
Expand Up @@ -19,6 +19,7 @@
#define SIP_NO_FILE

#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/analysis/processing/qgsalgorithmunion.h
Expand Up @@ -20,6 +20,7 @@
#define SIP_NO_FILE

#include "qgsprocessingalgorithm.h"
#include "qgsapplication.h"

///@cond PRIVATE

Expand Down
1 change: 1 addition & 0 deletions src/app/3d/qgs3dmapcanvasdockwidget.cpp
Expand Up @@ -29,6 +29,7 @@
#include "qgscameracontroller.h"
#include "qgsmapcanvas.h"
#include "qgsmessagebar.h"
#include "qgsapplication.h"

#include "qgs3danimationsettings.h"
#include "qgs3danimationwidget.h"
Expand Down
1 change: 1 addition & 0 deletions src/app/3d/qgslightswidget.cpp
Expand Up @@ -16,6 +16,7 @@
#include "qgslightswidget.h"

#include "qgs3dmapsettings.h"
#include "qgsapplication.h"

#include <QMessageBox>

Expand Down
1 change: 1 addition & 0 deletions src/app/3d/qgsrulebased3drendererwidget.cpp
Expand Up @@ -21,6 +21,7 @@
#include "qgsrulebased3drenderer.h"
#include "qgsvectorlayer.h"
#include "qgssymbol3dwidget.h"
#include "qgsapplication.h"

#include <QAction>
#include <QClipboard>
Expand Down
1 change: 1 addition & 0 deletions src/app/3d/qgsvectorlayer3drendererwidget.cpp
Expand Up @@ -21,6 +21,7 @@
#include "qgssymbol3dwidget.h"
#include "qgsvectorlayer.h"
#include "qgsvectorlayer3drenderer.h"
#include "qgsapplication.h"

#include <QBoxLayout>
#include <QCheckBox>
Expand Down
1 change: 1 addition & 0 deletions src/app/browser/qgsinbuiltdataitemproviders.cpp
Expand Up @@ -32,6 +32,7 @@
#include "qgsnewvectorlayerdialog.h"
#include "qgsnewgeopackagelayerdialog.h"
#include "qgsfileutils.h"
#include "qgsapplication.h"
#include <QMenu>
#include <QInputDialog>
#include <QMessageBox>
Expand Down
1 change: 1 addition & 0 deletions src/app/qgisapp.h
Expand Up @@ -103,6 +103,7 @@ class QgsStatusBar;
class QgsGeometryValidationService;
class QgsGeometryValidationDock;
class QgsGeometryValidationModel;
class QgsUserProfileManager;
class QgsUserProfileManagerWidgetFactory;
class Qgs3DMapCanvasDockWidget;
class QgsHandleBadLayersHandler;
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsattributesformproperties.cpp
Expand Up @@ -20,6 +20,7 @@
#include "qgisapp.h"
#include "qgsfieldcombobox.h"
#include "qgsqmlwidgetwrapper.h"
#include "qgsapplication.h"

QgsAttributesFormProperties::QgsAttributesFormProperties( QgsVectorLayer *layer, QWidget *parent )
: QWidget( parent )
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsattributetypedialog.cpp
Expand Up @@ -28,6 +28,7 @@
#include "qgseditorwidgetfactory.h"
#include "qgseditorwidgetregistry.h"
#include "qgsgui.h"
#include "qgsapplication.h"

#include <QTableWidgetItem>
#include <QFile>
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsclipboard.cpp
Expand Up @@ -39,6 +39,7 @@
#include "qgisapp.h"
#include "qgsmapcanvas.h"
#include "qgsproject.h"
#include "qgsapplication.h"

QgsClipboard::QgsClipboard()
{
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsgeometryvalidationdock.cpp
Expand Up @@ -29,6 +29,7 @@ email : matthias@opengis.ch
#include "qgsgeometryoptions.h"
#include "qgsgeometrycheckfactory.h"
#include "qgisapp.h"
#include "qgsapplication.h"


QgsGeometryValidationDock::QgsGeometryValidationDock( const QString &title, QgsMapCanvas *mapCanvas, QgisApp *parent, Qt::WindowFlags flags )
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsgeometryvalidationmodel.cpp
Expand Up @@ -18,6 +18,7 @@ email : matthias@opengis.ch
#include "qgsvectorlayer.h"
#include "qgssinglegeometrycheck.h"
#include "qgsfeatureid.h"
#include "qgsapplication.h"

#include <QIcon>

Expand Down
1 change: 1 addition & 0 deletions src/app/qgshandlebadlayers.cpp
Expand Up @@ -27,6 +27,7 @@
#include "qgsmessagebar.h"
#include "qgssettings.h"
#include "qgslayertreeregistrybridge.h"
#include "qgsapplication.h"

#include <QDomDocument>
#include <QDomElement>
Expand Down
1 change: 1 addition & 0 deletions src/app/qgslayertreeviewembeddedindicator.cpp
Expand Up @@ -17,6 +17,7 @@
#include "qgslayertree.h"
#include "qgslayertreemodel.h"
#include "qgslayertreeview.h"
#include "qgsapplication.h"

QgsLayerTreeViewEmbeddedIndicatorProvider::QgsLayerTreeViewEmbeddedIndicatorProvider( QgsLayerTreeView *view )
: QObject( view )
Expand Down
1 change: 1 addition & 0 deletions src/app/qgslayertreeviewindicatorprovider.cpp
Expand Up @@ -22,6 +22,7 @@
#include "qgsvectorlayer.h"
#include "qgsrasterlayer.h"
#include "qgisapp.h"
#include "qgsapplication.h"

QgsLayerTreeViewIndicatorProvider::QgsLayerTreeViewIndicatorProvider( QgsLayerTreeView *view )
: QObject( view )
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsmapcanvasdockwidget.cpp
Expand Up @@ -29,6 +29,7 @@
#include "qgsvertexmarker.h"
#include "qgsrubberband.h"
#include "qgsvectorlayer.h"
#include "qgsapplication.h"
#include <QMessageBox>
#include <QMenu>
#include <QToolBar>
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsmaplayerstylecategoriesmodel.cpp
Expand Up @@ -14,6 +14,7 @@
***************************************************************************/

#include "qgsmaplayerstylecategoriesmodel.h"
#include "qgsapplication.h"

QgsMapLayerStyleCategoriesModel::QgsMapLayerStyleCategoriesModel( QObject *parent )
: QAbstractListModel( parent )
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsmapsavedialog.cpp
Expand Up @@ -40,6 +40,7 @@
#include "qgssettings.h"
#include "qgsmapcanvas.h"
#include "qgsmessagebar.h"
#include "qgsapplication.h"


Q_GUI_EXPORT extern int qt_defaultDpiX();
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsmaptoolselect.cpp
Expand Up @@ -22,6 +22,7 @@
#include "qgsgeometry.h"
#include "qgspointxy.h"
#include "qgis.h"
#include "qgsapplication.h"

#include <QMouseEvent>
#include <QRect>
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgssnappinglayertreemodel.cpp
Expand Up @@ -24,7 +24,7 @@
#include "qgsproject.h"
#include "qgssnappingconfig.h"
#include "qgsvectorlayer.h"

#include "qgsapplication.h"

QgsSnappingLayerDelegate::QgsSnappingLayerDelegate( QgsMapCanvas *canvas, QObject *parent )
: QItemDelegate( parent )
Expand Down
1 change: 1 addition & 0 deletions src/app/qgssourcefieldsproperties.cpp
Expand Up @@ -17,6 +17,7 @@
#include "qgssourcefieldsproperties.h"
#include "qgsvectorlayer.h"
#include "qgsproject.h"
#include "qgsapplication.h"

QgsSourceFieldsProperties::QgsSourceFieldsProperties( QgsVectorLayer *layer, QWidget *parent )
: QWidget( parent )
Expand Down
1 change: 1 addition & 0 deletions src/app/qgsstatisticalsummarydockwidget.cpp
Expand Up @@ -23,6 +23,7 @@
#include "qgsvectorlayer.h"
#include "qgsfeedback.h"
#include "qgsvectorlayerutils.h"
#include "qgsapplication.h"

#include <QTableWidget>
#include <QAction>
Expand Down
1 change: 1 addition & 0 deletions src/core/annotations/qgsannotationmanager.cpp
Expand Up @@ -17,6 +17,7 @@
#include "qgsproject.h"
#include "qgsannotation.h"
#include "qgsannotationregistry.h"
#include "qgsapplication.h"

QgsAnnotationManager::QgsAnnotationManager( QgsProject *project )
: QObject( project )
Expand Down
1 change: 1 addition & 0 deletions src/core/effects/qgseffectstack.cpp
Expand Up @@ -18,6 +18,7 @@
#include "qgseffectstack.h"
#include "qgspainteffectregistry.h"
#include "qgsrendercontext.h"
#include "qgsapplication.h"
#include <QPicture>

QgsEffectStack::QgsEffectStack( const QgsEffectStack &other )
Expand Down
1 change: 1 addition & 0 deletions src/core/effects/qgspainteffectregistry.cpp
Expand Up @@ -20,6 +20,7 @@
#include "qgsgloweffect.h"
#include "qgstransformeffect.h"
#include "qgscoloreffect.h"
#include "qgsapplication.h"

QgsPaintEffectAbstractMetadata::QgsPaintEffectAbstractMetadata( const QString &name, const QString &visibleName )
: mName( name )
Expand Down
1 change: 1 addition & 0 deletions src/core/expression/qgsexpressionfunction.cpp
Expand Up @@ -51,6 +51,7 @@
#include "sqlite3.h"
#include "qgstransaction.h"
#include "qgsthreadingutils.h"
#include "qgsapplication.h"

const QString QgsExpressionFunction::helpText() const
{
Expand Down

0 comments on commit f1760ee

Please sign in to comment.