Remove custom FALLTHROUGH define

nyalldawson · nyalldawson · commit 1d1b7c99a7e7 · 2023-10-23T16:58:17.000+10:00
We don't need this anymore since we require c++17 anyway, and
it raises build warnings due to macro redefinition with newer GRASS
diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in
@@ -2653,7 +2653,6 @@ typedef unsigned long long qgssize;
 
 
 
-
 QString geoWkt();
 %Docstring
 Wkt string that represents a geographic coord sys
diff --git a/src/app/layers/qgsapplayerhandling.cpp b/src/app/layers/qgsapplayerhandling.cpp
@@ -1530,7 +1530,7 @@ const QList<QgsVectorLayerRef> QgsAppLayerHandling::findBrokenLayerDependencies(
         {
           if ( !weakRelation.mappingTable().resolveWeakly( QgsProject::instance(), matchType ) )
             dependencies << weakRelation.mappingTable();
-          FALLTHROUGH;
+          [[fallthrough]];
         }
 
         case Qgis::RelationshipCardinality::OneToOne:
diff --git a/src/app/mesh/qgsmaptooleditmeshframe.cpp b/src/app/mesh/qgsmaptooleditmeshframe.cpp
@@ -688,7 +688,7 @@ QgsMapTool::Flags QgsMapToolEditMeshFrame::flags() const
     case Digitizing:
       if ( !mCadDockWidget->cadEnabled() || !mSelectedVertices.isEmpty() || mCurrentFaceIndex != -1 )
         return QgsMapTool::Flags() | QgsMapTool::ShowContextMenu;
-      FALLTHROUGH
+      [[fallthrough]];
     case AddingNewFace:
     case Selecting:
     case MovingSelection:
diff --git a/src/core/expression/qgsexpressionnodeimpl.cpp b/src/core/expression/qgsexpressionnodeimpl.cpp
@@ -232,7 +232,7 @@ QVariant QgsExpressionNodeBinaryOperator::evalNode( QgsExpression *parent, const
         return QVariant( sL + sR );
       }
       //intentional fall-through
-      FALLTHROUGH
+      [[fallthrough]];
     case boMinus:
     case boMul:
     case boDiv:
diff --git a/src/core/labeling/qgsvectorlayerlabeling.cpp b/src/core/labeling/qgsvectorlayerlabeling.cpp
@@ -216,7 +216,7 @@ std::unique_ptr<QgsMarkerSymbolLayer> backgroundToMarkerLayer( const QgsTextBack
         layer.reset( static_cast< QgsMarkerSymbolLayer * >( settings.markerSymbol()->symbolLayer( 0 )->clone() ) );
         break;
       }
-      FALLTHROUGH // not set, just go with the default
+      [[fallthrough]]; // not set, just go with the default
     }
     case QgsTextBackgroundSettings::ShapeCircle:
     case QgsTextBackgroundSettings::ShapeEllipse:
diff --git a/src/core/layout/qgslayoutitemmap.cpp b/src/core/layout/qgslayoutitemmap.cpp
@@ -1301,7 +1301,7 @@ bool QgsLayoutItemMap::nextExportPart()
         mCurrentExportPart = Background;
         return true;
       }
-      FALLTHROUGH
+      [[fallthrough]];
 
     case Background:
       mCurrentExportPart = Layer;
@@ -1330,7 +1330,7 @@ bool QgsLayoutItemMap::nextExportPart()
         mCurrentExportPart = Grid;
         return true;
       }
-      FALLTHROUGH
+      [[fallthrough]];
 
     case Grid:
       for ( int i = 0; i < mOverviewStack->size(); ++i )
@@ -1342,7 +1342,7 @@ bool QgsLayoutItemMap::nextExportPart()
           return true;
         }
       }
-      FALLTHROUGH
+      [[fallthrough]];
 
     case OverviewMapExtent:
       if ( frameEnabled() )
