qgis · nyalldawson · Oct 16, 2024 · Oct 15, 2024 · Oct 15, 2024 · Oct 15, 2024
diff --git a/python/PyQt6/analysis/auto_generated/raster/qgsrastercalcnode.sip.in b/python/PyQt6/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
@@ -104,7 +104,7 @@ Returns a list of nodes of a specific ``type``
 
     static QgsRasterCalcNode *parseRasterCalcString( const QString &str, QString &parserErrorMsg ) /Factory/;
 
-    QStringList referencedLayerNames( );
+    QStringList referencedLayerNames() const;
 %Docstring
 Returns a list of raster layer names that are referenced in the formula without the quotation marks.
 It uses QgsRasterCalcNode.cleanRasterReferences
@@ -114,7 +114,7 @@ It uses QgsRasterCalcNode.cleanRasterReferences
    since QGIS 3.22
 %End
 
-    QStringList cleanRasterReferences();
+    QStringList cleanRasterReferences() const;
 %Docstring
 Returns a list of raster layer references that are addressed in the formula, without quotation marks.
 

diff --git a/python/PyQt6/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in b/python/PyQt6/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in
@@ -45,13 +45,6 @@ The optional ``providerKey`` string can be used to specify the key for the :py:c
     virtual QgsAbstractDatabaseProviderConnection *databaseConnection() const;
 
 
-    static QIcon iconDataCollection();
-%Docstring
-Returns the standard browser data collection icon.
-
-.. seealso:: :py:func:`iconDir`
-%End
-
 };
 
 

diff --git a/python/PyQt6/core/auto_generated/browser/qgslayeritem.sip.in b/python/PyQt6/core/auto_generated/browser/qgslayeritem.sip.in
@@ -55,11 +55,6 @@ Returns the layer item type corresponding to a :py:class:`QgsMapLayer` ``layer``
     QString uri() const;
 %Docstring
 Returns layer uri or empty string if layer cannot be created
-%End
-
-    QString providerKey() const;
-%Docstring
-Returns provider key
 %End
 
     QStringList supportedCrs() const;

diff --git a/python/PyQt6/core/auto_generated/qgslegendstyle.sip.in b/python/PyQt6/core/auto_generated/qgslegendstyle.sip.in
@@ -82,7 +82,7 @@ Sets the text ``format`` used for rendering this legend component.
 .. versionadded:: 3.30
 %End
 
-    double margin( Side side );
+    double margin( Side side ) const;
 %Docstring
 Returns the margin (in mm) for the specified ``side`` of the component.
 

diff --git a/python/PyQt6/core/auto_generated/raster/qgsrastershader.sip.in b/python/PyQt6/core/auto_generated/raster/qgsrastershader.sip.in
@@ -70,7 +70,7 @@ Generates a new RGBA value based on one input ``value``.
                 int *returnRedValue /Out/,
                 int *returnGreenValue /Out/,
                 int *returnBlueValue /Out/,
-                int *returnAlpha /Out/ );
+                int *returnAlpha /Out/ ) const;
 %Docstring
 Generates a new RGBA value based on an original RGBA value.
 

diff --git a/python/PyQt6/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in b/python/PyQt6/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in
@@ -143,8 +143,6 @@ Converts the category to a matching SLD rule, within the specified DOM document
 %End
 
   protected:
-
-    void swap( QgsRendererCategory &other );
 };
 
 typedef QList<QgsRendererCategory> QgsCategoryList;

diff --git a/python/PyQt6/core/auto_generated/symbology/qgscptcityarchive.sip.in b/python/PyQt6/core/auto_generated/symbology/qgscptcityarchive.sip.in
@@ -34,7 +34,10 @@ class QgsCptCityArchive
     static QMap< QString, QString > copyingInfo( const QString &fileName );
     static QMap< QString, QString > description( const QString &fileName );
 
-    bool isEmpty();
+    bool isEmpty() const;
+%Docstring
+Returns ``True`` if archive is empty
+%End
     QString archiveName() const;
     static void initArchives( bool loadAll = false );
     static void initArchive( const QString &archiveName, const QString &archiveBaseDir );

diff --git a/python/PyQt6/core/auto_generated/symbology/qgsinterpolatedlinerenderer.sip.in b/python/PyQt6/core/auto_generated/symbology/qgsinterpolatedlinerenderer.sip.in
@@ -367,6 +367,7 @@ Returns the expression related to the end extremity value for width.
    use dataDefinedProperty( :py:class:`QgsSymbolLayer`.PropertyLineEndWidthValue ) instead.
 %End
 
+
     void setWidthUnit( Qgis::RenderUnit strokeWidthUnit );
 %Docstring
 Sets the width unit.

