diff --git a/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in b/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in
index 532ab0bd6db3..b44fc22cd3c2 100644
--- a/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in
+++ b/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in
@@ -22,7 +22,6 @@ A geometry transformer which uses an underlying Ground Control Points (GCP) base
 #include "qgsgcpgeometrytransformer.h"
 %End
   public:
-
     QgsGcpGeometryTransformer( QgsGcpTransformerInterface *gcpTransformer /Transfer/ );
 %Docstring
 Constructor for QgsGcpGeometryTransformer, which uses the specified ``gcpTransformer`` to
diff --git a/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in b/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in
index 8c08c19a4e61..ae24281365e0 100644
--- a/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in
+++ b/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in
@@ -21,15 +21,13 @@ Contains properties of a ground control point (GCP).
 #include "qgsgcppoint.h"
 %End
   public:
-
     enum class PointType
     {
       Source,
       Destination,
     };
 
-    QgsGcpPoint( const QgsPointXY &sourcePoint, const QgsPointXY &destinationPoint,
-                 const QgsCoordinateReferenceSystem &destinationPointCrs, bool enabled = true );
+    QgsGcpPoint( const QgsPointXY &sourcePoint, const QgsPointXY &destinationPoint, const QgsCoordinateReferenceSystem &destinationPointCrs, bool enabled = true );
 %Docstring
 Constructor for QgsGcpPoint.
 
diff --git a/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in b/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in
index 9e0ecdccc175..d8d5b97816e6 100644
--- a/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in
+++ b/python/PyQt6/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in
@@ -26,7 +26,6 @@ based on a transformation method and a list of GCPs.
     static const QMetaObject staticMetaObject;
 
   public:
