Fix some issues preventing use of clang-tidy on files

qgis · Mar 8, 2023 · 9154758 · 9154758
1 parent 50bdb22
commit 9154758
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 13 deletions.
diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp
@@ -2519,6 +2519,12 @@ QgsLayoutItemMapGrid::AnnotationDirection QgsLayoutItemMapGrid::annotationDirect
   return mLeftGridAnnotationDirection; // no warnings
 }
 
+void QgsLayoutItemMapGrid::setAnnotationExpression( const QString &expression )
+{
+  mGridAnnotationExpressionString = expression;
+  mGridAnnotationExpression.reset();
+}
+
 void QgsLayoutItemMapGrid::setFrameDivisions( const QgsLayoutItemMapGrid::DisplayMode divisions, const QgsLayoutItemMapGrid::BorderSide border )
 {
   switch ( border )

diff --git a/src/core/layout/qgslayoutitemmapgrid.h b/src/core/layout/qgslayoutitemmapgrid.h
@@ -719,7 +719,7 @@ class CORE_EXPORT QgsLayoutItemMapGrid : public QgsLayoutItemMapItem
      * is QgsLayoutItemMapGrid::CustomFormat.
      * \see annotationExpression()
      */
-    void setAnnotationExpression( const QString &expression ) { mGridAnnotationExpressionString = expression; mGridAnnotationExpression.reset(); }
+    void setAnnotationExpression( const QString &expression );
 
     /**
      * Returns the expression used for drawing grid annotations. This is only used when annotationFormat()

diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp
@@ -61,6 +61,11 @@ Problem::Problem( const QgsRectangle &extent )
 
 }
 
+void Problem::addCandidatePosition( std::unique_ptr<LabelPosition> position )
+{
+  mLabelPositions.emplace_back( std::move( position ) );
+}
+
 Problem::~Problem() = default;
 
 void Problem::reduce()

diff --git a/src/core/pal/problem.h b/src/core/pal/problem.h
@@ -96,7 +96,7 @@ namespace pal
        * \param position label candidate position. Ownership is transferred to Problem.
        * \since QGIS 2.12
        */
-      void addCandidatePosition( std::unique_ptr< LabelPosition > position ) { mLabelPositions.emplace_back( std::move( position ) ); }
+      void addCandidatePosition( std::unique_ptr< LabelPosition > position );
 
       /**
        * Returns the total number of features considered during the labeling problem.

diff --git a/src/core/pal/util.cpp b/src/core/pal/util.cpp
@@ -27,12 +27,8 @@
  *
  */
 
-#include "layer.h"
-#include "internalexception.h"
+#include "qgsgeos.h"
 #include "util.h"
-#include "labelposition.h"
-#include "feature.h"
-#include "geomfunction.h"
 
 #include "qgslogger.h"
 #include <cfloat>

diff --git a/src/core/pal/util.h b/src/core/pal/util.h
@@ -34,9 +34,12 @@
 
 
 #include <QList>
+#include <QLinkedList>
 #include <vector>
 #include <memory>
 
+typedef struct GEOSGeom_t GEOSGeometry;
+
 namespace pal
 {
 

diff --git a/src/core/pointcloud/qgspointcloudstatscalculator.h b/src/core/pointcloud/qgspointcloudstatscalculator.h
@@ -63,7 +63,7 @@ class CORE_EXPORT QgsPointCloudStatsCalculator : public QObject
     QgsPointCloudStatistics statistics() const { return mStats; }
 
   private:
-    std::unique_ptr<QgsPointCloudIndex> mIndex = nullptr;
+    std::unique_ptr<QgsPointCloudIndex> mIndex;
 
     QgsPointCloudStatistics mStats;
     QSet<IndexedPointCloudNode> mProcessedNodes;

diff --git a/src/core/raster/qgsrasterlayerprofilegenerator.h b/src/core/raster/qgsrasterlayerprofilegenerator.h
@@ -84,7 +84,7 @@ class CORE_EXPORT QgsRasterLayerProfileGenerator : public QgsAbstractProfileSurf
 
   private:
     QString mId;
-    std::unique_ptr<QgsRasterBlockFeedback> mFeedback = nullptr;
+    std::unique_ptr<QgsRasterBlockFeedback> mFeedback;
 
     std::unique_ptr< QgsCurve > mProfileCurve;
 

diff --git a/src/gui/processing/qgsprocessingmeshdatasetwidget.h b/src/gui/processing/qgsprocessingmeshdatasetwidget.h
@@ -54,10 +54,10 @@ class GUI_EXPORT QgsProcessingMeshDatasetGroupsWidget : public QWidget
     const QgsProcessingParameterMeshDatasetGroups *mParam = nullptr;
     QVariantList mValue;
 
-    QPointer<QLineEdit> mLineEdit = nullptr;
-    QPointer<QToolButton> mToolButton = nullptr;
-    QPointer<QAction> mActionCurrentActiveDatasetGroups = nullptr;
-    QPointer<QAction> mActionAvailableDatasetGroups = nullptr;
+    QPointer<QLineEdit> mLineEdit;
+    QPointer<QToolButton> mToolButton;
+    QPointer<QAction> mActionCurrentActiveDatasetGroups;
+    QPointer<QAction> mActionAvailableDatasetGroups;
     QgsMeshLayer *mMeshLayer = nullptr;
     QMap<int, QString> mDatasetGroupsNames; //used to store the dataet groups name if layer is not referenced
 

diff --git a/src/gui/qgssubsetstringeditorproviderregistry.h b/src/gui/qgssubsetstringeditorproviderregistry.h
@@ -26,6 +26,7 @@
 class QgsSubsetStringEditorInterface;
 class QgsSubsetStringEditorProvider;
 class QgsProviderGuiRegistry;
+class QgsVectorLayer;
 
 /**
  * \ingroup gui

diff --git a/src/gui/qgswindowmanagerinterface.h b/src/gui/qgswindowmanagerinterface.h
@@ -21,6 +21,7 @@
 
 class QgsVectorLayer;
 class QgsRasterLayer;
+class QWidget;
 
 ///@cond NOT_STABLE