diff --git a/python/PyQt6/core/auto_generated/symbology/qgsmasksymbollayer.sip.in b/python/PyQt6/core/auto_generated/symbology/qgsmasksymbollayer.sip.in
@@ -71,6 +71,7 @@ Create a new QgsMaskMarkerSymbolLayer
 
     virtual void drawPreviewIcon( QgsSymbolRenderContext &context, QSize size );
 
+
     bool enabled() const;
 %Docstring
 Whether some masked symbol layers are defined

diff --git a/python/PyQt6/core/auto_generated/symbology/qgsrendererrange.sip.in b/python/PyQt6/core/auto_generated/symbology/qgsrendererrange.sip.in
@@ -185,8 +185,6 @@ Creates a DOM element representing the range in SLD format.
 %End
 
   protected:
-
-    void swap( QgsRendererRange &other );
 };
 
 typedef QList<QgsRendererRange> QgsRangeList;

diff --git a/python/PyQt6/gui/auto_generated/qgscollapsiblegroupbox.sip.in b/python/PyQt6/gui/auto_generated/qgscollapsiblegroupbox.sip.in
@@ -105,7 +105,6 @@ Overridden to prepare base call and avoid crash due to specific QT versions
 %End
 
   protected:
-    void init();
 
     void collapseExpandFixes();
 %Docstring
@@ -126,6 +125,7 @@ Visual fixes for when group box is collapsed/expanded
     void clearModifiers();
 
 
+
 };
 
 
@@ -204,12 +204,10 @@ The configuration path to which it is saved is defined by
 %End
 
   protected:
-    void init();
     virtual void showEvent( QShowEvent *event );
 
     QString saveKey() const;
 
