Apply suggestions from code review

Co-authored-by: Nyall Dawson <nyall.dawson@gmail.com>
qgis · Mar 9, 2021 · 2adf89c · 2adf89c
1 parent 0189efa
commit 2adf89c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -3493,7 +3493,7 @@ QgsRasterIdentifyResult QgsWmsProvider::identify( const QgsPointXY &point, QgsRa
             // Try to parse and set feature id if matches "<some string>.<integer>"
             if ( f.value( QLatin1String( "id" ) ).isString() )
             {
-              static const QRegularExpression re{ R"raw(\.(\d+)$)raw" };
+             const thread_local QRegularExpression re{ R"raw(\.(\d+)$)raw" };
               const QString idVal { f.value( QLatin1String( "id" ) ).toString() };
               const QRegularExpressionMatch match { re.match( idVal ) };
               if ( match.hasMatch() )

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -2508,7 +2508,7 @@ namespace QgsWms
     if ( layer && layer->dataProvider() )
       fid = QgsServerFeatureId::getServerFid( *feat, layer->dataProvider()->pkAttributeIndexes() );
     else
-      fid = QString::number( feat->id() );
+      fid = FID_TO_STRING( feat->id() );
 
     typeNameElement.setAttribute( QStringLiteral( "fid" ), QStringLiteral( "%1.%2" ).arg( typeName, fid ) );