@@ -1351,15 +1351,15 @@ bool QgsLayoutItemMap::nextExportPart()
         return true;
       }
 
-      FALLTHROUGH
+      [[fallthrough]];
 
     case Frame:
       if ( isSelected() && !mLayout->renderContext().isPreviewRender() )
       {
         mCurrentExportPart = SelectionBoxes;
         return true;
       }
-      FALLTHROUGH
+      [[fallthrough]];
 
     case SelectionBoxes:
       mCurrentExportPart = End;
diff --git a/src/core/layout/qgslayoutitemmapgrid.cpp b/src/core/layout/qgslayoutitemmapgrid.cpp
@@ -641,7 +641,7 @@ void QgsLayoutItemMapGrid::draw( QPainter *p )
         break;
       }
 
-      FALLTHROUGH
+      [[fallthrough]];
     case CM:
     case MM:
       drawGridNoTransform( context, dotsPerMM );
@@ -2217,7 +2217,7 @@ void QgsLayoutItemMapGrid::calculateMaxExtension( double &top, double &right, do
         break;
       }
     }
-    FALLTHROUGH
+    [[fallthrough]];
     case CM:
     case MM:
       drawGridNoTransform( context, 0, true );
diff --git a/src/core/layout/qgslayoutitemmapitem.cpp b/src/core/layout/qgslayoutitemmapitem.cpp
@@ -279,7 +279,7 @@ void QgsLayoutItemMapItemStack::drawItems( QPainter *painter, bool ignoreStackin
         if ( !ignoreStacking )
           break;
 
-        FALLTHROUGH
+        [[fallthrough]];
       case QgsLayoutItemMapItem::StackAboveMapLabels:
         item->draw( painter );
         break;
diff --git a/src/core/pointcloud/qgspointcloudattributebyramprenderer.cpp b/src/core/pointcloud/qgspointcloudattributebyramprenderer.cpp
@@ -193,7 +193,7 @@ QList<QgsLayerTreeModelLegendNode *> QgsPointCloudAttributeByRampRenderer::creat
                                            mColorRampShader.maximumValue() );
         break;
       }
-      Q_FALLTHROUGH();
+      [[fallthrough]];
     case QgsColorRampShader::Discrete:
     case QgsColorRampShader::Exact:
     {
diff --git a/src/core/pointcloud/qgspointcloudlayerexporter.cpp b/src/core/pointcloud/qgspointcloudlayerexporter.cpp
@@ -252,7 +252,7 @@ void QgsPointCloudLayerExporter::doExport()
     case ExportFormat::Csv:
       layerCreationOptions << QStringLiteral( "GEOMETRY=AS_XYZ" )
                            << QStringLiteral( "SEPARATOR=COMMA" ); // just in case ogr changes the default lco
-      FALLTHROUGH
+      [[fallthrough]];
     case ExportFormat::Gpkg:
     case ExportFormat::Dxf:
     case ExportFormat::Shp:
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -1914,7 +1914,7 @@ bool QgsOgrProvider::addAttributeOGRLevel( const QgsField &field, bool &ignoreEr
       // other lists are supported at this moment, fall through to default for other types
 
       //intentional fall-through
-      FALLTHROUGH
+      [[fallthrough]];
 
     default:
       pushError( tr( "type %1 for field %2 not found" ).arg( field.typeName(), field.name() ) );
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -4933,16 +4933,6 @@ typedef unsigned long long qgssize;
 #endif
 #endif
 
-#if __cplusplus >= 201500
-#define FALLTHROUGH [[fallthrough]];
-#elif defined(__clang__)
-#define FALLTHROUGH [[clang::fallthrough]];
-#elif defined(__GNUC__) && __GNUC__ >= 7
-#define FALLTHROUGH [[gnu::fallthrough]];
-#else
-#define FALLTHROUGH
-#endif
-
 // see https://infektor.net/posts/2017-01-19-using-cpp17-attributes-today.html#using-the-nodiscard-attribute
 #if __cplusplus >= 201703L
 #define NODISCARD [[nodiscard]]
diff --git a/src/core/qgsmaplayerlegend.cpp b/src/core/qgsmaplayerlegend.cpp
@@ -577,7 +577,7 @@ QList<QgsLayerTreeModelLegendNode *> QgsDefaultMeshLayerLegend::createLayerTreeM
           }
           break;
         }
