Fix cppcheck identicalInnerCondition warnings

qgis · Apr 17, 2023 · 8451357 · 8451357
1 parent 3c64bcc
commit 8451357
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp
@@ -1634,13 +1634,11 @@ void QgsGeometryUtils::perpendicularCenterSegment( double pointx, double pointy,
 {
   QgsVector segmentVector =  QgsVector( segmentPoint2x - segmentPoint1x, segmentPoint2y - segmentPoint1y );
   QgsVector perpendicularVector = segmentVector.perpVector();
-  if ( desiredSegmentLength )
+  if ( desiredSegmentLength != 0 )
   {
-    if ( desiredSegmentLength != 0 )
-    {
-      perpendicularVector = perpendicularVector.normalized() * ( desiredSegmentLength ) / 2;
-    }
+    perpendicularVector = perpendicularVector.normalized() * ( desiredSegmentLength ) / 2;
   }
+
   perpendicularSegmentPoint1x = pointx - perpendicularVector.x();
   perpendicularSegmentPoint1y = pointy - perpendicularVector.y();
   perpendicularSegmentPoint2x = pointx + perpendicularVector.x();

diff --git a/src/core/gps/qgsnmeaconnection.cpp b/src/core/gps/qgsnmeaconnection.cpp
@@ -492,6 +492,7 @@ void QgsNmeaConnection::processGsaSentence( const char *data, int len )
         else if ( result.sat_prn[i] > 32 && result.sat_prn[i] <= 64 )
           constellation = Qgis::GnssConstellation::Sbas;
 
+        // cppcheck-suppress identicalInnerCondition
         if ( result.sat_prn[i] > 0 )
         {
           if ( mixedConstellation

diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -2518,23 +2518,16 @@ void QgsGrass::adjustCellHead( struct Cell_head *cellhd, int row_flag, int col_f
 
 QMap<int, QString> QgsGrass::vectorTypeMap()
 {
-  static QMap<int, QString> sVectorTypes;
-  static QMutex sMutex;
-  if ( sVectorTypes.isEmpty() )
-  {
-    sMutex.lock();
-    if ( sVectorTypes.isEmpty() )
-    {
-      sVectorTypes.insert( GV_POINT, QStringLiteral( "point" ) );
-      sVectorTypes.insert( GV_CENTROID, QStringLiteral( "centroid" ) );
-      sVectorTypes.insert( GV_LINE, QStringLiteral( "line" ) );
-      sVectorTypes.insert( GV_BOUNDARY, QStringLiteral( "boundary" ) );
-      sVectorTypes.insert( GV_AREA, QStringLiteral( "area" ) );
-      sVectorTypes.insert( GV_FACE, QStringLiteral( "face" ) );
-      sVectorTypes.insert( GV_KERNEL, QStringLiteral( "kernel" ) );
-    }
-    sMutex.unlock();
-  }
+  const thread_local QMap<int, QString> sVectorTypes
+  {
+    { GV_POINT, QStringLiteral( "point" ) },
+    { GV_CENTROID, QStringLiteral( "centroid" ) },
+    { GV_LINE, QStringLiteral( "line" ) },
+    { GV_BOUNDARY, QStringLiteral( "boundary" ) },
+    { GV_AREA, QStringLiteral( "area" ) },
+    { GV_FACE, QStringLiteral( "face" ) },
+    { GV_KERNEL, QStringLiteral( "kernel" ) },
+  };
   return sVectorTypes;
 }
 

diff --git a/src/providers/spatialite/qgsspatialiteconnpool.cpp b/src/providers/spatialite/qgsspatialiteconnpool.cpp
@@ -26,6 +26,7 @@ QgsSpatiaLiteConnPool *QgsSpatiaLiteConnPool::instance()
   {
     static QMutex sMutex;
     QMutexLocker locker( &sMutex );
+    // cppcheck-suppress identicalInnerCondition
     if ( ! sInstance )
     {
       sInstance = new QgsSpatiaLiteConnPool();