-
 };
 
 /************************************************************************

diff --git a/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in b/python/analysis/auto_generated/raster/qgsrastercalcnode.sip.in
@@ -104,7 +104,7 @@ Returns a list of nodes of a specific ``type``
 
     static QgsRasterCalcNode *parseRasterCalcString( const QString &str, QString &parserErrorMsg ) /Factory/;
 
-    QStringList referencedLayerNames( );
+    QStringList referencedLayerNames() const;
 %Docstring
 Returns a list of raster layer names that are referenced in the formula without the quotation marks.
 It uses QgsRasterCalcNode.cleanRasterReferences
@@ -114,7 +114,7 @@ It uses QgsRasterCalcNode.cleanRasterReferences
    since QGIS 3.22
 %End
 
-    QStringList cleanRasterReferences();
+    QStringList cleanRasterReferences() const;
 %Docstring
 Returns a list of raster layer references that are addressed in the formula, without quotation marks.
 

diff --git a/python/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in b/python/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in
@@ -45,13 +45,6 @@ The optional ``providerKey`` string can be used to specify the key for the :py:c
     virtual QgsAbstractDatabaseProviderConnection *databaseConnection() const;
 
 
-    static QIcon iconDataCollection();
-%Docstring
-Returns the standard browser data collection icon.
-
-.. seealso:: :py:func:`iconDir`
-%End
-
 };
 
 

diff --git a/python/core/auto_generated/browser/qgslayeritem.sip.in b/python/core/auto_generated/browser/qgslayeritem.sip.in
@@ -55,11 +55,6 @@ Returns the layer item type corresponding to a :py:class:`QgsMapLayer` ``layer``
     QString uri() const;
 %Docstring
 Returns layer uri or empty string if layer cannot be created
-%End
-
-    QString providerKey() const;
-%Docstring
-Returns provider key
 %End
 
     QStringList supportedCrs() const;

diff --git a/python/core/auto_generated/qgslegendstyle.sip.in b/python/core/auto_generated/qgslegendstyle.sip.in
@@ -82,7 +82,7 @@ Sets the text ``format`` used for rendering this legend component.
 .. versionadded:: 3.30
 %End
 
-    double margin( Side side );
+    double margin( Side side ) const;
 %Docstring
 Returns the margin (in mm) for the specified ``side`` of the component.
 

diff --git a/python/core/auto_generated/raster/qgsrastershader.sip.in b/python/core/auto_generated/raster/qgsrastershader.sip.in
@@ -70,7 +70,7 @@ Generates a new RGBA value based on one input ``value``.
                 int *returnRedValue /Out/,
                 int *returnGreenValue /Out/,
                 int *returnBlueValue /Out/,
-                int *returnAlpha /Out/ );
+                int *returnAlpha /Out/ ) const;
 %Docstring
 Generates a new RGBA value based on an original RGBA value.
 

diff --git a/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in
@@ -143,8 +143,6 @@ Converts the category to a matching SLD rule, within the specified DOM document
 %End
 
   protected:
-
-    void swap( QgsRendererCategory &other );
 };
 
 typedef QList<QgsRendererCategory> QgsCategoryList;

diff --git a/python/core/auto_generated/symbology/qgscptcityarchive.sip.in b/python/core/auto_generated/symbology/qgscptcityarchive.sip.in
@@ -34,7 +34,10 @@ class QgsCptCityArchive
     static QMap< QString, QString > copyingInfo( const QString &fileName );
     static QMap< QString, QString > description( const QString &fileName );
 
-    bool isEmpty();
+    bool isEmpty() const;
+%Docstring
+Returns ``True`` if archive is empty
+%End
     QString archiveName() const;
     static void initArchives( bool loadAll = false );
     static void initArchive( const QString &archiveName, const QString &archiveBaseDir );

diff --git a/python/core/auto_generated/symbology/qgsinterpolatedlinerenderer.sip.in b/python/core/auto_generated/symbology/qgsinterpolatedlinerenderer.sip.in
@@ -367,6 +367,7 @@ Returns the expression related to the end extremity value for width.
    use dataDefinedProperty( :py:class:`QgsSymbolLayer`.PropertyLineEndWidthValue ) instead.
 %End
 
+
     void setWidthUnit( Qgis::RenderUnit strokeWidthUnit );
 %Docstring
 Sets the width unit.

diff --git a/python/core/auto_generated/symbology/qgsmasksymbollayer.sip.in b/python/core/auto_generated/symbology/qgsmasksymbollayer.sip.in
@@ -71,6 +71,7 @@ Create a new QgsMaskMarkerSymbolLayer
 
     virtual void drawPreviewIcon( QgsSymbolRenderContext &context, QSize size );
 
+
     bool enabled() const;
 %Docstring
 Whether some masked symbol layers are defined

diff --git a/python/core/auto_generated/symbology/qgsrendererrange.sip.in b/python/core/auto_generated/symbology/qgsrendererrange.sip.in
@@ -185,8 +185,6 @@ Creates a DOM element representing the range in SLD format.
 %End
 
   protected:
-
-    void swap( QgsRendererRange &other );
 };
 
 typedef QList<QgsRendererRange> QgsRangeList;

diff --git a/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in b/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in
@@ -105,7 +105,6 @@ Overridden to prepare base call and avoid crash due to specific QT versions
 %End
 
   protected:
-    void init();
 
     void collapseExpandFixes();
 %Docstring
@@ -126,6 +125,7 @@ Visual fixes for when group box is collapsed/expanded
     void clearModifiers();
 
 
+
 };
 
 
@@ -204,12 +204,10 @@ The configuration path to which it is saved is defined by
 %End
 
   protected:
-    void init();
     virtual void showEvent( QShowEvent *event );
 
     QString saveKey() const;
 
-
 };
 
 /************************************************************************

diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
@@ -37,6 +37,8 @@ cppcheck --library=qt.cfg --inline-suppr \
          -DCMAKE_SOURCE_DIR="/foo/bar" \
          -DQ_NOWARN_DEPRECATED_PUSH= \
          -DQ_NOWARN_DEPRECATED_POP= \
+         -DQ_NOWARN_UNREACHABLE_PUSH= \
+         -DQ_NOWARN_UNREACHABLE_POP= \
          -DQ_DECLARE_OPAQUE_POINTER= \
          -DQGIS_PROTECT_QOBJECT_THREAD_ACCESS = \
          -DQ_DECLARE_SQLDRIVER_PRIVATE = \

diff --git a/src/3d/terrain/qgsflatterraingenerator.h b/src/3d/terrain/qgsflatterraingenerator.h
@@ -69,7 +69,7 @@ class _3D_EXPORT QgsFlatTerrainGenerator : public QgsTerrainGenerator
     //! Sets CRS of the terrain
     void setCrs( const QgsCoordinateReferenceSystem &crs );
     //! Returns CRS of the terrain
-    QgsCoordinateReferenceSystem crs() const { return mCrs; }
+    QgsCoordinateReferenceSystem crs() const { return mCrs; } // cppcheck-suppress duplInheritedMember
 
   private:
 

diff --git a/src/3d/terrain/qgsonlineterraingenerator.h b/src/3d/terrain/qgsonlineterraingenerator.h
@@ -45,7 +45,7 @@ class _3D_EXPORT QgsOnlineTerrainGenerator : public QgsTerrainGenerator
     //! Sets CRS of the terrain
     void setCrs( const QgsCoordinateReferenceSystem &crs, const QgsCoordinateTransformContext &context );
     //! Returns CRS of the terrain
-    QgsCoordinateReferenceSystem crs() const { return mCrs; }
+    QgsCoordinateReferenceSystem crs() const { return mCrs; } // cppcheck-suppress duplInheritedMember
 
     //! Sets resolution of the generator (how many elevation samples on one side of a terrain tile)
     void setResolution( int resolution ) { mResolution = resolution; updateGenerator(); }

diff --git a/src/analysis/processing/qgsalgorithmconcavehull.h b/src/analysis/processing/qgsalgorithmconcavehull.h
@@ -56,10 +56,10 @@ class QgsConcaveHullAlgorithm : public QgsProcessingAlgorithm
     void concaveHullQgis( std::unique_ptr< QgsFeatureSink > &sink, const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback );
 
     std::unique_ptr< QgsProcessingFeatureSource > mSource;
-    double mPercentage;
-    bool mAllowHoles;
-    bool mSplitMultipart;
-    double mStep;
+    double mPercentage = 0;
+    bool mAllowHoles = false;
+    bool mSplitMultipart = false;
+    double mStep = 0;
 };
 
 ///@endcond PRIVATE

diff --git a/src/analysis/processing/qgsalgorithmdrape.cpp b/src/analysis/processing/qgsalgorithmdrape.cpp
@@ -93,14 +93,10 @@ bool QgsDrapeAlgorithmBase::prepareAlgorithm( const QVariantMap &parameters, Qgs
                                   .arg( layer->bandCount() ) );
   mRasterExtent = layer->extent();
 
-  std::unique_ptr< QgsRasterInterface > provider( layer->dataProvider()->clone() );
-  QgsRasterDataProvider *dp = dynamic_cast< QgsRasterDataProvider * >( provider.get() );
-  if ( !dp )
+  mRasterProvider.reset( layer->dataProvider()->clone() );
+  if ( !mRasterProvider )
     throw QgsProcessingException( invalidRasterError( parameters, QStringLiteral( "RASTER" ) ) );
 
-  mRasterProvider.reset( dp );
-  provider.release();
-
   return true;
 }
 

diff --git a/src/analysis/processing/qgsalgorithmvoronoipolygons.h b/src/analysis/processing/qgsalgorithmvoronoipolygons.h
@@ -56,9 +56,9 @@ class QgsVoronoiPolygonsAlgorithm : public QgsProcessingAlgorithm
     QString voronoiWithoutAttributes( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback );
 
     std::unique_ptr< QgsProcessingFeatureSource > mSource;
-    double mBuffer;
-    double mTolerance;
-    bool mCopyAttributes;
+    double mBuffer = 0;
+    double mTolerance = 0;
+    bool mCopyAttributes = false;
 };
 
 ///@endcond PRIVATE

diff --git a/src/analysis/processing/qgsalgorithmxyztiles.h b/src/analysis/processing/qgsalgorithmxyztiles.h
@@ -125,11 +125,11 @@ class QgsXyzTilesBaseAlgorithm : public QgsProcessingAlgorithm
     QgsCoordinateTransform mSrc2Wgs;
     QgsCoordinateTransform mWgs2Mercator;
     QgsRectangle mWgs84Extent;
-    QgsProcessingFeedback *mFeedback;
+    QgsProcessingFeedback *mFeedback = nullptr;
     long long mTotalTiles = 0;
     long long mProcessedTiles = 0;
     QgsCoordinateTransformContext mTransformContext;
-    QEventLoop *mEventLoop;
+    QEventLoop *mEventLoop = nullptr;
     QList< MetaTile > mMetaTiles;
     QMap< QgsMapRendererSequentialJob *, MetaTile > mRendererJobs;
 };
@@ -158,7 +158,7 @@ class QgsXyzTilesDirectoryAlgorithm : public QgsXyzTilesBaseAlgorithm
     void processMetaTile( QgsMapRendererSequentialJob *job ) override;
 
   private:
-    bool mTms;
+    bool mTms = false;
     QString mOutputDir;
 
 };

diff --git a/src/analysis/raster/qgsrastercalcnode.cpp b/src/analysis/raster/qgsrastercalcnode.cpp
@@ -425,7 +425,7 @@ QgsRasterCalcNode *QgsRasterCalcNode::parseRasterCalcString( const QString &str,
   return localParseRasterCalcString( str, parserErrorMsg );
 }
 
-QStringList QgsRasterCalcNode::referencedLayerNames()
+QStringList QgsRasterCalcNode::referencedLayerNames() const
 {
   QStringList referencedRasters;
 
@@ -439,7 +439,7 @@ QStringList QgsRasterCalcNode::referencedLayerNames()
   return referencedRasters;
 }
 
-QStringList QgsRasterCalcNode::cleanRasterReferences()
+QStringList QgsRasterCalcNode::cleanRasterReferences() const
 {
   QStringList rasterReferences;
   const QList<const QgsRasterCalcNode *> rasterRefNodes =  this->findNodes( QgsRasterCalcNode::Type::tRasterRef );
-Original file line number
+Diff line change
@@ Expand Up @@
     %End
       protected:
-        void swap( QgsRendererCategory &other );
     };
     typedef QList<QgsRendererCategory> QgsCategoryList;
@@ Expand Down @@