clang-format for analysis and gui on 3.40

.clang-format

@@ -111,6 +111,9 @@ SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        2
 UseTab:       Never
+Macros:
+  - SIP_ENUM_BASETYPE(x)=x
+  - SIP_MONKEYPATCH_SCOPEENUM_UNNEST(x,y)=x
 
 ---
 

.pre-commit-config.yaml

@@ -17,8 +17,6 @@ repos:
       exclude: |
         (?x)^(
             src/core/.*|
-            src/gui/.*|
-            src/analysis/.*|
             src/3d/.*|
             src/server/.*|
             tests/code_layout/sipify/sipifyheader.h

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

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.
 

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,

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

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``.

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.

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

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,

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
 

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;

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:
 
 
-
 };
 
 /************************************************************************

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

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;

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