-        Q_FALLTHROUGH();
+        [[fallthrough]];
       case QgsColorRampShader::Discrete:
       case QgsColorRampShader::Exact:
       {
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -1305,7 +1305,7 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry &geometry,
       case Qgis::WkbType::MultiPoint25D:
         hasZValue = true;
         //intentional fall-through
-        FALLTHROUGH
+        [[fallthrough]];
       case Qgis::WkbType::MultiPoint:
       {
         QDomElement multiPointElem = doc.createElement( QStringLiteral( "gml:MultiPoint" ) );
@@ -1350,7 +1350,7 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry &geometry,
       case Qgis::WkbType::LineString25D:
         hasZValue = true;
         //intentional fall-through
-        FALLTHROUGH
+        [[fallthrough]];
       case Qgis::WkbType::LineString:
       {
         QDomElement lineStringElem = doc.createElement( QStringLiteral( "gml:LineString" ) );
@@ -1393,7 +1393,7 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry &geometry,
       case Qgis::WkbType::MultiLineString25D:
         hasZValue = true;
         //intentional fall-through
-        FALLTHROUGH
+        [[fallthrough]];
       case Qgis::WkbType::MultiLineString:
       {
         QDomElement multiLineStringElem = doc.createElement( QStringLiteral( "gml:MultiLineString" ) );
@@ -1451,7 +1451,7 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry &geometry,
       case Qgis::WkbType::Polygon25D:
         hasZValue = true;
         //intentional fall-through
-        FALLTHROUGH
+        [[fallthrough]];
       case Qgis::WkbType::Polygon:
       {
         QDomElement polygonElem = doc.createElement( QStringLiteral( "gml:Polygon" ) );
@@ -1513,7 +1513,7 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry &geometry,
       case Qgis::WkbType::MultiPolygon25D:
         hasZValue = true;
         //intentional fall-through
-        FALLTHROUGH
+        [[fallthrough]];
       case Qgis::WkbType::MultiPolygon:
       {
         QDomElement multiPolygonElem = doc.createElement( QStringLiteral( "gml:MultiPolygon" ) );
diff --git a/src/core/qgsrendercontext.cpp b/src/core/qgsrendercontext.cpp
@@ -388,7 +388,7 @@ double QgsRenderContext::convertToPainterUnits( double size, Qgis::RenderUnit un
         size = convertMetersToMapUnits( size );
       unit = Qgis::RenderUnit::MapUnits;
       // Fall through to RenderMapUnits with size in meters converted to size in MapUnits
-      FALLTHROUGH
+      [[fallthrough]];
     }
     case Qgis::RenderUnit::MapUnits:
     {
@@ -484,7 +484,7 @@ double QgsRenderContext::convertToMapUnits( double size, Qgis::RenderUnit unit,
     {
       size = convertMetersToMapUnits( size );
       // Fall through to RenderMapUnits with values of meters converted to MapUnits
-      FALLTHROUGH
+      [[fallthrough]];
     }
     case Qgis::RenderUnit::MapUnits:
     {
diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
@@ -111,7 +111,7 @@ void QgsScaleCalculator::calculateMetrics( const QgsRectangle &mapExtent, double
 
     case Qgis::DistanceUnit::Unknown:
       // assume degrees to maintain old API
-      FALLTHROUGH
+      [[fallthrough]];
 
     case Qgis::DistanceUnit::Degrees:
       // degrees require conversion to meters first
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -733,7 +733,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
           }
 
             //intentional fall-through
-          FALLTHROUGH
+          [[fallthrough]];
 
           case QVariant::List:
             // handle GPKG conversion to JSON
@@ -806,7 +806,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
               break;
             }
             //intentional fall-through
-            FALLTHROUGH
+            [[fallthrough]];
 
           default:
             //assert(0 && "invalid variant type!");
@@ -2996,7 +2996,7 @@ gdal::ogr_feature_unique_ptr QgsVectorFileWriter::createFeature( const QgsFeatur
           break;
         }
         //intentional fall-through
-        FALLTHROUGH
+        [[fallthrough]];
 
       case QVariant::Map:
       {
@@ -3017,7 +3017,7 @@ gdal::ogr_feature_unique_ptr QgsVectorFileWriter::createFeature( const QgsFeatur
       }
 
         //intentional fall-through
-      FALLTHROUGH
+      [[fallthrough]];
 
 
       default:
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
@@ -461,7 +461,7 @@ QList<QgsLayerTreeModelLegendNode *> QgsSingleBandPseudoColorRenderer::createLeg
         }
         break;
       }
-      Q_FALLTHROUGH();
+      [[fallthrough]];
     case QgsColorRampShader::Discrete:
     case QgsColorRampShader::Exact:
     {
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -1545,7 +1545,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
         const QgsMultiPoint *mp = qgsgeometry_cast< const QgsMultiPoint * >( processedGeometry );
         markers.reserve( mp->numGeometries() );
       }
-      FALLTHROUGH
+      [[fallthrough]];
       case Qgis::WkbType::MultiCurve:
       case Qgis::WkbType::MultiLineString:
       case Qgis::WkbType::GeometryCollection:
diff --git a/src/core/textrenderer/qgstextrenderer.cpp b/src/core/textrenderer/qgstextrenderer.cpp
@@ -478,7 +478,7 @@ void QgsTextRenderer::drawPart( const QRectF &rect, double rotation, Qgis::TextH
       if ( !format.buffer().enabled() )
         break;
     }
-    FALLTHROUGH
+    [[fallthrough]];
     case Qgis::TextComponent::Text:
     case Qgis::TextComponent::Shadow:
     {
@@ -528,7 +528,7 @@ void QgsTextRenderer::drawPart( QPointF origin, double rotation, Qgis::TextHoriz
       if ( !format.buffer().enabled() )
         break;
     }
-    FALLTHROUGH
+    [[fallthrough]];
     case Qgis::TextComponent::Text:
     case Qgis::TextComponent::Shadow:
     {
diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
@@ -4556,7 +4556,7 @@ QSet<QVariant> QgsVectorLayer::uniqueValues( int index, int limit ) const
         uniqueValues = mDataProvider->uniqueValues( index, limit );
         return uniqueValues;
       }
-      FALLTHROUGH
+      [[fallthrough]];
     //we need to go through each feature
     case QgsFields::OriginJoin:
     case QgsFields::OriginExpression:
@@ -4655,7 +4655,7 @@ QStringList QgsVectorLayer::uniqueStringsMatching( int index, const QString &sub
       {
         return mDataProvider->uniqueStringsMatching( index, substring, limit, feedback );
       }
-      FALLTHROUGH
+      [[fallthrough]];
     //we need to go through each feature
     case QgsFields::OriginJoin:
     case QgsFields::OriginExpression:
@@ -4789,7 +4789,7 @@ void QgsVectorLayer::minimumOrMaximumValue( int index, QVariant *minimum, QVaria
         return;
       }
     }
-    FALLTHROUGH
+    [[fallthrough]];
     // no choice but to go through all features
     case QgsFields::OriginExpression:
     case QgsFields::OriginJoin:
diff --git a/src/core/vector/qgsvectorlayerprofilegenerator.cpp b/src/core/vector/qgsvectorlayerprofilegenerator.cpp
@@ -68,7 +68,7 @@ QVector<QgsAbstractProfileResults::Feature> QgsVectorLayerProfileResults::asFeat
       if ( type != Qgis::ProfileExportType::DistanceVsElevationTable )
         return asIndividualFeatures( type, feedback );
       // distance vs elevation table results are always handled like a continuous surface
-      FALLTHROUGH
+      [[fallthrough]];
 
     case Qgis::VectorProfileType::ContinuousSurface:
       return QgsAbstractProfileSurfaceResults::asFeatures( type, feedback );
diff --git a/src/gui/annotations/qgsmaptoolmodifyannotation.cpp b/src/gui/annotations/qgsmaptoolmodifyannotation.cpp
@@ -537,7 +537,7 @@ void QgsMapToolModifyAnnotation::keyPressEvent( QKeyEvent *event )
         event->ignore(); // disable default shortcut handling (delete vector feature)
         break;
       }
-      FALLTHROUGH
+      [[fallthrough]];
     }
 
     case Action::MoveItem:
diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
@@ -2917,7 +2917,7 @@ QWidget *QgsProcessingEnumWidgetWrapper::createWidget()
         return mCheckboxPanel;
       }
     }
-    FALLTHROUGH
+    [[fallthrough]];
     case QgsProcessingGui::Modeler:
     case QgsProcessingGui::Batch:
     {
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -120,12 +120,12 @@ void QgsPropertyOverrideButton::init( int propertyKey, const QgsProperty &proper
   {
     case QgsPropertyDefinition::DataTypeBoolean:
       ts << tr( "boolean" );
-      FALLTHROUGH
+      [[fallthrough]];
 
     case QgsPropertyDefinition::DataTypeNumeric:
       ts << tr( "int" );
       ts << tr( "double" );
-      FALLTHROUGH
+      [[fallthrough]];
 
     case QgsPropertyDefinition::DataTypeString:
       ts << tr( "string" );
diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp
@@ -299,7 +299,7 @@ int QgsGrassNewMapset::nextId() const
         id = MapSet;
         break;
       }
-      FALLTHROUGH
+      [[fallthrough]];
     case Database:
     case Crs:
     case Region:
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
diff --git a/src/providers/postgres/qgspostgresexpressioncompiler.cpp b/src/providers/postgres/qgspostgresexpressioncompiler.cpp
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp

Original file line number	Diff line number	Diff line change
`@@ -1530,7 +1530,7 @@ const QList<QgsVectorLayerRef> QgsAppLayerHandling::findBrokenLayerDependencies(`
`1530`	`1530`	`{`
`1531`	`1531`	`if ( !weakRelation.mappingTable().resolveWeakly( QgsProject::instance(), matchType ) )`
`1532`	`1532`	`dependencies << weakRelation.mappingTable();`
`1533`		`- FALLTHROUGH;`
	`1533`	`+ [[fallthrough]];`
`1534`	`1534`	`}`
`1535`	`1535`
`1536`	`1536`	`case Qgis::RelationshipCardinality::OneToOne:`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ QVariant QgsExpressionNodeBinaryOperator::evalNode( QgsExpression *parent, const`
`232`	`232`	`return QVariant( sL + sR );`
`233`	`233`	`}`
`234`	`234`	`//intentional fall-through`
`235`		`- FALLTHROUGH`
	`235`	`+ [[fallthrough]];`
`236`	`236`	`case boMinus:`
`237`	`237`	`case boMul:`
`238`	`238`	`case boDiv:`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ std::unique_ptr<QgsMarkerSymbolLayer> backgroundToMarkerLayer( const QgsTextBack`
`216`	`216`	`layer.reset( static_cast< QgsMarkerSymbolLayer * >( settings.markerSymbol()->symbolLayer( 0 )->clone() ) );`
`217`	`217`	`break;`
`218`	`218`	`}`
`219`		`- FALLTHROUGH // not set, just go with the default`
	`219`	`+ [[fallthrough]]; // not set, just go with the default`
`220`	`220`	`}`
`221`	`221`	`case QgsTextBackgroundSettings::ShapeCircle:`
`222`	`222`	`case QgsTextBackgroundSettings::ShapeEllipse:`
Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@ bool QgsLayoutItemMap::nextExportPart()`
`1301`	`1301`	`mCurrentExportPart = Background;`
`1302`	`1302`	`return true;`
`1303`	`1303`	`}`
`1304`		`- FALLTHROUGH`
	`1304`	`+ [[fallthrough]];`
`1305`	`1305`
`1306`	`1306`	`case Background:`
`1307`	`1307`	`mCurrentExportPart = Layer;`
`@@ -1330,7 +1330,7 @@ bool QgsLayoutItemMap::nextExportPart()`
`1330`	`1330`	`mCurrentExportPart = Grid;`
`1331`	`1331`	`return true;`
`1332`	`1332`	`}`
`1333`		`- FALLTHROUGH`
	`1333`	`+ [[fallthrough]];`
`1334`	`1334`
`1335`	`1335`	`case Grid:`
`1336`	`1336`	`for ( int i = 0; i < mOverviewStack->size(); ++i )`
`@@ -1342,7 +1342,7 @@ bool QgsLayoutItemMap::nextExportPart()`
`1342`	`1342`	`return true;`
`1343`	`1343`	`}`
`1344`	`1344`	`}`
`1345`		`- FALLTHROUGH`
	`1345`	`+ [[fallthrough]];`
`1346`	`1346`
`1347`	`1347`	`case OverviewMapExtent:`
`1348`	`1348`	`if ( frameEnabled() )`
`@@ -1351,15 +1351,15 @@ bool QgsLayoutItemMap::nextExportPart()`
`1351`	`1351`	`return true;`
`1352`	`1352`	`}`
`1353`	`1353`
`1354`		`- FALLTHROUGH`
	`1354`	`+ [[fallthrough]];`
`1355`	`1355`
`1356`	`1356`	`case Frame:`
`1357`	`1357`	`if ( isSelected() && !mLayout->renderContext().isPreviewRender() )`
`1358`	`1358`	`{`
`1359`	`1359`	`mCurrentExportPart = SelectionBoxes;`
`1360`	`1360`	`return true;`
`1361`	`1361`	`}`
`1362`		`- FALLTHROUGH`
	`1362`	`+ [[fallthrough]];`
`1363`	`1363`
`1364`	`1364`	`case SelectionBoxes:`
`1365`	`1365`	`mCurrentExportPart = End;`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ void QgsLayoutItemMapGrid::draw( QPainter *p )`
`641`	`641`	`break;`
`642`	`642`	`}`
`643`	`643`
`644`		`- FALLTHROUGH`
	`644`	`+ [[fallthrough]];`
`645`	`645`	`case CM:`
`646`	`646`	`case MM:`
`647`	`647`	`drawGridNoTransform( context, dotsPerMM );`
`@@ -2217,7 +2217,7 @@ void QgsLayoutItemMapGrid::calculateMaxExtension( double &top, double &right, do`
`2217`	`2217`	`break;`
`2218`	`2218`	`}`
`2219`	`2219`	`}`
`2220`		`- FALLTHROUGH`
	`2220`	`+ [[fallthrough]];`
`2221`	`2221`	`case CM:`
`2222`	`2222`	`case MM:`
`2223`	`2223`	`drawGridNoTransform( context, 0, true );`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ QList<QgsLayerTreeModelLegendNode *> QgsPointCloudAttributeByRampRenderer::creat`
`193`	`193`	`mColorRampShader.maximumValue() );`
`194`	`194`	`break;`
`195`	`195`	`}`
`196`		`- Q_FALLTHROUGH();`
	`196`	`+ [[fallthrough]];`
`197`	`197`	`case QgsColorRampShader::Discrete:`
`198`	`198`	`case QgsColorRampShader::Exact:`
`199`	`199`	`{`
Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ QList<QgsLayerTreeModelLegendNode *> QgsDefaultMeshLayerLegend::createLayerTreeM`
`577`	`577`	`}`
`578`	`578`	`break;`
`579`	`579`	`}`
`580`		`- Q_FALLTHROUGH();`
	`580`	`+ [[fallthrough]];`
`581`	`581`	`case QgsColorRampShader::Discrete:`
`582`	`582`	`case QgsColorRampShader::Exact:`
`583`	`583`	`{`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ double QgsRenderContext::convertToPainterUnits( double size, Qgis::RenderUnit un`
`388`	`388`	`size = convertMetersToMapUnits( size );`
`389`	`389`	`unit = Qgis::RenderUnit::MapUnits;`
`390`	`390`	`// Fall through to RenderMapUnits with size in meters converted to size in MapUnits`
`391`		`- FALLTHROUGH`
	`391`	`+ [[fallthrough]];`
`392`	`392`	`}`
`393`	`393`	`case Qgis::RenderUnit::MapUnits:`
`394`	`394`	`{`
`@@ -484,7 +484,7 @@ double QgsRenderContext::convertToMapUnits( double size, Qgis::RenderUnit unit,`
`484`	`484`	`{`
`485`	`485`	`size = convertMetersToMapUnits( size );`
`486`	`486`	`// Fall through to RenderMapUnits with values of meters converted to MapUnits`
`487`		`- FALLTHROUGH`
	`487`	`+ [[fallthrough]];`
`488`	`488`	`}`
`489`	`489`	`case Qgis::RenderUnit::MapUnits:`
`490`	`490`	`{`
Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`//intentional fall-through`
`736`		`- FALLTHROUGH`
	`736`	`+ [[fallthrough]];`
`737`	`737`
`738`	`738`	`case QVariant::List:`
`739`	`739`	`// handle GPKG conversion to JSON`
`@@ -806,7 +806,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,`
`806`	`806`	`break;`
`807`	`807`	`}`
`808`	`808`	`//intentional fall-through`
`809`		`- FALLTHROUGH`
	`809`	`+ [[fallthrough]];`
`810`	`810`
`811`	`811`	`default:`
`812`	`812`	`//assert(0 && "invalid variant type!");`
`@@ -2996,7 +2996,7 @@ gdal::ogr_feature_unique_ptr QgsVectorFileWriter::createFeature( const QgsFeatur`
`2996`	`2996`	`break;`
`2997`	`2997`	`}`
`2998`	`2998`	`//intentional fall-through`
`2999`		`- FALLTHROUGH`
	`2999`	`+ [[fallthrough]];`
`3000`	`3000`
`3001`	`3001`	`case QVariant::Map:`
`3002`	`3002`	`{`
`@@ -3017,7 +3017,7 @@ gdal::ogr_feature_unique_ptr QgsVectorFileWriter::createFeature( const QgsFeatur`
`3017`	`3017`	`}`
`3018`	`3018`
`3019`	`3019`	`//intentional fall-through`
`3020`		`- FALLTHROUGH`
	`3020`	`+ [[fallthrough]];`
`3021`	`3021`
`3022`	`3022`
`3023`	`3023`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ QList<QgsLayerTreeModelLegendNode *> QgsSingleBandPseudoColorRenderer::createLeg`
`461`	`461`	`}`
`462`	`462`	`break;`
`463`	`463`	`}`
`464`		`- Q_FALLTHROUGH();`
	`464`	`+ [[fallthrough]];`
`465`	`465`	`case QgsColorRampShader::Discrete:`
`466`	`466`	`case QgsColorRampShader::Exact:`
`467`	`467`	`{`