-
     enum class TransformMethod /BaseType=IntEnum/
     {
       Linear,
diff --git a/python/PyQt6/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in b/python/PyQt6/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in
index 755e71c4dcd7..facb9bebc772 100644
--- a/python/PyQt6/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in
+++ b/python/PyQt6/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in
@@ -21,9 +21,7 @@ Vector layer warper which warps vector layers based on a list of source and dest
 #include "qgsvectorwarper.h"
 %End
   public:
-
-    explicit QgsVectorWarper( QgsGcpTransformerInterface::TransformMethod method, const QList < QgsGcpPoint > &points,
-                              const QgsCoordinateReferenceSystem &destinationCrs );
+    explicit QgsVectorWarper( QgsGcpTransformerInterface::TransformMethod method, const QList<QgsGcpPoint> &points, const QgsCoordinateReferenceSystem &destinationCrs );
 %Docstring
 Constructor for QgsVectorWarper.
 
@@ -32,9 +30,7 @@ Constructor for QgsVectorWarper.
 :param destinationCrs: target CRS for transformed features
 %End
 
-    bool transformFeatures( QgsFeatureIterator &iterator, QgsFeatureSink *sink,
-                            const QgsCoordinateTransformContext &context,
-                            QgsFeedback *feedback = 0 ) const;
+    bool transformFeatures( QgsFeatureIterator &iterator, QgsFeatureSink *sink, const QgsCoordinateTransformContext &context, QgsFeedback *feedback = 0 ) const;
 %Docstring
 Transforms the features from ``iterator`` and adds the results to the specified ``sink``.
 
@@ -63,11 +59,7 @@ A task for warping a vector layer in a background thread.
 #include "qgsvectorwarper.h"
 %End
   public:
-
-    QgsVectorWarperTask( QgsGcpTransformerInterface::TransformMethod method, const QList < QgsGcpPoint > &points,
-                         const QgsCoordinateReferenceSystem &destinationCrs,
-                         QgsVectorLayer *layer,
-                         const QString &fileName );
+    QgsVectorWarperTask( QgsGcpTransformerInterface::TransformMethod method, const QList<QgsGcpPoint> &points, const QgsCoordinateReferenceSystem &destinationCrs, QgsVectorLayer *layer, const QString &fileName );
 %Docstring
 Constructor for QgsVectorWarperTask.
 
@@ -99,7 +91,6 @@ Returns the descriptive error message, if an error occurred.
 %End
 
   protected:
-
     virtual bool run();
 
 
diff --git a/python/PyQt6/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in b/python/PyQt6/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in
index 0c06ad9aa1c3..25d7e2801170 100644
--- a/python/PyQt6/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in
@@ -21,7 +21,6 @@ A class that does interpolation to a grid and writes the results to an ascii gri
 #include "qgsgridfilewriter.h"
 %End
   public:
-
     QgsGridFileWriter( QgsInterpolator *interpolator, const QString &outputPath, const QgsRectangle &extent, int nCols, int nRows );
 %Docstring
 Constructor for QgsGridFileWriter, for the specified ``interpolator``.
diff --git a/python/PyQt6/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in b/python/PyQt6/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in
index 3bbac55630ad..08aac2af5b36 100644
--- a/python/PyQt6/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in
+++ b/python/PyQt6/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsIDWInterpolator: QgsInterpolator
+class QgsIDWInterpolator : QgsInterpolator
 {
 %Docstring(signature="appended")
 Inverse distance weight interpolator.
@@ -19,7 +19,6 @@ Inverse distance weight interpolator.
 #include "qgsidwinterpolator.h"
 %End
   public:
-
     QgsIDWInterpolator( const QList<QgsInterpolator::LayerData> &layerData );
 %Docstring
 Constructor for QgsIDWInterpolator, with the specified ``layerData`` sources.
diff --git a/python/PyQt6/analysis/auto_generated/interpolation/qgsinterpolator.sip.in b/python/PyQt6/analysis/auto_generated/interpolation/qgsinterpolator.sip.in
index 90b915a1e004..68edbd288da0 100644
--- a/python/PyQt6/analysis/auto_generated/interpolation/qgsinterpolator.sip.in
+++ b/python/PyQt6/analysis/auto_generated/interpolation/qgsinterpolator.sip.in
@@ -17,18 +17,17 @@
 
 struct QgsInterpolatorVertexData
 {
-
-  QgsInterpolatorVertexData( double x, double y, double z );
+    QgsInterpolatorVertexData( double x, double y, double z );
 %Docstring
 Constructor for QgsInterpolatorVertexData with the specified
 ``x``, ``y``, and ``z`` coordinate.
 %End
 
-  QgsInterpolatorVertexData();
+    QgsInterpolatorVertexData();
 
-  double x;
-  double y;
-  double z;
+    double x;
+    double y;
+    double z;
 };
 
 class QgsInterpolator
@@ -45,7 +44,6 @@ can be an attribute or the z-coordinates in case of 3D types.
 #include "qgsinterpolator.h"
 %End
   public:
-
     enum SourceType /BaseType=IntEnum/
     {
       SourcePoints,
@@ -70,12 +68,12 @@ can be an attribute or the z-coordinates in case of 3D types.
 
     struct LayerData
     {
-      QgsFeatureSource *source;
-      QgsInterpolator::ValueSource valueSource;
-      int interpolationAttribute;
-      QgsInterpolator::SourceType sourceType;
+        QgsFeatureSource *source;
+        QgsInterpolator::ValueSource valueSource;
+        int interpolationAttribute;
+        QgsInterpolator::SourceType sourceType;
 
-      QgsCoordinateTransformContext transformContext;
+        QgsCoordinateTransformContext transformContext;
     };
 
     QgsInterpolator( const QList<QgsInterpolator::LayerData> &layerData );
@@ -96,7 +94,6 @@ Calculates interpolation value for map coordinates x, y
 
 
   protected:
-
     Result cacheBaseData( QgsFeedback *feedback = 0 );
 %Docstring
 Caches the vertex and value data from the provider. All the vertex data
diff --git a/python/PyQt6/analysis/auto_generated/interpolation/qgstininterpolator.sip.in b/python/PyQt6/analysis/auto_generated/interpolation/qgstininterpolator.sip.in
index 135d41f1639a..2725b8909a8d 100644
--- a/python/PyQt6/analysis/auto_generated/interpolation/qgstininterpolator.sip.in
+++ b/python/PyQt6/analysis/auto_generated/interpolation/qgstininterpolator.sip.in
@@ -10,7 +10,7 @@
 
 
 
-class QgsTinInterpolator: QgsInterpolator
+class QgsTinInterpolator : QgsInterpolator
 {
 %Docstring(signature="appended")
 Interpolation in a triangular irregular network
@@ -20,7 +20,6 @@ Interpolation in a triangular irregular network
 #include "qgstininterpolator.h"
 %End
   public:
-
     enum TinInterpolation /BaseType=IntEnum/
     {
       Linear,
diff --git a/python/PyQt6/analysis/auto_generated/mesh/qgsmeshcontours.sip.in b/python/PyQt6/analysis/auto_generated/mesh/qgsmeshcontours.sip.in
index 4a63803f2cf4..04bb1b27f492 100644
--- a/python/PyQt6/analysis/auto_generated/mesh/qgsmeshcontours.sip.in
+++ b/python/PyQt6/analysis/auto_generated/mesh/qgsmeshcontours.sip.in
@@ -24,7 +24,6 @@ Exporter of contours lines or polygons from a mesh layer.
 #include "qgsmeshcontours.h"
 %End
   public:
-
     QgsMeshContours( QgsMeshLayer *layer );
 %Docstring
 Constructs the mesh contours exporter.
@@ -37,10 +36,7 @@ Caches the native and triangular mesh from data provider
 
     ~QgsMeshContours();
 
-    QgsGeometry exportLines( const QgsMeshDatasetIndex &index,
-                             double value,
-                             QgsMeshRendererScalarSettings::DataResamplingMethod method,
-                             QgsFeedback *feedback = 0 );
+    QgsGeometry exportLines( const QgsMeshDatasetIndex &index, double value, QgsMeshRendererScalarSettings::DataResamplingMethod method, QgsFeedback *feedback = 0 );
 %Docstring
 Exports multi line string containing the contour line for particular dataset and value.
 
@@ -57,11 +53,7 @@ Exports multi line string containing the contour line for particular dataset and
 %End
 
 
-    QgsGeometry exportPolygons( const QgsMeshDatasetIndex &index,
-                                double min_value,
-                                double max_value,
-                                QgsMeshRendererScalarSettings::DataResamplingMethod method,
-                                QgsFeedback *feedback = 0 );
+    QgsGeometry exportPolygons( const QgsMeshDatasetIndex &index, double min_value, double max_value, QgsMeshRendererScalarSettings::DataResamplingMethod method, QgsFeedback *feedback = 0 );
 %Docstring
 Exports multi polygons representing the areas with values in range for particular dataset
 
diff --git a/python/PyQt6/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in b/python/PyQt6/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
index 70e82b153fca..930e38a487a2 100644
--- a/python/PyQt6/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
+++ b/python/PyQt6/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
@@ -24,7 +24,6 @@ Class that handles mesh creation with Delaunay constrained triangulation
 #include "qgsmeshtriangulation.h"
 %End
   public:
-
     QgsMeshTriangulation();
     ~QgsMeshTriangulation();
 
@@ -76,7 +75,7 @@ Sets the coordinate reference system used for the triangulation
 };
 
 
-class QgsMeshZValueDatasetGroup: QgsMeshDatasetGroup
+class QgsMeshZValueDatasetGroup : QgsMeshDatasetGroup
 {
 %Docstring(signature="appended")
 
@@ -89,7 +88,6 @@ Convenient class that can be used to obtain a datasetgroup on vertices that repr
 #include "qgsmeshtriangulation.h"
 %End
   public:
-
     QgsMeshZValueDatasetGroup( const QString &datasetGroupName, const QgsMesh &mesh );
 %Docstring
 Constructor
@@ -129,7 +127,6 @@ a Delaunay triangulation on provided existing vertex.
 #include "qgsmeshtriangulation.h"
 %End
   public:
-
     QgsMeshEditingDelaunayTriangulation();
 
     virtual QString text() const;
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsgraph.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsgraph.sip.in
index a90c7d0e0f56..9675ad10f3ed 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsgraph.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsgraph.sip.in
@@ -22,7 +22,6 @@ This class implements a graph edge
 #include "qgsgraph.h"
 %End
   public:
-
     QgsGraphEdge();
 
     QVariant cost( int strategyIndex ) const;
@@ -32,7 +31,7 @@ Returns edge cost calculated using specified strategy
 :param strategyIndex: strategy index
 %End
 
-    QVector< QVariant > strategies() const;
+    QVector<QVariant> strategies() const;
 %Docstring
 Returns array of available strategies
 %End
@@ -54,7 +53,7 @@ Returns the index of the vertex at the start of this edge.
 };
 
 
-typedef QList< int > QgsGraphEdgeIds;
+typedef QList<int> QgsGraphEdgeIds;
 
 class QgsGraphVertex
 {
@@ -66,7 +65,6 @@ This class implements a graph vertex
 #include "qgsgraph.h"
 %End
   public:
-
     QgsGraphVertex();
 
 
@@ -107,7 +105,6 @@ Mathematical graph representation
 #include "qgsgraph.h"
 %End
   public:
-
     QgsGraph();
 
 
@@ -116,7 +113,7 @@ Mathematical graph representation
 Add a vertex to the graph
 %End
 
-    int addEdge( int fromVertexIdx, int toVertexIdx, const QVector< QVariant > &strategies );
+    int addEdge( int fromVertexIdx, int toVertexIdx, const QVector<QVariant> &strategies );
 %Docstring
 Add an edge to the graph, going from the ``fromVertexIdx``
 to ``toVertexIdx``.
@@ -269,7 +266,6 @@ Returns whether the vertex of the given index exists.
   protected:
 
 
-
 };
 
 /************************************************************************
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsgraphanalyzer.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsgraphanalyzer.sip.in
index ff83b00c31d4..a2f6fdfa5fb8 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsgraphanalyzer.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsgraphanalyzer.sip.in
@@ -22,7 +22,6 @@ points using different strategies with Dijkstra algorithm
 #include "qgsgraphanalyzer.h"
 %End
   public:
-
     static SIP_PYLIST  dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector<int> *resultTree = 0, QVector<double> *resultCost = 0 );
 %Docstring
 Solve shortest path problem using Dijkstra algorithm
@@ -36,8 +35,8 @@ Solve shortest path problem using Dijkstra algorithm
 %End
 
 %MethodCode
-    QVector< int > treeResult;
-    QVector< double > costResult;
+    QVector<int> treeResult;
+    QVector<double> costResult;
     QgsGraphAnalyzer::dijkstra( a0, a1, a2, &treeResult, &costResult );
 
     PyObject *l1 = PyList_New( treeResult.size() );
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilder.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilder.sip.in
index 143b82c2cfc7..6332982c466f 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilder.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilder.sip.in
@@ -21,7 +21,6 @@ This class used for making the :py:class:`QgsGraph` object
 #include "qgsgraphbuilder.h"
 %End
   public:
-
     QgsGraphBuilder( const QgsCoordinateReferenceSystem &crs, bool otfEnabled = true, double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" );
 %Docstring
 Default constructor
@@ -35,7 +34,7 @@ Default constructor
 MANDATORY BUILDER PROPERTY DECLARATION
 %End
 
-    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &prop );
+    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector<QVariant> &prop );
 
 
     QgsGraph graph() const;
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in
index 1f6c8e050f9e..9df0703e11d5 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in
@@ -25,15 +25,13 @@ Determine interface for creating a graph. Contains the settings of the graph.
 #include "qgsgraphbuilderinterface.h"
 %End
 %ConvertToSubClassCode
-    if ( dynamic_cast< QgsGraphBuilder * >( sipCpp ) != NULL )
+    if ( dynamic_cast<QgsGraphBuilder *>( sipCpp ) != NULL )
       sipType = sipType_QgsGraphBuilder;
     else
       sipType = NULL;
 %End
   public:
-
-    QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem &crs, bool ctfEnabled = true,
-                              double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" );
+    QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem &crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" );
 %Docstring
 Default constructor
 
@@ -77,7 +75,7 @@ Add vertex to the graph
    id and pt are redundant. You can use pt or id to identify the vertex
 %End
 
-    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &strategies );
+    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector<QVariant> &strategies );
 %Docstring
 Add edge to the graph
 
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsgraphdirector.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsgraphdirector.sip.in
index 784d993092de..00015eaf2ba7 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsgraphdirector.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsgraphdirector.sip.in
@@ -25,19 +25,15 @@ using "builder" design patter.
 #include "qgsgraphdirector.h"
 %End
 %ConvertToSubClassCode
-    if ( dynamic_cast< QgsVectorLayerDirector * >( sipCpp ) != NULL )
+    if ( dynamic_cast<QgsVectorLayerDirector *>( sipCpp ) != NULL )
       sipType = sipType_QgsVectorLayerDirector;
     else
       sipType = NULL;
 %End
   public:
-
     ~QgsGraphDirector();
 
-    virtual void makeGraph( QgsGraphBuilderInterface *builder,
-                            const QVector< QgsPointXY > &additionalPoints,
-                            QVector< QgsPointXY > &snappedPoints /Out/,
-                            QgsFeedback *feedback = 0 ) const;
+    virtual void makeGraph( QgsGraphBuilderInterface *builder, const QVector<QgsPointXY> &additionalPoints, QVector<QgsPointXY> &snappedPoints /Out/, QgsFeedback *feedback = 0 ) const;
 %Docstring
 Make a graph using :py:class:`QgsGraphBuilder`
 
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in
index 84ae0a9869ae..3e57183c44d0 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in
@@ -19,7 +19,6 @@ used for finding fastest path between two points.
 #include "qgsnetworkspeedstrategy.h"
 %End
   public:
-
     QgsNetworkSpeedStrategy( int attributeId, double defaultValue, double toMetricFactor );
 %Docstring
 Default constructor
@@ -27,7 +26,7 @@ Default constructor
 
     virtual QVariant cost( double distance, const QgsFeature &f ) const;
 
-    virtual QSet< int > requiredAttributes() const;
+    virtual QSet<int> requiredAttributes() const;
 
 
 };
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsnetworkstrategy.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsnetworkstrategy.sip.in
index b6dc5a77420d..57281f356a16 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsnetworkstrategy.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsnetworkstrategy.sip.in
@@ -28,20 +28,19 @@ implemented in the analysis library: :py:class:`QgsNetworkDistanceStrategy` and
 #include "qgsnetworkstrategy.h"
 %End
 %ConvertToSubClassCode
-    if ( dynamic_cast< QgsNetworkDistanceStrategy * >( sipCpp ) != NULL )
+    if ( dynamic_cast<QgsNetworkDistanceStrategy *>( sipCpp ) != NULL )
       sipType = sipType_QgsNetworkDistanceStrategy;
-    else if ( dynamic_cast< QgsNetworkSpeedStrategy * >( sipCpp ) != NULL )
+    else if ( dynamic_cast<QgsNetworkSpeedStrategy *>( sipCpp ) != NULL )
       sipType = sipType_QgsNetworkSpeedStrategy;
     else
       sipType = NULL;
 %End
   public:
-
     QgsNetworkStrategy();
 
     virtual ~QgsNetworkStrategy();
 
-    virtual QSet< int > requiredAttributes() const;
+    virtual QSet<int> requiredAttributes() const;
 %Docstring
 Returns a list of the source layer attributes needed for cost calculation.
 This is method called by :py:class:`QgsGraphDirector`.
diff --git a/python/PyQt6/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in b/python/PyQt6/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in
index 83afefe60044..112b0408ad6f 100644
--- a/python/PyQt6/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in
+++ b/python/PyQt6/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in
@@ -20,7 +20,6 @@ Determine making the graph from vector line layer
 #include "qgsvectorlayerdirector.h"
 %End
   public:
-
     enum Direction /BaseType=IntEnum/
     {
       DirectionForward,
@@ -28,13 +27,7 @@ Determine making the graph from vector line layer
       DirectionBoth,
     };
 
-    QgsVectorLayerDirector( QgsFeatureSource *source,
-                            int directionFieldId,
-                            const QString &directDirectionValue,
-                            const QString &reverseDirectionValue,
-                            const QString &bothDirectionValue,
-                            Direction defaultDirection
-                          );
+    QgsVectorLayerDirector( QgsFeatureSource *source, int directionFieldId, const QString &directDirectionValue, const QString &reverseDirectionValue, const QString &bothDirectionValue, Direction defaultDirection );
 %Docstring
 Default constructor
 
@@ -47,10 +40,8 @@ Default constructor
                          attribute value is not set or does not equal to the given values
 %End
 
-     virtual void makeGraph( QgsGraphBuilderInterface *builder,
-                    const QVector< QgsPointXY > &additionalPoints,
-                    QVector< QgsPointXY> &snappedPoints /Out/,
-                    QgsFeedback *feedback = 0 ) const;
+    virtual void makeGraph( QgsGraphBuilderInterface *builder, const QVector<QgsPointXY> &additionalPoints, QVector<QgsPointXY> &snappedPoints /Out/, QgsFeedback *feedback = 0 ) const;
+
 %Docstring
 MANDATORY DIRECTOR PROPERTY DECLARATION
 %End
diff --git a/python/PyQt6/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in b/python/PyQt6/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in
index 25aa671139d9..49bd91b722c2 100644
--- a/python/PyQt6/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in
+++ b/python/PyQt6/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in
@@ -11,7 +11,7 @@
 
 
 
-class QgsPdalAlgorithms: QgsProcessingProvider
+class QgsPdalAlgorithms : QgsProcessingProvider
 {
 %Docstring(signature="appended")
 PDAL Processing algorithm provider.
@@ -23,7 +23,6 @@ PDAL Processing algorithm provider.
 #include "qgspdalalgorithms.h"
 %End
   public:
-
     QgsPdalAlgorithms( QObject *parent = 0 );
 %Docstring
 Constructor for QgsPdalAlgorithms.
@@ -50,10 +49,8 @@ Constructor for QgsPdalAlgorithms.
 
 
   protected:
-
     virtual void loadAlgorithms();
 
-
 };
 
 /************************************************************************
diff --git a/python/PyQt6/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in b/python/PyQt6/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in
index 0a5d054564c0..aace9625f0c1 100644
--- a/python/PyQt6/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in
+++ b/python/PyQt6/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in
@@ -57,7 +57,6 @@ Example
 #include "qgsalgorithmbatchgeocode.h"
 %End
   public:
-
     QgsBatchGeocodeAlgorithm( QgsGeocoderInterface *geocoder );
 %Docstring
 Constructor for QgsBatchGeocodeAlgorithm.
@@ -85,7 +84,7 @@ exists for the lifetime of this algorithm.
 
     virtual bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback );
 
-    virtual QgsFeatureList processFeature( const QgsFeature &feature,  QgsProcessingContext &, QgsProcessingFeedback *feedback );
+    virtual QgsFeatureList processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback );
 
     virtual QgsCoordinateReferenceSystem outputCrs( const QgsCoordinateReferenceSystem &inputCrs ) const;
 
@@ -97,8 +96,6 @@ exists for the lifetime of this algorithm.
 };
 
 
-
-
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
diff --git a/python/PyQt6/analysis/auto_generated/processing/qgsnativealgorithms.sip.in b/python/PyQt6/analysis/auto_generated/processing/qgsnativealgorithms.sip.in
index b19a98282695..b6a9ff33ceaa 100644
--- a/python/PyQt6/analysis/auto_generated/processing/qgsnativealgorithms.sip.in
+++ b/python/PyQt6/analysis/auto_generated/processing/qgsnativealgorithms.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsNativeAlgorithms: QgsProcessingProvider
+class QgsNativeAlgorithms : QgsProcessingProvider
 {
 %Docstring(signature="appended")
 Native c++ processing algorithm provider.
@@ -19,7 +19,6 @@ Native c++ processing algorithm provider.
 #include "qgsnativealgorithms.h"
 %End
   public:
-
     QgsNativeAlgorithms( QObject *parent = 0 );
 %Docstring
 Constructor for QgsNativeAlgorithms.
@@ -41,14 +40,10 @@ Constructor for QgsNativeAlgorithms.
 
 
   protected:
-
     virtual void loadAlgorithms();
 
-
 };
 
-
-
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
diff --git a/python/PyQt6/analysis/auto_generated/qgsanalysis.sip.in b/python/PyQt6/analysis/auto_generated/qgsanalysis.sip.in
index 802a07d0af48..3eaea4004ab6 100644
--- a/python/PyQt6/analysis/auto_generated/qgsanalysis.sip.in
+++ b/python/PyQt6/analysis/auto_generated/qgsanalysis.sip.in
@@ -25,7 +25,6 @@ related to analysis classes.
 %End
   public:
 
-
     static QgsAnalysis *instance();
 %Docstring
 Returns a pointer to the singleton instance.
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsalignraster.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsalignraster.sip.in
index 5ef171a3a88d..161e46081c06 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsalignraster.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsalignraster.sip.in
@@ -24,7 +24,7 @@ so they have the same:
 
 %TypeHeaderCode
 #include "qgsalignraster.h"
-#include <gdal_version.h>
+#include "gdal_version.h"
 %End
   public:
     QgsAlignRaster();
@@ -94,8 +94,7 @@ Gets raster value at the given coordinates (from the first band)
 
     struct ProgressHandler
     {
-
-      virtual bool progress( double complete ) = 0;
+        virtual bool progress( double complete ) = 0;
 %Docstring
 Method to be overridden for progress reporting.
 
@@ -104,7 +103,7 @@ Method to be overridden for progress reporting.
 :return: ``False`` if the execution should be canceled, ``True`` otherwise
 %End
 
-      virtual ~ProgressHandler();
+        virtual ~ProgressHandler();
     };
 
     void setProgressHandler( ProgressHandler *progressHandler );
@@ -236,7 +235,6 @@ Returns the index of the layer which has smallest cell size (returns -1 on error
 %End
 
   protected:
-
     bool createAndWarp( const Item &raster );
 %Docstring
 Internal function for processing of one raster (1. create output, 2. do the alignment)
@@ -256,7 +254,6 @@ Determine suggested output of raster warp to a different CRS. Returns ``True`` o
 
 
 
-
 };
 
 /************************************************************************
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsaspectfilter.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsaspectfilter.sip.in
index 9901ae72a1ca..8b43cf509149 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsaspectfilter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsaspectfilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsAspectFilter: QgsDerivativeFilter
+class QgsAspectFilter : QgsDerivativeFilter
 {
 %Docstring(signature="appended")
 Calculates aspect values in a window of 3x3 cells based on first order derivatives in x- and y- directions.
@@ -23,9 +23,8 @@ Direction is clockwise starting from north.
   public:
     QgsAspectFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
+
 
 
 };
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsderivativefilter.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsderivativefilter.sip.in
index 86c3cb345ae5..20cfd648267e 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsderivativefilter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsderivativefilter.sip.in
@@ -23,9 +23,8 @@ Needs to be subclassed (e.g. for slope and aspect).
   public:
     QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 ) = 0;
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ) = 0;
+
 
   protected:
     float calcFirstDerX( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ) const;
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgshillshadefilter.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgshillshadefilter.sip.in
index 9dcbd3c51fb9..c8e6614caa96 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgshillshadefilter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgshillshadefilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsHillshadeFilter: QgsDerivativeFilter
+class QgsHillshadeFilter : QgsDerivativeFilter
 {
 %Docstring(signature="appended")
 A hillshade filter.
@@ -19,12 +19,10 @@ A hillshade filter.
 #include "qgshillshadefilter.h"
 %End
   public:
-    QgsHillshadeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat, double lightAzimuth = 300,
-                        double lightAngle = 40 );
+    QgsHillshadeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat, double lightAzimuth = 300, double lightAngle = 40 );
+
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
 
     float lightAzimuth() const;
     void setLightAzimuth( float azimuth );
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgskde.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgskde.sip.in
index 7f70f3aff8fd..2c7b3659e837 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgskde.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgskde.sip.in
@@ -21,7 +21,6 @@ Performs Kernel Density Estimation ("heatmap") calculations on a vector layer.
 #include "qgskde.h"
 %End
   public:
-
     enum KernelShape /BaseType=IntEnum/
     {
       KernelQuartic,
@@ -48,21 +47,21 @@ Performs Kernel Density Estimation ("heatmap") calculations on a vector layer.
 
     struct Parameters
     {
-      QgsFeatureSource *source;
+        QgsFeatureSource *source;
 
-      double radius;
+        double radius;
 
-      QString radiusField;
+        QString radiusField;
 
-      QString weightField;
+        QString weightField;
 
-      double pixelSize;
+        double pixelSize;
 
-      QgsKernelDensityEstimation::KernelShape shape;
+        QgsKernelDensityEstimation::KernelShape shape;
 
-      double decayRatio;
+        double decayRatio;
 
-      QgsKernelDensityEstimation::OutputValues outputValues;
+        QgsKernelDensityEstimation::OutputValues outputValues;
     };
 
     QgsKernelDensityEstimation( const Parameters &parameters, const QString &outputFile, const QString &outputFormat );
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsninecellfilter.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsninecellfilter.sip.in
index 7b3401e7c269..34e70e4c7ea2 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsninecellfilter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsninecellfilter.sip.in
@@ -52,9 +52,7 @@ Starts the calculation, reads from mInputFile and stores the result in mOutputFi
     double outputNodataValue() const;
     void setOutputNodataValue( double value );
 
-    virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                         float *x12, float *x22, float *x32,
-                                         float *x13, float *x23, float *x33 ) = 0;
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ) = 0;
 %Docstring
 Calculates output value from nine input values. The input values and the output
 value can be equal to the nodata value if not present or outside of the border.
@@ -77,7 +75,6 @@ First index of the input cell is the row, second index is the column
 
   protected:
 
-
 };
 
 /************************************************************************
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsrastercalcnode.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
index 058adba89f72..ab645e723c8d 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
@@ -66,7 +66,7 @@ Represents a node in a raster calculator.
     QgsRasterCalcNode( double number );
     QgsRasterCalcNode( QgsRasterMatrix *matrix );
     QgsRasterCalcNode( Operator op, QgsRasterCalcNode *left, QgsRasterCalcNode *right );
-    QgsRasterCalcNode( QString functionName, QVector <QgsRasterCalcNode *> functionArgs );
+    QgsRasterCalcNode( QString functionName, QVector<QgsRasterCalcNode *> functionArgs );
 %Docstring
 Constructor for the tFunction type
 %End
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsrastercalculator.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsrastercalculator.sip.in
index aa3a644a9920..7904a81ee293 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsrastercalculator.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsrastercalculator.sip.in
@@ -20,7 +20,6 @@ Represents an individual raster layer/band number entry within a raster calculat
 #include "qgsrastercalculator.h"
 %End
   public:
-
     static QVector<QgsRasterCalculatorEntry> rasterEntries();
 %Docstring
 Creates a list of raster entries from the current project.
@@ -51,7 +50,6 @@ Performs raster layer calculations.
 #include "qgsrastercalculator.h"
 %End
   public:
-
     enum Result /BaseType=IntEnum/
     {
       Success,
@@ -65,10 +63,7 @@ Performs raster layer calculations.
     };
 
 
-    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                         const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows,
-                         const QVector<QgsRasterCalculatorEntry> &rasterEntries,
-                         const QgsCoordinateTransformContext &transformContext );
+    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries, const QgsCoordinateTransformContext &transformContext );
 %Docstring
 QgsRasterCalculator constructor.
 
@@ -84,11 +79,7 @@ QgsRasterCalculator constructor.
 .. versionadded:: 3.8
 %End
 
-    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                         const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs,
-                         int nOutputColumns, int nOutputRows,
-                         const QVector<QgsRasterCalculatorEntry> &rasterEntries,
-                         const QgsCoordinateTransformContext &transformContext );
+    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries, const QgsCoordinateTransformContext &transformContext );
 %Docstring
 QgsRasterCalculator constructor.
 
@@ -106,8 +97,7 @@ QgsRasterCalculator constructor.
 %End
 
 
- QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                                           const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
+ QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
 %Docstring
 QgsRasterCalculator constructor.
 
@@ -124,8 +114,7 @@ QgsRasterCalculator constructor.
    Use the version with transformContext instead.
 %End
 
- QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                                           const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
+ QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
 %Docstring
 QgsRasterCalculator constructor.
 
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsrastermatrix.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsrastermatrix.sip.in
index 7be134c4f451..fa73ae378b39 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsrastermatrix.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsrastermatrix.sip.in
@@ -19,7 +19,6 @@ Represents a matrix in a raster calculator operation.
 #include "qgsrastermatrix.h"
 %End
   public:
-
     enum TwoArgOperator /BaseType=IntEnum/
     {
       opPLUS,
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsrelief.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsrelief.sip.in
index 807db4ab3f7e..ab3927e4652d 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsrelief.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsrelief.sip.in
@@ -22,10 +22,9 @@ Produces colored relief rasters from DEM.
   public:
     struct ReliefColor
     {
-      ReliefColor( const QColor &c, double min, double max );
-      QColor color;
-      double minElevation;
-      double maxElevation;
+        ReliefColor( const QColor &c, double min, double max );
+        double minElevation;
+        double maxElevation;
     };
 
     QgsRelief( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
@@ -46,10 +45,10 @@ Starts the calculation, reads from mInputFile and stores the result in mOutputFi
 
     void clearReliefColors();
     void addReliefColorClass( const QgsRelief::ReliefColor &color );
-    QList< QgsRelief::ReliefColor > reliefColors() const;
-    void setReliefColors( const QList< QgsRelief::ReliefColor > &c );
+    QList<QgsRelief::ReliefColor> reliefColors() const;
+    void setReliefColors( const QList<QgsRelief::ReliefColor> &c );
 
-    QList< QgsRelief::ReliefColor > calculateOptimizedReliefClasses();
+    QList<QgsRelief::ReliefColor> calculateOptimizedReliefClasses();
 %Docstring
 Calculates class breaks according with the method of Buenzli (2011) using an iterative algorithm for segmented regression
 
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsruggednessfilter.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsruggednessfilter.sip.in
index 54965cb3465b..59f83598b224 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsruggednessfilter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsruggednessfilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsRuggednessFilter: QgsNineCellFilter
+class QgsRuggednessFilter : QgsNineCellFilter
 {
 %Docstring(signature="appended")
 Calculates the ruggedness index based on a 3x3 moving window.
@@ -24,10 +24,8 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top
     QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
   protected:
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
 
 };
 
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsslopefilter.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsslopefilter.sip.in
index 73fac2d11cb2..2d64101533b1 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgsslopefilter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgsslopefilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsSlopeFilter: QgsDerivativeFilter
+class QgsSlopeFilter : QgsDerivativeFilter
 {
 %Docstring(signature="appended")
 Calculates slope values in a window of 3x3 cells based on first order derivatives in x- and y- directions.
@@ -21,9 +21,8 @@ Calculates slope values in a window of 3x3 cells based on first order derivative
   public:
     QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
+
 
 
 };
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in
index b4263cdb0d4d..53e77e56ddd3 100644
--- a/python/PyQt6/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in
+++ b/python/PyQt6/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsTotalCurvatureFilter: QgsNineCellFilter
+class QgsTotalCurvatureFilter : QgsNineCellFilter
 {
 %Docstring(signature="appended")
 Calculates total curvature as described by Wilson, Gallant (2000): terrain analysis.
@@ -22,10 +22,8 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy
     QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
   protected:
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
 };
 
 /************************************************************************
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in
index de6cdfee39df..1d88a29d667f 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in
@@ -26,7 +26,6 @@ A feature pool is based on a vector layer and caches features.
 #include "qgsfeaturepool.h"
 %End
   public:
-
     QgsFeaturePool( QgsVectorLayer *layer );
 %Docstring
 Creates a new feature pool for ``layer``.
@@ -109,7 +108,6 @@ the background thread.
 %End
 
   protected:
-
     void insertFeature( const QgsFeature &feature, bool skipLock = false );
 %Docstring
 Inserts a feature into the cache and the spatial index.
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in
index 651829df0b85..469c42b767b6 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in
@@ -81,10 +81,9 @@ is aware of the available geometry checks.
     static const QMetaObject staticMetaObject;
 
   public:
-
     struct LayerFeatureIds
     {
-      LayerFeatureIds();
+        LayerFeatureIds();
 
 
     };
@@ -120,25 +119,25 @@ is aware of the available geometry checks.
 
     struct Change
     {
-      Change();
+        Change();
 
-      Change( QgsGeometryCheck::ChangeWhat _what, QgsGeometryCheck::ChangeType _type, QgsVertexId _vidx = QgsVertexId() );
+        Change( QgsGeometryCheck::ChangeWhat _what, QgsGeometryCheck::ChangeType _type, QgsVertexId _vidx = QgsVertexId() );
 %Docstring
 Create a new Change
 %End
 
-      QgsGeometryCheck::ChangeWhat what;
+        QgsGeometryCheck::ChangeWhat what;
 
-      QgsGeometryCheck::ChangeType type;
+        QgsGeometryCheck::ChangeType type;
 
-      QgsVertexId vidx;
+        QgsVertexId vidx;
 
-      bool operator==( const QgsGeometryCheck::Change &other ) const;
+        bool operator==( const QgsGeometryCheck::Change &other ) const;
 
-      bool operator!=( const QgsGeometryCheck::Change &other ) const;
+        bool operator!=( const QgsGeometryCheck::Change &other ) const;
     };
 
-    typedef QMap<QString, QMap<QgsFeatureId, QList<QgsGeometryCheck::Change> > > Changes;
+    typedef QMap<QString, QMap<QgsFeatureId, QList<QgsGeometryCheck::Change>>> Changes;
 
     QgsGeometryCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration );
 %Docstring
@@ -237,7 +236,6 @@ Returns the context
 
 
 
-
 };
 
 /************************************************************************
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in
index 544d24973c4d..f974fb0c0a8d 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in
@@ -24,11 +24,7 @@ Base configuration for geometry checks.
 #include "qgsgeometrycheckcontext.h"
 %End
   public:
-
-    QgsGeometryCheckContext( int precision,
-                             const QgsCoordinateReferenceSystem &mapCrs,
-                             const QgsCoordinateTransformContext &transformContext,
-                             const QgsProject *mProject );
+    QgsGeometryCheckContext( int precision, const QgsCoordinateReferenceSystem &mapCrs, const QgsCoordinateTransformContext &transformContext, const QgsProject *mProject );
 %Docstring
 Creates a new QgsGeometryCheckContext.
 %End
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
index f6e6ce4afcd7..0c14feb1d338 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
@@ -27,7 +27,6 @@ This represents an error reported by a geometry check.
 #include "qgsgeometrycheckerror.h"
 %End
   public:
-
     enum Status /BaseType=IntEnum/
     {
       StatusPending,
@@ -43,12 +42,7 @@ This represents an error reported by a geometry check.
       ValueOther
     };
 
-    QgsGeometryCheckError( const QgsGeometryCheck *check,
-                           const QgsGeometryCheckerUtils::LayerFeature &layerFeature,
-                           const QgsPointXY &errorLocation,
-                           QgsVertexId vidx = QgsVertexId(),
-                           const QVariant &value = QVariant(),
-                           ValueType valueType = ValueOther );
+    QgsGeometryCheckError( const QgsGeometryCheck *check, const QgsGeometryCheckerUtils::LayerFeature &layerFeature, const QgsPointXY &errorLocation, QgsVertexId vidx = QgsVertexId(), const QVariant &value = QVariant(), ValueType valueType = ValueOther );
 %Docstring
 Create a new geometry check error with the parent ``check`` and for the
 ``layerFeature`` pair at the ``errorLocation``. Optionally the vertex can be
@@ -179,16 +173,9 @@ Returns an icon that should be shown for this kind of error.
 
 .. versionadded:: 3.8
 %End
-  protected:
 
-    QgsGeometryCheckError( const QgsGeometryCheck *check,
-                           const QString &layerId,
-                           QgsFeatureId featureId,
-                           const QgsGeometry &geometry,
-                           const QgsPointXY &errorLocation,
-                           QgsVertexId vidx = QgsVertexId(),
-                           const QVariant &value = QVariant(),
-                           ValueType valueType = ValueOther );
+  protected:
+    QgsGeometryCheckError( const QgsGeometryCheck *check, const QString &layerId, QgsFeatureId featureId, const QgsGeometry &geometry, const QgsPointXY &errorLocation, QgsVertexId vidx = QgsVertexId(), const QVariant &value = QVariant(), ValueType valueType = ValueOther );
 %Docstring
 Create a new geometry check error with the parent ``check`` and for the
 layer with ``layerId`` and ``featureId``.
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
index b5b13b0b2a7d..d69b97f9ff44 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
@@ -27,7 +27,6 @@ Contains utilities required for geometry checks.
 #include "qgsgeometrycheckerutils.h"
 %End
   public:
-
     class LayerFeature
 {
 %Docstring(signature="appended")
@@ -42,7 +41,6 @@ a set of layers.
 #include "qgsgeometrycheckerutils.h"
 %End
       public:
-
         LayerFeature( const QgsFeaturePool *pool, const QgsFeature &feature, const QgsGeometryCheckContext *context, bool useMapCrs );
 %Docstring
 Create a new layer/feature combination.
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in
index c5e1ca65cc27..f1825bf9411b 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in
@@ -29,7 +29,6 @@ A factory for geometry checks.
 #include "qgsgeometrycheckfactory.h"
 %End
   public:
-
     virtual ~QgsGeometryCheckFactory();
 
     virtual QgsGeometryCheck *createGeometryCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration ) const = 0 /Factory/;
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in
index 2f20e0a5e8ec..2656cc8507cb 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in
@@ -30,7 +30,6 @@ This class manages all known geometry check factories.
 #include "qgsgeometrycheckregistry.h"
 %End
   public:
-
     QgsGeometryCheckRegistry();
 %Docstring
 Constructor for QgsGeometryCheckRegistry. QgsGeometryCheckRegistry is not usually directly created, but rather accessed through
@@ -48,7 +47,7 @@ Ownership is transferred to the caller.
 .. versionadded:: 3.4
 %End
 
-    QList<QgsGeometryCheckFactory *> geometryCheckFactories( QgsVectorLayer *layer,  QgsGeometryCheck::CheckType type, QgsGeometryCheck::Flags flags = QgsGeometryCheck::Flags() ) const;
+    QList<QgsGeometryCheckFactory *> geometryCheckFactories( QgsVectorLayer *layer, QgsGeometryCheck::CheckType type, QgsGeometryCheck::Flags flags = QgsGeometryCheck::Flags() ) const;
 %Docstring
 Returns all geometry check factories that are compatible with ``layer`` and have all of the ``flags`` set.
 
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in
index 56d6451b9bd1..3fc3fbb5e9ae 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in
@@ -20,7 +20,6 @@ This class implements a resolution for problems detected in geometry checks.
 #include "qgsgeometrycheckresolutionmethod.h"
 %End
   public:
-
     QgsGeometryCheckResolutionMethod( int id, const QString &name, const QString &description, bool isStable = true );
 %Docstring
 Creates a new method with the specified parameters.
diff --git a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
index bc5b87fe8246..6c6cca2f6018 100644
--- a/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
@@ -28,7 +28,6 @@ An error from a :py:class:`QgsSingleGeometryCheck`.
 #include "qgssinglegeometrycheck.h"
 %End
   public:
-
     QgsSingleGeometryCheckError( const QgsSingleGeometryCheck *check, const QgsGeometry &geometry, const QgsGeometry &errorLocation, const QgsVertexId &vertexId = QgsVertexId() );
 %Docstring
 Creates a new single geometry check error.
@@ -97,7 +96,6 @@ The single error can be obtained via singleError.
 #include "qgssinglegeometrycheck.h"
 %End
   public:
-
     QgsGeometryCheckErrorSingle( QgsSingleGeometryCheckError *singleError, const QgsGeometryCheckerUtils::LayerFeature &layerFeature );
 %Docstring
 Creates a new error for a :py:class:`QgsSingleGeometryCheck`.
@@ -129,18 +127,13 @@ Subclasses need to implement the processGeometry method.
 #include "qgssinglegeometrycheck.h"
 %End
   public:
-
-    QgsSingleGeometryCheck( const QgsGeometryCheckContext *context,
-                            const QVariantMap &configuration );
+    QgsSingleGeometryCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration );
 %Docstring
 Creates a new single geometry check.
 %End
 
-     virtual void collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools,
-                        QList<QgsGeometryCheckError *> &errors,
-                        QStringList &messages,
-                        QgsFeedback *feedback = 0,
-                        const QgsGeometryCheck::LayerFeatureIds &ids = QgsGeometryCheck::LayerFeatureIds() ) const ${SIP_FINAL};
+    virtual void collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback = 0, const QgsGeometryCheck::LayerFeatureIds &ids = QgsGeometryCheck::LayerFeatureIds() ) const ${SIP_FINAL};
+
 
     virtual QList<QgsSingleGeometryCheckError *> processGeometry( const QgsGeometry &geometry ) const = 0;
 %Docstring
diff --git a/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in b/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in
index e5b9677c66b9..a4df8f87ec3c 100644
--- a/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in
@@ -23,7 +23,6 @@ match the reference layer features within a specified snap tolerance.
 #include "qgsgeometrysnapper.h"
 %End
   public:
-
     enum SnapMode /BaseType=IntEnum/
     {
       PreferNodes,
@@ -89,7 +88,6 @@ the snapped geometries back to the source layer.
 #include "qgsgeometrysnapper.h"
 %End
   public:
-
     QgsInternalGeometrySnapper( double snapTolerance, QgsGeometrySnapper::SnapMode mode = QgsGeometrySnapper::PreferNodes );
 %Docstring
 Constructor for QgsInternalGeometrySnapper. The ``snapTolerance`` and ``mode`` parameters dictate
diff --git a/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in b/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in
index f5dd480a4768..17a19cd24298 100644
--- a/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in
@@ -36,7 +36,6 @@ to run Fix geometries algorithm afterwards.
 #include "qgsgeometrysnappersinglesource.h"
 %End
   public:
-
     static int run( const QgsFeatureSource &source, QgsFeatureSink &sink, double thresh, QgsFeedback *feedback );
 %Docstring
 Run the algorithm on given source and output results to the sink, using threshold value in the source's map units.
diff --git a/python/PyQt6/analysis/auto_generated/vector/qgszonalstatistics.sip.in b/python/PyQt6/analysis/auto_generated/vector/qgszonalstatistics.sip.in
index 40d18c8cec85..419b2c8a328e 100644
--- a/python/PyQt6/analysis/auto_generated/vector/qgszonalstatistics.sip.in
+++ b/python/PyQt6/analysis/auto_generated/vector/qgszonalstatistics.sip.in
@@ -22,12 +22,7 @@ A class that calculates raster statistics (count, sum, mean) for a polygon or mu
 #include "qgszonalstatistics.h"
 %End
   public:
-
-    QgsZonalStatistics( QgsVectorLayer *polygonLayer,
-                        QgsRasterLayer *rasterLayer,
-                        const QString &attributePrefix = QString(),
-                        int rasterBand = 1,
-                        Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
+    QgsZonalStatistics( QgsVectorLayer *polygonLayer, QgsRasterLayer *rasterLayer, const QString &attributePrefix = QString(), int rasterBand = 1, Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
 %Docstring
 Convenience constructor for QgsZonalStatistics, using an input raster layer.
 
@@ -39,14 +34,7 @@ The raster layer must exist for the lifetime of the zonal statistics calculation
    the constructor which accepts a :py:class:`QgsRasterInterface` should be used instead.
 %End
 
-    QgsZonalStatistics( QgsVectorLayer *polygonLayer,
-                        QgsRasterInterface *rasterInterface,
-                        const QgsCoordinateReferenceSystem &rasterCrs,
-                        double rasterUnitsPerPixelX,
-                        double rasterUnitsPerPixelY,
-                        const QString &attributePrefix = QString(),
-                        int rasterBand = 1,
-                        Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
+    QgsZonalStatistics( QgsVectorLayer *polygonLayer, QgsRasterInterface *rasterInterface, const QgsCoordinateReferenceSystem &rasterCrs, double rasterUnitsPerPixelX, double rasterUnitsPerPixelY, const QString &attributePrefix = QString(), int rasterBand = 1, Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
 %Docstring
 Constructor for QgsZonalStatistics, using a QgsRasterInterface.
 
diff --git a/python/PyQt6/core/auto_generated/gps/qgsgpsconnection.sip.in b/python/PyQt6/core/auto_generated/gps/qgsgpsconnection.sip.in
index c1a171dc9026..7ad5dc425e5a 100644
--- a/python/PyQt6/core/auto_generated/gps/qgsgpsconnection.sip.in
+++ b/python/PyQt6/core/auto_generated/gps/qgsgpsconnection.sip.in
@@ -25,8 +25,8 @@ Abstract base class for connection to a GPS device
 
 %TypeHeaderCode
 #include "qgsgpsconnection.h"
-#include <qgsgpsdconnection.h>
-#include <qgsnmeaconnection.h>
+#include "qgsgpsdconnection.h"
+#include "qgsnmeaconnection.h"
 %End
 %ConvertToSubClassCode
     if ( sipCpp->inherits( "QgsGpsdConnection" ) )
diff --git a/python/PyQt6/core/auto_generated/layout/qgslayoutobject.sip.in b/python/PyQt6/core/auto_generated/layout/qgslayoutobject.sip.in
index 02fdd27f35be..09f395860130 100644
--- a/python/PyQt6/core/auto_generated/layout/qgslayoutobject.sip.in
+++ b/python/PyQt6/core/auto_generated/layout/qgslayoutobject.sip.in
@@ -17,7 +17,7 @@ A base class for objects which belong to a layout.
 
 %TypeHeaderCode
 #include "qgslayoutobject.h"
-#include <qgslayoutitem.h>
+#include "qgslayoutitem.h"
 #include "qgslayoutitemgroup.h"
 #include "qgslayoutitemmap.h"
 #include "qgslayoutitempicture.h"
diff --git a/python/PyQt6/core/auto_generated/raster/qgsrasterinterface.sip.in b/python/PyQt6/core/auto_generated/raster/qgsrasterinterface.sip.in
index 734e9cc7fbe8..1cf75a936d19 100644
--- a/python/PyQt6/core/auto_generated/raster/qgsrasterinterface.sip.in
+++ b/python/PyQt6/core/auto_generated/raster/qgsrasterinterface.sip.in
@@ -109,24 +109,21 @@ Base class for processing filters like renderers, reprojector, resampler etc.
 
 %TypeHeaderCode
 #include "qgsrasterinterface.h"
-// QgsRasterInterface subclasses
-#include <qgsbrightnesscontrastfilter.h>
-#include <qgshuesaturationfilter.h>
-#include <qgsrasterdataprovider.h>
-#include <qgsrasternuller.h>
-#include <qgsrasterprojector.h>
-#include <qgsrasterrenderer.h>
-#include <qgsrasterresamplefilter.h>
-
-// QgsRasterRenderer subclasses
-#include <qgshillshaderenderer.h>
-#include <qgsmultibandcolorrenderer.h>
-#include <qgspalettedrasterrenderer.h>
-#include <qgssinglebandcolordatarenderer.h>
-#include <qgssinglebandgrayrenderer.h>
-#include <qgssinglebandpseudocolorrenderer.h>
-#include <qgsrastersinglecolorrenderer.h>
-#include <qgsrastercontourrenderer.h>
+#include "qgsbrightnesscontrastfilter.h"
+#include "qgshuesaturationfilter.h"
+#include "qgsrasterdataprovider.h"
+#include "qgsrasternuller.h"
+#include "qgsrasterprojector.h"
+#include "qgsrasterrenderer.h"
+#include "qgsrasterresamplefilter.h"
+#include "qgshillshaderenderer.h"
+#include "qgsmultibandcolorrenderer.h"
+#include "qgspalettedrasterrenderer.h"
+#include "qgssinglebandcolordatarenderer.h"
+#include "qgssinglebandgrayrenderer.h"
+#include "qgssinglebandpseudocolorrenderer.h"
+#include "qgsrastersinglecolorrenderer.h"
+#include "qgsrastercontourrenderer.h"
 %End
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsBrightnessContrastFilter *>( sipCpp ) )
diff --git a/python/PyQt6/core/auto_generated/raster/qgsrastershaderfunction.sip.in b/python/PyQt6/core/auto_generated/raster/qgsrastershaderfunction.sip.in
index f06535e80132..a7cda85fd909 100644
--- a/python/PyQt6/core/auto_generated/raster/qgsrastershaderfunction.sip.in
+++ b/python/PyQt6/core/auto_generated/raster/qgsrastershaderfunction.sip.in
@@ -20,7 +20,7 @@ typically used to render grayscale images as false color.
 
 %TypeHeaderCode
 #include "qgsrastershaderfunction.h"
-#include <qgscolorrampshader.h>
+#include "qgscolorrampshader.h"
 %End
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsColorRampShader *>( sipCpp ) != NULL )
diff --git a/python/PyQt6/core/auto_generated/symbology/qgssymbollayer.sip.in b/python/PyQt6/core/auto_generated/symbology/qgssymbollayer.sip.in
index f752a83ded4b..1fc8cb3e9da4 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgssymbollayer.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgssymbollayer.sip.in
@@ -17,7 +17,7 @@ class QgsSymbolLayer
 
 %TypeHeaderCode
 #include "qgssymbollayer.h"
-#include <qgslinesymbollayer.h>
+#include "qgslinesymbollayer.h"
 %End
 %ConvertToSubClassCode
     switch ( sipCpp->type() )
diff --git a/python/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in b/python/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in
index 532ab0bd6db3..b44fc22cd3c2 100644
--- a/python/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in
+++ b/python/analysis/auto_generated/georeferencing/qgsgcpgeometrytransformer.sip.in
@@ -22,7 +22,6 @@ A geometry transformer which uses an underlying Ground Control Points (GCP) base
 #include "qgsgcpgeometrytransformer.h"
 %End
   public:
-
     QgsGcpGeometryTransformer( QgsGcpTransformerInterface *gcpTransformer /Transfer/ );
 %Docstring
 Constructor for QgsGcpGeometryTransformer, which uses the specified ``gcpTransformer`` to
diff --git a/python/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in b/python/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in
index 8c08c19a4e61..ae24281365e0 100644
--- a/python/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in
+++ b/python/analysis/auto_generated/georeferencing/qgsgcppoint.sip.in
@@ -21,15 +21,13 @@ Contains properties of a ground control point (GCP).
 #include "qgsgcppoint.h"
 %End
   public:
-
     enum class PointType
     {
       Source,
       Destination,
     };
 
-    QgsGcpPoint( const QgsPointXY &sourcePoint, const QgsPointXY &destinationPoint,
-                 const QgsCoordinateReferenceSystem &destinationPointCrs, bool enabled = true );
+    QgsGcpPoint( const QgsPointXY &sourcePoint, const QgsPointXY &destinationPoint, const QgsCoordinateReferenceSystem &destinationPointCrs, bool enabled = true );
 %Docstring
 Constructor for QgsGcpPoint.
 
diff --git a/python/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in b/python/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in
index 29c9a075ce05..d28b796a6ba7 100644
--- a/python/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in
+++ b/python/analysis/auto_generated/georeferencing/qgsgcptransformer.sip.in
@@ -26,7 +26,6 @@ based on a transformation method and a list of GCPs.
     static const QMetaObject staticMetaObject;
 
   public:
-
     enum class TransformMethod
     {
       Linear,
diff --git a/python/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in b/python/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in
index 755e71c4dcd7..facb9bebc772 100644
--- a/python/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in
+++ b/python/analysis/auto_generated/georeferencing/qgsvectorwarper.sip.in
@@ -21,9 +21,7 @@ Vector layer warper which warps vector layers based on a list of source and dest
 #include "qgsvectorwarper.h"
 %End
   public:
-
-    explicit QgsVectorWarper( QgsGcpTransformerInterface::TransformMethod method, const QList < QgsGcpPoint > &points,
-                              const QgsCoordinateReferenceSystem &destinationCrs );
+    explicit QgsVectorWarper( QgsGcpTransformerInterface::TransformMethod method, const QList<QgsGcpPoint> &points, const QgsCoordinateReferenceSystem &destinationCrs );
 %Docstring
 Constructor for QgsVectorWarper.
 
@@ -32,9 +30,7 @@ Constructor for QgsVectorWarper.
 :param destinationCrs: target CRS for transformed features
 %End
 
-    bool transformFeatures( QgsFeatureIterator &iterator, QgsFeatureSink *sink,
-                            const QgsCoordinateTransformContext &context,
-                            QgsFeedback *feedback = 0 ) const;
+    bool transformFeatures( QgsFeatureIterator &iterator, QgsFeatureSink *sink, const QgsCoordinateTransformContext &context, QgsFeedback *feedback = 0 ) const;
 %Docstring
 Transforms the features from ``iterator`` and adds the results to the specified ``sink``.
 
@@ -63,11 +59,7 @@ A task for warping a vector layer in a background thread.
 #include "qgsvectorwarper.h"
 %End
   public:
-
-    QgsVectorWarperTask( QgsGcpTransformerInterface::TransformMethod method, const QList < QgsGcpPoint > &points,
-                         const QgsCoordinateReferenceSystem &destinationCrs,
-                         QgsVectorLayer *layer,
-                         const QString &fileName );
+    QgsVectorWarperTask( QgsGcpTransformerInterface::TransformMethod method, const QList<QgsGcpPoint> &points, const QgsCoordinateReferenceSystem &destinationCrs, QgsVectorLayer *layer, const QString &fileName );
 %Docstring
 Constructor for QgsVectorWarperTask.
 
@@ -99,7 +91,6 @@ Returns the descriptive error message, if an error occurred.
 %End
 
   protected:
-
     virtual bool run();
 
 
diff --git a/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in b/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in
index 0c06ad9aa1c3..25d7e2801170 100644
--- a/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in
+++ b/python/analysis/auto_generated/interpolation/qgsgridfilewriter.sip.in
@@ -21,7 +21,6 @@ A class that does interpolation to a grid and writes the results to an ascii gri
 #include "qgsgridfilewriter.h"
 %End
   public:
-
     QgsGridFileWriter( QgsInterpolator *interpolator, const QString &outputPath, const QgsRectangle &extent, int nCols, int nRows );
 %Docstring
 Constructor for QgsGridFileWriter, for the specified ``interpolator``.
diff --git a/python/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in b/python/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in
index 3bbac55630ad..08aac2af5b36 100644
--- a/python/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in
+++ b/python/analysis/auto_generated/interpolation/qgsidwinterpolator.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsIDWInterpolator: QgsInterpolator
+class QgsIDWInterpolator : QgsInterpolator
 {
 %Docstring(signature="appended")
 Inverse distance weight interpolator.
@@ -19,7 +19,6 @@ Inverse distance weight interpolator.
 #include "qgsidwinterpolator.h"
 %End
   public:
-
     QgsIDWInterpolator( const QList<QgsInterpolator::LayerData> &layerData );
 %Docstring
 Constructor for QgsIDWInterpolator, with the specified ``layerData`` sources.
diff --git a/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in b/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in
index 587b707570a0..683c8d2cee36 100644
--- a/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in
+++ b/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in
@@ -17,18 +17,17 @@
 
 struct QgsInterpolatorVertexData
 {
-
-  QgsInterpolatorVertexData( double x, double y, double z );
+    QgsInterpolatorVertexData( double x, double y, double z );
 %Docstring
 Constructor for QgsInterpolatorVertexData with the specified
 ``x``, ``y``, and ``z`` coordinate.
 %End
 
-  QgsInterpolatorVertexData();
+    QgsInterpolatorVertexData();
 
-  double x;
-  double y;
-  double z;
+    double x;
+    double y;
+    double z;
 };
 
 class QgsInterpolator
@@ -45,7 +44,6 @@ can be an attribute or the z-coordinates in case of 3D types.
 #include "qgsinterpolator.h"
 %End
   public:
-
     enum SourceType
     {
       SourcePoints,
@@ -70,12 +68,12 @@ can be an attribute or the z-coordinates in case of 3D types.
 
     struct LayerData
     {
-      QgsFeatureSource *source;
-      QgsInterpolator::ValueSource valueSource;
-      int interpolationAttribute;
-      QgsInterpolator::SourceType sourceType;
+        QgsFeatureSource *source;
+        QgsInterpolator::ValueSource valueSource;
+        int interpolationAttribute;
+        QgsInterpolator::SourceType sourceType;
 
-      QgsCoordinateTransformContext transformContext;
+        QgsCoordinateTransformContext transformContext;
     };
 
     QgsInterpolator( const QList<QgsInterpolator::LayerData> &layerData );
@@ -96,7 +94,6 @@ Calculates interpolation value for map coordinates x, y
 
 
   protected:
-
     Result cacheBaseData( QgsFeedback *feedback = 0 );
 %Docstring
 Caches the vertex and value data from the provider. All the vertex data
diff --git a/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in b/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in
index d33a522b2359..92180a87feef 100644
--- a/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in
+++ b/python/analysis/auto_generated/interpolation/qgstininterpolator.sip.in
@@ -10,7 +10,7 @@
 
 
 
-class QgsTinInterpolator: QgsInterpolator
+class QgsTinInterpolator : QgsInterpolator
 {
 %Docstring(signature="appended")
 Interpolation in a triangular irregular network
@@ -20,7 +20,6 @@ Interpolation in a triangular irregular network
 #include "qgstininterpolator.h"
 %End
   public:
-
     enum TinInterpolation
     {
       Linear,
diff --git a/python/analysis/auto_generated/mesh/qgsmeshcontours.sip.in b/python/analysis/auto_generated/mesh/qgsmeshcontours.sip.in
index 4a63803f2cf4..04bb1b27f492 100644
--- a/python/analysis/auto_generated/mesh/qgsmeshcontours.sip.in
+++ b/python/analysis/auto_generated/mesh/qgsmeshcontours.sip.in
@@ -24,7 +24,6 @@ Exporter of contours lines or polygons from a mesh layer.
 #include "qgsmeshcontours.h"
 %End
   public:
-
     QgsMeshContours( QgsMeshLayer *layer );
 %Docstring
 Constructs the mesh contours exporter.
@@ -37,10 +36,7 @@ Caches the native and triangular mesh from data provider
 
     ~QgsMeshContours();
 
-    QgsGeometry exportLines( const QgsMeshDatasetIndex &index,
-                             double value,
-                             QgsMeshRendererScalarSettings::DataResamplingMethod method,
-                             QgsFeedback *feedback = 0 );
+    QgsGeometry exportLines( const QgsMeshDatasetIndex &index, double value, QgsMeshRendererScalarSettings::DataResamplingMethod method, QgsFeedback *feedback = 0 );
 %Docstring
 Exports multi line string containing the contour line for particular dataset and value.
 
@@ -57,11 +53,7 @@ Exports multi line string containing the contour line for particular dataset and
 %End
 
 
-    QgsGeometry exportPolygons( const QgsMeshDatasetIndex &index,
-                                double min_value,
-                                double max_value,
-                                QgsMeshRendererScalarSettings::DataResamplingMethod method,
-                                QgsFeedback *feedback = 0 );
+    QgsGeometry exportPolygons( const QgsMeshDatasetIndex &index, double min_value, double max_value, QgsMeshRendererScalarSettings::DataResamplingMethod method, QgsFeedback *feedback = 0 );
 %Docstring
 Exports multi polygons representing the areas with values in range for particular dataset
 
diff --git a/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in b/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
index 70e82b153fca..930e38a487a2 100644
--- a/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
+++ b/python/analysis/auto_generated/mesh/qgsmeshtriangulation.sip.in
@@ -24,7 +24,6 @@ Class that handles mesh creation with Delaunay constrained triangulation
 #include "qgsmeshtriangulation.h"
 %End
   public:
-
     QgsMeshTriangulation();
     ~QgsMeshTriangulation();
 
@@ -76,7 +75,7 @@ Sets the coordinate reference system used for the triangulation
 };
 
 
-class QgsMeshZValueDatasetGroup: QgsMeshDatasetGroup
+class QgsMeshZValueDatasetGroup : QgsMeshDatasetGroup
 {
 %Docstring(signature="appended")
 
@@ -89,7 +88,6 @@ Convenient class that can be used to obtain a datasetgroup on vertices that repr
 #include "qgsmeshtriangulation.h"
 %End
   public:
-
     QgsMeshZValueDatasetGroup( const QString &datasetGroupName, const QgsMesh &mesh );
 %Docstring
 Constructor
@@ -129,7 +127,6 @@ a Delaunay triangulation on provided existing vertex.
 #include "qgsmeshtriangulation.h"
 %End
   public:
-
     QgsMeshEditingDelaunayTriangulation();
 
     virtual QString text() const;
diff --git a/python/analysis/auto_generated/network/qgsgraph.sip.in b/python/analysis/auto_generated/network/qgsgraph.sip.in
index a90c7d0e0f56..9675ad10f3ed 100644
--- a/python/analysis/auto_generated/network/qgsgraph.sip.in
+++ b/python/analysis/auto_generated/network/qgsgraph.sip.in
@@ -22,7 +22,6 @@ This class implements a graph edge
 #include "qgsgraph.h"
 %End
   public:
-
     QgsGraphEdge();
 
     QVariant cost( int strategyIndex ) const;
@@ -32,7 +31,7 @@ Returns edge cost calculated using specified strategy
 :param strategyIndex: strategy index
 %End
 
-    QVector< QVariant > strategies() const;
+    QVector<QVariant> strategies() const;
 %Docstring
 Returns array of available strategies
 %End
@@ -54,7 +53,7 @@ Returns the index of the vertex at the start of this edge.
 };
 
 
-typedef QList< int > QgsGraphEdgeIds;
+typedef QList<int> QgsGraphEdgeIds;
 
 class QgsGraphVertex
 {
@@ -66,7 +65,6 @@ This class implements a graph vertex
 #include "qgsgraph.h"
 %End
   public:
-
     QgsGraphVertex();
 
 
@@ -107,7 +105,6 @@ Mathematical graph representation
 #include "qgsgraph.h"
 %End
   public:
-
     QgsGraph();
 
 
@@ -116,7 +113,7 @@ Mathematical graph representation
 Add a vertex to the graph
 %End
 
-    int addEdge( int fromVertexIdx, int toVertexIdx, const QVector< QVariant > &strategies );
+    int addEdge( int fromVertexIdx, int toVertexIdx, const QVector<QVariant> &strategies );
 %Docstring
 Add an edge to the graph, going from the ``fromVertexIdx``
 to ``toVertexIdx``.
@@ -269,7 +266,6 @@ Returns whether the vertex of the given index exists.
   protected:
 
 
-
 };
 
 /************************************************************************
diff --git a/python/analysis/auto_generated/network/qgsgraphanalyzer.sip.in b/python/analysis/auto_generated/network/qgsgraphanalyzer.sip.in
index ff83b00c31d4..a2f6fdfa5fb8 100644
--- a/python/analysis/auto_generated/network/qgsgraphanalyzer.sip.in
+++ b/python/analysis/auto_generated/network/qgsgraphanalyzer.sip.in
@@ -22,7 +22,6 @@ points using different strategies with Dijkstra algorithm
 #include "qgsgraphanalyzer.h"
 %End
   public:
-
     static SIP_PYLIST  dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector<int> *resultTree = 0, QVector<double> *resultCost = 0 );
 %Docstring
 Solve shortest path problem using Dijkstra algorithm
@@ -36,8 +35,8 @@ Solve shortest path problem using Dijkstra algorithm
 %End
 
 %MethodCode
-    QVector< int > treeResult;
-    QVector< double > costResult;
+    QVector<int> treeResult;
+    QVector<double> costResult;
     QgsGraphAnalyzer::dijkstra( a0, a1, a2, &treeResult, &costResult );
 
     PyObject *l1 = PyList_New( treeResult.size() );
diff --git a/python/analysis/auto_generated/network/qgsgraphbuilder.sip.in b/python/analysis/auto_generated/network/qgsgraphbuilder.sip.in
index 143b82c2cfc7..6332982c466f 100644
--- a/python/analysis/auto_generated/network/qgsgraphbuilder.sip.in
+++ b/python/analysis/auto_generated/network/qgsgraphbuilder.sip.in
@@ -21,7 +21,6 @@ This class used for making the :py:class:`QgsGraph` object
 #include "qgsgraphbuilder.h"
 %End
   public:
-
     QgsGraphBuilder( const QgsCoordinateReferenceSystem &crs, bool otfEnabled = true, double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" );
 %Docstring
 Default constructor
@@ -35,7 +34,7 @@ Default constructor
 MANDATORY BUILDER PROPERTY DECLARATION
 %End
 
-    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &prop );
+    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector<QVariant> &prop );
 
 
     QgsGraph graph() const;
diff --git a/python/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in b/python/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in
index 1f6c8e050f9e..9df0703e11d5 100644
--- a/python/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in
+++ b/python/analysis/auto_generated/network/qgsgraphbuilderinterface.sip.in
@@ -25,15 +25,13 @@ Determine interface for creating a graph. Contains the settings of the graph.
 #include "qgsgraphbuilderinterface.h"
 %End
 %ConvertToSubClassCode
-    if ( dynamic_cast< QgsGraphBuilder * >( sipCpp ) != NULL )
+    if ( dynamic_cast<QgsGraphBuilder *>( sipCpp ) != NULL )
       sipType = sipType_QgsGraphBuilder;
     else
       sipType = NULL;
 %End
   public:
-
-    QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem &crs, bool ctfEnabled = true,
-                              double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" );
+    QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem &crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString &ellipsoidID = "WGS84" );
 %Docstring
 Default constructor
 
@@ -77,7 +75,7 @@ Add vertex to the graph
    id and pt are redundant. You can use pt or id to identify the vertex
 %End
 
-    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &strategies );
+    virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector<QVariant> &strategies );
 %Docstring
 Add edge to the graph
 
diff --git a/python/analysis/auto_generated/network/qgsgraphdirector.sip.in b/python/analysis/auto_generated/network/qgsgraphdirector.sip.in
index 784d993092de..00015eaf2ba7 100644
--- a/python/analysis/auto_generated/network/qgsgraphdirector.sip.in
+++ b/python/analysis/auto_generated/network/qgsgraphdirector.sip.in
@@ -25,19 +25,15 @@ using "builder" design patter.
 #include "qgsgraphdirector.h"
 %End
 %ConvertToSubClassCode
-    if ( dynamic_cast< QgsVectorLayerDirector * >( sipCpp ) != NULL )
+    if ( dynamic_cast<QgsVectorLayerDirector *>( sipCpp ) != NULL )
       sipType = sipType_QgsVectorLayerDirector;
     else
       sipType = NULL;
 %End
   public:
-
     ~QgsGraphDirector();
 
-    virtual void makeGraph( QgsGraphBuilderInterface *builder,
-                            const QVector< QgsPointXY > &additionalPoints,
-                            QVector< QgsPointXY > &snappedPoints /Out/,
-                            QgsFeedback *feedback = 0 ) const;
+    virtual void makeGraph( QgsGraphBuilderInterface *builder, const QVector<QgsPointXY> &additionalPoints, QVector<QgsPointXY> &snappedPoints /Out/, QgsFeedback *feedback = 0 ) const;
 %Docstring
 Make a graph using :py:class:`QgsGraphBuilder`
 
diff --git a/python/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in b/python/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in
index 84ae0a9869ae..3e57183c44d0 100644
--- a/python/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in
+++ b/python/analysis/auto_generated/network/qgsnetworkspeedstrategy.sip.in
@@ -19,7 +19,6 @@ used for finding fastest path between two points.
 #include "qgsnetworkspeedstrategy.h"
 %End
   public:
-
     QgsNetworkSpeedStrategy( int attributeId, double defaultValue, double toMetricFactor );
 %Docstring
 Default constructor
@@ -27,7 +26,7 @@ Default constructor
 
     virtual QVariant cost( double distance, const QgsFeature &f ) const;
 
-    virtual QSet< int > requiredAttributes() const;
+    virtual QSet<int> requiredAttributes() const;
 
 
 };
diff --git a/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in b/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in
index b6dc5a77420d..57281f356a16 100644
--- a/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in
+++ b/python/analysis/auto_generated/network/qgsnetworkstrategy.sip.in
@@ -28,20 +28,19 @@ implemented in the analysis library: :py:class:`QgsNetworkDistanceStrategy` and
 #include "qgsnetworkstrategy.h"
 %End
 %ConvertToSubClassCode
-    if ( dynamic_cast< QgsNetworkDistanceStrategy * >( sipCpp ) != NULL )
+    if ( dynamic_cast<QgsNetworkDistanceStrategy *>( sipCpp ) != NULL )
       sipType = sipType_QgsNetworkDistanceStrategy;
-    else if ( dynamic_cast< QgsNetworkSpeedStrategy * >( sipCpp ) != NULL )
+    else if ( dynamic_cast<QgsNetworkSpeedStrategy *>( sipCpp ) != NULL )
       sipType = sipType_QgsNetworkSpeedStrategy;
     else
       sipType = NULL;
 %End
   public:
-
     QgsNetworkStrategy();
 
     virtual ~QgsNetworkStrategy();
 
-    virtual QSet< int > requiredAttributes() const;
+    virtual QSet<int> requiredAttributes() const;
 %Docstring
 Returns a list of the source layer attributes needed for cost calculation.
 This is method called by :py:class:`QgsGraphDirector`.
diff --git a/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in b/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in
index d6cc9ed82138..d61c5fa0ee46 100644
--- a/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in
+++ b/python/analysis/auto_generated/network/qgsvectorlayerdirector.sip.in
@@ -20,7 +20,6 @@ Determine making the graph from vector line layer
 #include "qgsvectorlayerdirector.h"
 %End
   public:
-
     enum Direction
     {
       DirectionForward,
@@ -28,13 +27,7 @@ Determine making the graph from vector line layer
       DirectionBoth,
     };
 
-    QgsVectorLayerDirector( QgsFeatureSource *source,
-                            int directionFieldId,
-                            const QString &directDirectionValue,
-                            const QString &reverseDirectionValue,
-                            const QString &bothDirectionValue,
-                            Direction defaultDirection
-                          );
+    QgsVectorLayerDirector( QgsFeatureSource *source, int directionFieldId, const QString &directDirectionValue, const QString &reverseDirectionValue, const QString &bothDirectionValue, Direction defaultDirection );
 %Docstring
 Default constructor
 
@@ -47,10 +40,8 @@ Default constructor
                          attribute value is not set or does not equal to the given values
 %End
 
-     virtual void makeGraph( QgsGraphBuilderInterface *builder,
-                    const QVector< QgsPointXY > &additionalPoints,
-                    QVector< QgsPointXY> &snappedPoints /Out/,
-                    QgsFeedback *feedback = 0 ) const;
+    virtual void makeGraph( QgsGraphBuilderInterface *builder, const QVector<QgsPointXY> &additionalPoints, QVector<QgsPointXY> &snappedPoints /Out/, QgsFeedback *feedback = 0 ) const;
+
 %Docstring
 MANDATORY DIRECTOR PROPERTY DECLARATION
 %End
diff --git a/python/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in b/python/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in
index 25aa671139d9..49bd91b722c2 100644
--- a/python/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in
+++ b/python/analysis/auto_generated/processing/pdal/qgspdalalgorithms.sip.in
@@ -11,7 +11,7 @@
 
 
 
-class QgsPdalAlgorithms: QgsProcessingProvider
+class QgsPdalAlgorithms : QgsProcessingProvider
 {
 %Docstring(signature="appended")
 PDAL Processing algorithm provider.
@@ -23,7 +23,6 @@ PDAL Processing algorithm provider.
 #include "qgspdalalgorithms.h"
 %End
   public:
-
     QgsPdalAlgorithms( QObject *parent = 0 );
 %Docstring
 Constructor for QgsPdalAlgorithms.
@@ -50,10 +49,8 @@ Constructor for QgsPdalAlgorithms.
 
 
   protected:
-
     virtual void loadAlgorithms();
 
-
 };
 
 /************************************************************************
diff --git a/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in b/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in
index 0a5d054564c0..aace9625f0c1 100644
--- a/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in
+++ b/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in
@@ -57,7 +57,6 @@ Example
 #include "qgsalgorithmbatchgeocode.h"
 %End
   public:
-
     QgsBatchGeocodeAlgorithm( QgsGeocoderInterface *geocoder );
 %Docstring
 Constructor for QgsBatchGeocodeAlgorithm.
@@ -85,7 +84,7 @@ exists for the lifetime of this algorithm.
 
     virtual bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback );
 
-    virtual QgsFeatureList processFeature( const QgsFeature &feature,  QgsProcessingContext &, QgsProcessingFeedback *feedback );
+    virtual QgsFeatureList processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback *feedback );
 
     virtual QgsCoordinateReferenceSystem outputCrs( const QgsCoordinateReferenceSystem &inputCrs ) const;
 
@@ -97,8 +96,6 @@ exists for the lifetime of this algorithm.
 };
 
 
-
-
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
diff --git a/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in b/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in
index b19a98282695..b6a9ff33ceaa 100644
--- a/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in
+++ b/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsNativeAlgorithms: QgsProcessingProvider
+class QgsNativeAlgorithms : QgsProcessingProvider
 {
 %Docstring(signature="appended")
 Native c++ processing algorithm provider.
@@ -19,7 +19,6 @@ Native c++ processing algorithm provider.
 #include "qgsnativealgorithms.h"
 %End
   public:
-
     QgsNativeAlgorithms( QObject *parent = 0 );
 %Docstring
 Constructor for QgsNativeAlgorithms.
@@ -41,14 +40,10 @@ Constructor for QgsNativeAlgorithms.
 
 
   protected:
-
     virtual void loadAlgorithms();
 
-
 };
 
-
-
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
diff --git a/python/analysis/auto_generated/qgsanalysis.sip.in b/python/analysis/auto_generated/qgsanalysis.sip.in
index 802a07d0af48..3eaea4004ab6 100644
--- a/python/analysis/auto_generated/qgsanalysis.sip.in
+++ b/python/analysis/auto_generated/qgsanalysis.sip.in
@@ -25,7 +25,6 @@ related to analysis classes.
 %End
   public:
 
-
     static QgsAnalysis *instance();
 %Docstring
 Returns a pointer to the singleton instance.
diff --git a/python/analysis/auto_generated/raster/qgsalignraster.sip.in b/python/analysis/auto_generated/raster/qgsalignraster.sip.in
index 5ef171a3a88d..161e46081c06 100644
--- a/python/analysis/auto_generated/raster/qgsalignraster.sip.in
+++ b/python/analysis/auto_generated/raster/qgsalignraster.sip.in
@@ -24,7 +24,7 @@ so they have the same:
 
 %TypeHeaderCode
 #include "qgsalignraster.h"
-#include <gdal_version.h>
+#include "gdal_version.h"
 %End
   public:
     QgsAlignRaster();
@@ -94,8 +94,7 @@ Gets raster value at the given coordinates (from the first band)
 
     struct ProgressHandler
     {
-
-      virtual bool progress( double complete ) = 0;
+        virtual bool progress( double complete ) = 0;
 %Docstring
 Method to be overridden for progress reporting.
 
@@ -104,7 +103,7 @@ Method to be overridden for progress reporting.
 :return: ``False`` if the execution should be canceled, ``True`` otherwise
 %End
 
-      virtual ~ProgressHandler();
+        virtual ~ProgressHandler();
     };
 
     void setProgressHandler( ProgressHandler *progressHandler );
@@ -236,7 +235,6 @@ Returns the index of the layer which has smallest cell size (returns -1 on error
 %End
 
   protected:
-
     bool createAndWarp( const Item &raster );
 %Docstring
 Internal function for processing of one raster (1. create output, 2. do the alignment)
@@ -256,7 +254,6 @@ Determine suggested output of raster warp to a different CRS. Returns ``True`` o
 
 
 
-
 };
 
 /************************************************************************
diff --git a/python/analysis/auto_generated/raster/qgsaspectfilter.sip.in b/python/analysis/auto_generated/raster/qgsaspectfilter.sip.in
index 9901ae72a1ca..8b43cf509149 100644
--- a/python/analysis/auto_generated/raster/qgsaspectfilter.sip.in
+++ b/python/analysis/auto_generated/raster/qgsaspectfilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsAspectFilter: QgsDerivativeFilter
+class QgsAspectFilter : QgsDerivativeFilter
 {
 %Docstring(signature="appended")
 Calculates aspect values in a window of 3x3 cells based on first order derivatives in x- and y- directions.
@@ -23,9 +23,8 @@ Direction is clockwise starting from north.
   public:
     QgsAspectFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
+
 
 
 };
diff --git a/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in b/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in
index 86c3cb345ae5..20cfd648267e 100644
--- a/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in
+++ b/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in
@@ -23,9 +23,8 @@ Needs to be subclassed (e.g. for slope and aspect).
   public:
     QgsDerivativeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 ) = 0;
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ) = 0;
+
 
   protected:
     float calcFirstDerX( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ) const;
diff --git a/python/analysis/auto_generated/raster/qgshillshadefilter.sip.in b/python/analysis/auto_generated/raster/qgshillshadefilter.sip.in
index 9dcbd3c51fb9..c8e6614caa96 100644
--- a/python/analysis/auto_generated/raster/qgshillshadefilter.sip.in
+++ b/python/analysis/auto_generated/raster/qgshillshadefilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsHillshadeFilter: QgsDerivativeFilter
+class QgsHillshadeFilter : QgsDerivativeFilter
 {
 %Docstring(signature="appended")
 A hillshade filter.
@@ -19,12 +19,10 @@ A hillshade filter.
 #include "qgshillshadefilter.h"
 %End
   public:
-    QgsHillshadeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat, double lightAzimuth = 300,
-                        double lightAngle = 40 );
+    QgsHillshadeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat, double lightAzimuth = 300, double lightAngle = 40 );
+
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
 
     float lightAzimuth() const;
     void setLightAzimuth( float azimuth );
diff --git a/python/analysis/auto_generated/raster/qgskde.sip.in b/python/analysis/auto_generated/raster/qgskde.sip.in
index 3ea2661793c8..a3779146f611 100644
--- a/python/analysis/auto_generated/raster/qgskde.sip.in
+++ b/python/analysis/auto_generated/raster/qgskde.sip.in
@@ -21,7 +21,6 @@ Performs Kernel Density Estimation ("heatmap") calculations on a vector layer.
 #include "qgskde.h"
 %End
   public:
-
     enum KernelShape
     {
       KernelQuartic,
@@ -48,21 +47,21 @@ Performs Kernel Density Estimation ("heatmap") calculations on a vector layer.
 
     struct Parameters
     {
-      QgsFeatureSource *source;
+        QgsFeatureSource *source;
 
-      double radius;
+        double radius;
 
-      QString radiusField;
+        QString radiusField;
 
-      QString weightField;
+        QString weightField;
 
-      double pixelSize;
+        double pixelSize;
 
-      QgsKernelDensityEstimation::KernelShape shape;
+        QgsKernelDensityEstimation::KernelShape shape;
 
-      double decayRatio;
+        double decayRatio;
 
-      QgsKernelDensityEstimation::OutputValues outputValues;
+        QgsKernelDensityEstimation::OutputValues outputValues;
     };
 
     QgsKernelDensityEstimation( const Parameters &parameters, const QString &outputFile, const QString &outputFormat );
diff --git a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
index 7b3401e7c269..34e70e4c7ea2 100644
--- a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
+++ b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in
@@ -52,9 +52,7 @@ Starts the calculation, reads from mInputFile and stores the result in mOutputFi
     double outputNodataValue() const;
     void setOutputNodataValue( double value );
 
-    virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                         float *x12, float *x22, float *x32,
-                                         float *x13, float *x23, float *x33 ) = 0;
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ) = 0;
 %Docstring
 Calculates output value from nine input values. The input values and the output
 value can be equal to the nodata value if not present or outside of the border.
@@ -77,7 +75,6 @@ First index of the input cell is the row, second index is the column
 
   protected:
 
-
 };
 
 /************************************************************************
diff --git a/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in b/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
index 8a506c9efa5e..bf33dd29da36 100644
--- a/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
+++ b/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
@@ -66,7 +66,7 @@ Represents a node in a raster calculator.
     QgsRasterCalcNode( double number );
     QgsRasterCalcNode( QgsRasterMatrix *matrix );
     QgsRasterCalcNode( Operator op, QgsRasterCalcNode *left, QgsRasterCalcNode *right );
-    QgsRasterCalcNode( QString functionName, QVector <QgsRasterCalcNode *> functionArgs );
+    QgsRasterCalcNode( QString functionName, QVector<QgsRasterCalcNode *> functionArgs );
 %Docstring
 Constructor for the tFunction type
 %End
diff --git a/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in b/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in
index cb39fedfeb14..c24f6fe32943 100644
--- a/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in
+++ b/python/analysis/auto_generated/raster/qgsrastercalculator.sip.in
@@ -20,7 +20,6 @@ Represents an individual raster layer/band number entry within a raster calculat
 #include "qgsrastercalculator.h"
 %End
   public:
-
     static QVector<QgsRasterCalculatorEntry> rasterEntries();
 %Docstring
 Creates a list of raster entries from the current project.
@@ -51,7 +50,6 @@ Performs raster layer calculations.
 #include "qgsrastercalculator.h"
 %End
   public:
-
     enum Result
     {
       Success,
@@ -65,10 +63,7 @@ Performs raster layer calculations.
     };
 
 
-    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                         const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows,
-                         const QVector<QgsRasterCalculatorEntry> &rasterEntries,
-                         const QgsCoordinateTransformContext &transformContext );
+    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries, const QgsCoordinateTransformContext &transformContext );
 %Docstring
 QgsRasterCalculator constructor.
 
@@ -84,11 +79,7 @@ QgsRasterCalculator constructor.
 .. versionadded:: 3.8
 %End
 
-    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                         const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs,
-                         int nOutputColumns, int nOutputRows,
-                         const QVector<QgsRasterCalculatorEntry> &rasterEntries,
-                         const QgsCoordinateTransformContext &transformContext );
+    QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries, const QgsCoordinateTransformContext &transformContext );
 %Docstring
 QgsRasterCalculator constructor.
 
@@ -106,8 +97,7 @@ QgsRasterCalculator constructor.
 %End
 
 
- QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                                           const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
+ QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
 %Docstring
 QgsRasterCalculator constructor.
 
@@ -124,8 +114,7 @@ QgsRasterCalculator constructor.
    Use the version with transformContext instead.
 %End
 
- QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat,
-                                           const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
+ QgsRasterCalculator( const QString &formulaString, const QString &outputFile, const QString &outputFormat, const QgsRectangle &outputExtent, const QgsCoordinateReferenceSystem &outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry> &rasterEntries ) /Deprecated/;
 %Docstring
 QgsRasterCalculator constructor.
 
diff --git a/python/analysis/auto_generated/raster/qgsrastermatrix.sip.in b/python/analysis/auto_generated/raster/qgsrastermatrix.sip.in
index 529cc499aab6..c8cb4cff6eaf 100644
--- a/python/analysis/auto_generated/raster/qgsrastermatrix.sip.in
+++ b/python/analysis/auto_generated/raster/qgsrastermatrix.sip.in
@@ -19,7 +19,6 @@ Represents a matrix in a raster calculator operation.
 #include "qgsrastermatrix.h"
 %End
   public:
-
     enum TwoArgOperator
     {
       opPLUS,
diff --git a/python/analysis/auto_generated/raster/qgsrelief.sip.in b/python/analysis/auto_generated/raster/qgsrelief.sip.in
index 807db4ab3f7e..ab3927e4652d 100644
--- a/python/analysis/auto_generated/raster/qgsrelief.sip.in
+++ b/python/analysis/auto_generated/raster/qgsrelief.sip.in
@@ -22,10 +22,9 @@ Produces colored relief rasters from DEM.
   public:
     struct ReliefColor
     {
-      ReliefColor( const QColor &c, double min, double max );
-      QColor color;
-      double minElevation;
-      double maxElevation;
+        ReliefColor( const QColor &c, double min, double max );
+        double minElevation;
+        double maxElevation;
     };
 
     QgsRelief( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
@@ -46,10 +45,10 @@ Starts the calculation, reads from mInputFile and stores the result in mOutputFi
 
     void clearReliefColors();
     void addReliefColorClass( const QgsRelief::ReliefColor &color );
-    QList< QgsRelief::ReliefColor > reliefColors() const;
-    void setReliefColors( const QList< QgsRelief::ReliefColor > &c );
+    QList<QgsRelief::ReliefColor> reliefColors() const;
+    void setReliefColors( const QList<QgsRelief::ReliefColor> &c );
 
-    QList< QgsRelief::ReliefColor > calculateOptimizedReliefClasses();
+    QList<QgsRelief::ReliefColor> calculateOptimizedReliefClasses();
 %Docstring
 Calculates class breaks according with the method of Buenzli (2011) using an iterative algorithm for segmented regression
 
diff --git a/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in b/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in
index 54965cb3465b..59f83598b224 100644
--- a/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in
+++ b/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsRuggednessFilter: QgsNineCellFilter
+class QgsRuggednessFilter : QgsNineCellFilter
 {
 %Docstring(signature="appended")
 Calculates the ruggedness index based on a 3x3 moving window.
@@ -24,10 +24,8 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top
     QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
   protected:
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
 
 };
 
diff --git a/python/analysis/auto_generated/raster/qgsslopefilter.sip.in b/python/analysis/auto_generated/raster/qgsslopefilter.sip.in
index 73fac2d11cb2..2d64101533b1 100644
--- a/python/analysis/auto_generated/raster/qgsslopefilter.sip.in
+++ b/python/analysis/auto_generated/raster/qgsslopefilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsSlopeFilter: QgsDerivativeFilter
+class QgsSlopeFilter : QgsDerivativeFilter
 {
 %Docstring(signature="appended")
 Calculates slope values in a window of 3x3 cells based on first order derivatives in x- and y- directions.
@@ -21,9 +21,8 @@ Calculates slope values in a window of 3x3 cells based on first order derivative
   public:
     QgsSlopeFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
+
 
 
 };
diff --git a/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in b/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in
index b4263cdb0d4d..53e77e56ddd3 100644
--- a/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in
+++ b/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in
@@ -9,7 +9,7 @@
 
 
 
-class QgsTotalCurvatureFilter: QgsNineCellFilter
+class QgsTotalCurvatureFilter : QgsNineCellFilter
 {
 %Docstring(signature="appended")
 Calculates total curvature as described by Wilson, Gallant (2000): terrain analysis.
@@ -22,10 +22,8 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy
     QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );
 
   protected:
+    virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
 
-     virtual float processNineCellWindow( float *x11, float *x21, float *x31,
-                                 float *x12, float *x22, float *x32,
-                                 float *x13, float *x23, float *x33 );
 };
 
 /************************************************************************
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in
index de6cdfee39df..1d88a29d667f 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in
@@ -26,7 +26,6 @@ A feature pool is based on a vector layer and caches features.
 #include "qgsfeaturepool.h"
 %End
   public:
-
     QgsFeaturePool( QgsVectorLayer *layer );
 %Docstring
 Creates a new feature pool for ``layer``.
@@ -109,7 +108,6 @@ the background thread.
 %End
 
   protected:
-
     void insertFeature( const QgsFeature &feature, bool skipLock = false );
 %Docstring
 Inserts a feature into the cache and the spatial index.
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in
index 473af7b32aa2..0beee51086d8 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in
@@ -81,10 +81,9 @@ is aware of the available geometry checks.
     static const QMetaObject staticMetaObject;
 
   public:
-
     struct LayerFeatureIds
     {
-      LayerFeatureIds();
+        LayerFeatureIds();
 
 
     };
@@ -120,25 +119,25 @@ is aware of the available geometry checks.
 
     struct Change
     {
-      Change();
+        Change();
 
-      Change( QgsGeometryCheck::ChangeWhat _what, QgsGeometryCheck::ChangeType _type, QgsVertexId _vidx = QgsVertexId() );
+        Change( QgsGeometryCheck::ChangeWhat _what, QgsGeometryCheck::ChangeType _type, QgsVertexId _vidx = QgsVertexId() );
 %Docstring
 Create a new Change
 %End
 
-      QgsGeometryCheck::ChangeWhat what;
+        QgsGeometryCheck::ChangeWhat what;
 
-      QgsGeometryCheck::ChangeType type;
+        QgsGeometryCheck::ChangeType type;
 
-      QgsVertexId vidx;
+        QgsVertexId vidx;
 
-      bool operator==( const QgsGeometryCheck::Change &other ) const;
+        bool operator==( const QgsGeometryCheck::Change &other ) const;
 
-      bool operator!=( const QgsGeometryCheck::Change &other ) const;
+        bool operator!=( const QgsGeometryCheck::Change &other ) const;
     };
 
-    typedef QMap<QString, QMap<QgsFeatureId, QList<QgsGeometryCheck::Change> > > Changes;
+    typedef QMap<QString, QMap<QgsFeatureId, QList<QgsGeometryCheck::Change>>> Changes;
 
     QgsGeometryCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration );
 %Docstring
@@ -237,7 +236,6 @@ Returns the context
 
 
 
-
 };
 
 /************************************************************************
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in
index 544d24973c4d..f974fb0c0a8d 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckcontext.sip.in
@@ -24,11 +24,7 @@ Base configuration for geometry checks.
 #include "qgsgeometrycheckcontext.h"
 %End
   public:
-
-    QgsGeometryCheckContext( int precision,
-                             const QgsCoordinateReferenceSystem &mapCrs,
-                             const QgsCoordinateTransformContext &transformContext,
-                             const QgsProject *mProject );
+    QgsGeometryCheckContext( int precision, const QgsCoordinateReferenceSystem &mapCrs, const QgsCoordinateTransformContext &transformContext, const QgsProject *mProject );
 %Docstring
 Creates a new QgsGeometryCheckContext.
 %End
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
index 4c61314bb9b4..4de8c0650256 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
@@ -27,7 +27,6 @@ This represents an error reported by a geometry check.
 #include "qgsgeometrycheckerror.h"
 %End
   public:
-
     enum Status
     {
       StatusPending,
@@ -43,12 +42,7 @@ This represents an error reported by a geometry check.
       ValueOther
     };
 
-    QgsGeometryCheckError( const QgsGeometryCheck *check,
-                           const QgsGeometryCheckerUtils::LayerFeature &layerFeature,
-                           const QgsPointXY &errorLocation,
-                           QgsVertexId vidx = QgsVertexId(),
-                           const QVariant &value = QVariant(),
-                           ValueType valueType = ValueOther );
+    QgsGeometryCheckError( const QgsGeometryCheck *check, const QgsGeometryCheckerUtils::LayerFeature &layerFeature, const QgsPointXY &errorLocation, QgsVertexId vidx = QgsVertexId(), const QVariant &value = QVariant(), ValueType valueType = ValueOther );
 %Docstring
 Create a new geometry check error with the parent ``check`` and for the
 ``layerFeature`` pair at the ``errorLocation``. Optionally the vertex can be
@@ -179,16 +173,9 @@ Returns an icon that should be shown for this kind of error.
 
 .. versionadded:: 3.8
 %End
-  protected:
 
-    QgsGeometryCheckError( const QgsGeometryCheck *check,
-                           const QString &layerId,
-                           QgsFeatureId featureId,
-                           const QgsGeometry &geometry,
-                           const QgsPointXY &errorLocation,
-                           QgsVertexId vidx = QgsVertexId(),
-                           const QVariant &value = QVariant(),
-                           ValueType valueType = ValueOther );
+  protected:
+    QgsGeometryCheckError( const QgsGeometryCheck *check, const QString &layerId, QgsFeatureId featureId, const QgsGeometry &geometry, const QgsPointXY &errorLocation, QgsVertexId vidx = QgsVertexId(), const QVariant &value = QVariant(), ValueType valueType = ValueOther );
 %Docstring
 Create a new geometry check error with the parent ``check`` and for the
 layer with ``layerId`` and ``featureId``.
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
index b5b13b0b2a7d..d69b97f9ff44 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
@@ -27,7 +27,6 @@ Contains utilities required for geometry checks.
 #include "qgsgeometrycheckerutils.h"
 %End
   public:
-
     class LayerFeature
 {
 %Docstring(signature="appended")
@@ -42,7 +41,6 @@ a set of layers.
 #include "qgsgeometrycheckerutils.h"
 %End
       public:
-
         LayerFeature( const QgsFeaturePool *pool, const QgsFeature &feature, const QgsGeometryCheckContext *context, bool useMapCrs );
 %Docstring
 Create a new layer/feature combination.
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in
index c5e1ca65cc27..f1825bf9411b 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckfactory.sip.in
@@ -29,7 +29,6 @@ A factory for geometry checks.
 #include "qgsgeometrycheckfactory.h"
 %End
   public:
-
     virtual ~QgsGeometryCheckFactory();
 
     virtual QgsGeometryCheck *createGeometryCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration ) const = 0 /Factory/;
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in
index 2f20e0a5e8ec..2656cc8507cb 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckregistry.sip.in
@@ -30,7 +30,6 @@ This class manages all known geometry check factories.
 #include "qgsgeometrycheckregistry.h"
 %End
   public:
-
     QgsGeometryCheckRegistry();
 %Docstring
 Constructor for QgsGeometryCheckRegistry. QgsGeometryCheckRegistry is not usually directly created, but rather accessed through
@@ -48,7 +47,7 @@ Ownership is transferred to the caller.
 .. versionadded:: 3.4
 %End
 
-    QList<QgsGeometryCheckFactory *> geometryCheckFactories( QgsVectorLayer *layer,  QgsGeometryCheck::CheckType type, QgsGeometryCheck::Flags flags = QgsGeometryCheck::Flags() ) const;
+    QList<QgsGeometryCheckFactory *> geometryCheckFactories( QgsVectorLayer *layer, QgsGeometryCheck::CheckType type, QgsGeometryCheck::Flags flags = QgsGeometryCheck::Flags() ) const;
 %Docstring
 Returns all geometry check factories that are compatible with ``layer`` and have all of the ``flags`` set.
 
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in
index 56d6451b9bd1..3fc3fbb5e9ae 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckresolutionmethod.sip.in
@@ -20,7 +20,6 @@ This class implements a resolution for problems detected in geometry checks.
 #include "qgsgeometrycheckresolutionmethod.h"
 %End
   public:
-
     QgsGeometryCheckResolutionMethod( int id, const QString &name, const QString &description, bool isStable = true );
 %Docstring
 Creates a new method with the specified parameters.
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
index bc5b87fe8246..6c6cca2f6018 100644
--- a/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
+++ b/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in
@@ -28,7 +28,6 @@ An error from a :py:class:`QgsSingleGeometryCheck`.
 #include "qgssinglegeometrycheck.h"
 %End
   public:
-
     QgsSingleGeometryCheckError( const QgsSingleGeometryCheck *check, const QgsGeometry &geometry, const QgsGeometry &errorLocation, const QgsVertexId &vertexId = QgsVertexId() );
 %Docstring
 Creates a new single geometry check error.
@@ -97,7 +96,6 @@ The single error can be obtained via singleError.
 #include "qgssinglegeometrycheck.h"
 %End
   public:
-
     QgsGeometryCheckErrorSingle( QgsSingleGeometryCheckError *singleError, const QgsGeometryCheckerUtils::LayerFeature &layerFeature );
 %Docstring
 Creates a new error for a :py:class:`QgsSingleGeometryCheck`.
@@ -129,18 +127,13 @@ Subclasses need to implement the processGeometry method.
 #include "qgssinglegeometrycheck.h"
 %End
   public:
-
-    QgsSingleGeometryCheck( const QgsGeometryCheckContext *context,
-                            const QVariantMap &configuration );
+    QgsSingleGeometryCheck( const QgsGeometryCheckContext *context, const QVariantMap &configuration );
 %Docstring
 Creates a new single geometry check.
 %End
 
-     virtual void collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools,
-                        QList<QgsGeometryCheckError *> &errors,
-                        QStringList &messages,
-                        QgsFeedback *feedback = 0,
-                        const QgsGeometryCheck::LayerFeatureIds &ids = QgsGeometryCheck::LayerFeatureIds() ) const ${SIP_FINAL};
+    virtual void collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback = 0, const QgsGeometryCheck::LayerFeatureIds &ids = QgsGeometryCheck::LayerFeatureIds() ) const ${SIP_FINAL};
+
 
     virtual QList<QgsSingleGeometryCheckError *> processGeometry( const QgsGeometry &geometry ) const = 0;
 %Docstring
diff --git a/python/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in b/python/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in
index ff133b3796db..bd7b531ddd4a 100644
--- a/python/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in
+++ b/python/analysis/auto_generated/vector/qgsgeometrysnapper.sip.in
@@ -23,7 +23,6 @@ match the reference layer features within a specified snap tolerance.
 #include "qgsgeometrysnapper.h"
 %End
   public:
-
     enum SnapMode
     {
       PreferNodes,
@@ -89,7 +88,6 @@ the snapped geometries back to the source layer.
 #include "qgsgeometrysnapper.h"
 %End
   public:
-
     QgsInternalGeometrySnapper( double snapTolerance, QgsGeometrySnapper::SnapMode mode = QgsGeometrySnapper::PreferNodes );
 %Docstring
 Constructor for QgsInternalGeometrySnapper. The ``snapTolerance`` and ``mode`` parameters dictate
diff --git a/python/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in b/python/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in
index f5dd480a4768..17a19cd24298 100644
--- a/python/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in
+++ b/python/analysis/auto_generated/vector/qgsgeometrysnappersinglesource.sip.in
@@ -36,7 +36,6 @@ to run Fix geometries algorithm afterwards.
 #include "qgsgeometrysnappersinglesource.h"
 %End
   public:
-
     static int run( const QgsFeatureSource &source, QgsFeatureSink &sink, double thresh, QgsFeedback *feedback );
 %Docstring
 Run the algorithm on given source and output results to the sink, using threshold value in the source's map units.
diff --git a/python/analysis/auto_generated/vector/qgszonalstatistics.sip.in b/python/analysis/auto_generated/vector/qgszonalstatistics.sip.in
index 40d18c8cec85..419b2c8a328e 100644
--- a/python/analysis/auto_generated/vector/qgszonalstatistics.sip.in
+++ b/python/analysis/auto_generated/vector/qgszonalstatistics.sip.in
@@ -22,12 +22,7 @@ A class that calculates raster statistics (count, sum, mean) for a polygon or mu
 #include "qgszonalstatistics.h"
 %End
   public:
-
-    QgsZonalStatistics( QgsVectorLayer *polygonLayer,
-                        QgsRasterLayer *rasterLayer,
-                        const QString &attributePrefix = QString(),
-                        int rasterBand = 1,
-                        Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
+    QgsZonalStatistics( QgsVectorLayer *polygonLayer, QgsRasterLayer *rasterLayer, const QString &attributePrefix = QString(), int rasterBand = 1, Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
 %Docstring
 Convenience constructor for QgsZonalStatistics, using an input raster layer.
 
@@ -39,14 +34,7 @@ The raster layer must exist for the lifetime of the zonal statistics calculation
    the constructor which accepts a :py:class:`QgsRasterInterface` should be used instead.
 %End
 
-    QgsZonalStatistics( QgsVectorLayer *polygonLayer,
-                        QgsRasterInterface *rasterInterface,
-                        const QgsCoordinateReferenceSystem &rasterCrs,
-                        double rasterUnitsPerPixelX,
-                        double rasterUnitsPerPixelY,
-                        const QString &attributePrefix = QString(),
-                        int rasterBand = 1,
-                        Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
+    QgsZonalStatistics( QgsVectorLayer *polygonLayer, QgsRasterInterface *rasterInterface, const QgsCoordinateReferenceSystem &rasterCrs, double rasterUnitsPerPixelX, double rasterUnitsPerPixelY, const QString &attributePrefix = QString(), int rasterBand = 1, Qgis::ZonalStatistics stats = Qgis::ZonalStatistic::Default );
 %Docstring
 Constructor for QgsZonalStatistics, using a QgsRasterInterface.
 
diff --git a/python/core/auto_generated/gps/qgsgpsconnection.sip.in b/python/core/auto_generated/gps/qgsgpsconnection.sip.in
index 0a20cb80c0d6..dae91fac71a2 100644
--- a/python/core/auto_generated/gps/qgsgpsconnection.sip.in
+++ b/python/core/auto_generated/gps/qgsgpsconnection.sip.in
@@ -25,8 +25,8 @@ Abstract base class for connection to a GPS device
 
 %TypeHeaderCode
 #include "qgsgpsconnection.h"
-#include <qgsgpsdconnection.h>
-#include <qgsnmeaconnection.h>
+#include "qgsgpsdconnection.h"
+#include "qgsnmeaconnection.h"
 %End
 %ConvertToSubClassCode
     if ( sipCpp->inherits( "QgsGpsdConnection" ) )
diff --git a/python/core/auto_generated/layout/qgslayoutobject.sip.in b/python/core/auto_generated/layout/qgslayoutobject.sip.in
index b968d6d6e4bc..24dd0fa0362d 100644
--- a/python/core/auto_generated/layout/qgslayoutobject.sip.in
+++ b/python/core/auto_generated/layout/qgslayoutobject.sip.in
@@ -17,7 +17,7 @@ A base class for objects which belong to a layout.
 
 %TypeHeaderCode
 #include "qgslayoutobject.h"
-#include <qgslayoutitem.h>
+#include "qgslayoutitem.h"
 #include "qgslayoutitemgroup.h"
 #include "qgslayoutitemmap.h"
 #include "qgslayoutitempicture.h"
diff --git a/python/core/auto_generated/raster/qgsrasterinterface.sip.in b/python/core/auto_generated/raster/qgsrasterinterface.sip.in
index 734e9cc7fbe8..1cf75a936d19 100644
--- a/python/core/auto_generated/raster/qgsrasterinterface.sip.in
+++ b/python/core/auto_generated/raster/qgsrasterinterface.sip.in
@@ -109,24 +109,21 @@ Base class for processing filters like renderers, reprojector, resampler etc.
 
 %TypeHeaderCode
 #include "qgsrasterinterface.h"
-// QgsRasterInterface subclasses
-#include <qgsbrightnesscontrastfilter.h>
-#include <qgshuesaturationfilter.h>
-#include <qgsrasterdataprovider.h>
-#include <qgsrasternuller.h>
-#include <qgsrasterprojector.h>
-#include <qgsrasterrenderer.h>
-#include <qgsrasterresamplefilter.h>
-
-// QgsRasterRenderer subclasses
-#include <qgshillshaderenderer.h>
-#include <qgsmultibandcolorrenderer.h>
-#include <qgspalettedrasterrenderer.h>
-#include <qgssinglebandcolordatarenderer.h>
-#include <qgssinglebandgrayrenderer.h>
-#include <qgssinglebandpseudocolorrenderer.h>
-#include <qgsrastersinglecolorrenderer.h>
-#include <qgsrastercontourrenderer.h>
+#include "qgsbrightnesscontrastfilter.h"
+#include "qgshuesaturationfilter.h"
+#include "qgsrasterdataprovider.h"
+#include "qgsrasternuller.h"
+#include "qgsrasterprojector.h"
+#include "qgsrasterrenderer.h"
+#include "qgsrasterresamplefilter.h"
+#include "qgshillshaderenderer.h"
+#include "qgsmultibandcolorrenderer.h"
+#include "qgspalettedrasterrenderer.h"
+#include "qgssinglebandcolordatarenderer.h"
+#include "qgssinglebandgrayrenderer.h"
+#include "qgssinglebandpseudocolorrenderer.h"
+#include "qgsrastersinglecolorrenderer.h"
+#include "qgsrastercontourrenderer.h"
 %End
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsBrightnessContrastFilter *>( sipCpp ) )
diff --git a/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in b/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in
index f06535e80132..a7cda85fd909 100644
--- a/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in
+++ b/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in
@@ -20,7 +20,7 @@ typically used to render grayscale images as false color.
 
 %TypeHeaderCode
 #include "qgsrastershaderfunction.h"
-#include <qgscolorrampshader.h>
+#include "qgscolorrampshader.h"
 %End
 %ConvertToSubClassCode
     if ( dynamic_cast<QgsColorRampShader *>( sipCpp ) != NULL )
diff --git a/python/core/auto_generated/symbology/qgssymbollayer.sip.in b/python/core/auto_generated/symbology/qgssymbollayer.sip.in
index 8fdab89bd864..d4af3ce22a91 100644
--- a/python/core/auto_generated/symbology/qgssymbollayer.sip.in
+++ b/python/core/auto_generated/symbology/qgssymbollayer.sip.in
@@ -17,7 +17,7 @@ class QgsSymbolLayer
 
 %TypeHeaderCode
 #include "qgssymbollayer.h"
-#include <qgslinesymbollayer.h>
+#include "qgslinesymbollayer.h"
 %End
 %ConvertToSubClassCode
     switch ( sipCpp->type() )