Fix compiler warnings

qgis · May 5, 2020 · d574bf7 · d574bf7
1 parent a3397a8
commit d574bf7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/src/core/mesh/qgsmeshlayer.cpp b/src/core/mesh/qgsmeshlayer.cpp
@@ -581,14 +581,12 @@ QgsPointXY QgsMeshLayer::snapOnElement( QgsMesh::ElementType elementType, const
   {
     case QgsMesh::Vertex:
       return snapOnVertex( point, searchRadius );
-      break;
     case QgsMesh::Edge:
       return snapOnEdge( point, searchRadius );
-      break;
     case QgsMesh::Face:
       return snapOnFace( point, searchRadius );
-      break;
   }
+  return QgsPointXY(); // avoid warnings
 }
 
 QgsMeshDatasetIndex QgsMeshLayer::staticScalarDatasetIndex() const

diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -423,7 +423,6 @@ int QgsLegendRenderer::setColumns( QList<LegendComponentGroup> &componentGroups
   double totalHeight = 0;
   qreal maxGroupHeight = 0;
   int forcedColumnBreaks = 0;
-  bool first = true;
   for ( const LegendComponentGroup &group : qgis::as_const( componentGroups ) )
   {
     totalHeight += spaceAboveGroup( group );
@@ -432,8 +431,6 @@ int QgsLegendRenderer::setColumns( QList<LegendComponentGroup> &componentGroups
 
     if ( group.placeColumnBreakBeforeGroup )
       forcedColumnBreaks++;
-
-    first = false;
   }
 
   if ( mSettings.columnCount() == 0 && forcedColumnBreaks == 0 )