QString fixup

qgis · Aug 28, 2022 · 84cf904 · 84cf904
1 parent f56e7ef
commit 84cf904
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/app/browser/qgsinbuiltdataitemproviders.cpp b/src/app/browser/qgsinbuiltdataitemproviders.cpp
@@ -2344,8 +2344,8 @@ QString QgsRelationshipDetailsWidget::htmlMetadata( const QgsWeakRelation &relat
                       relation.referencingLayerName(),
                       relation.referencingLayerFields().at( i ) );
     }
-    metadata += fieldMetadata.join( QStringLiteral( "<br>" ) );
-    metadata += QStringLiteral( "</td></tr>\n" );
+    metadata += fieldMetadata.join( QLatin1String( "<br>" ) );
+    metadata += QLatin1String( "</td></tr>\n" );
   }
   else
   {
@@ -2373,8 +2373,8 @@ QString QgsRelationshipDetailsWidget::htmlMetadata( const QgsWeakRelation &relat
                       relation.referencingLayerFields().at( i )
                     );
     }
-    metadata += fieldMetadata.join( QStringLiteral( "<br>" ) );
-    metadata += QStringLiteral( "</td></tr>\n" );
+    metadata += fieldMetadata.join( QLatin1String( "<br>" ) );
+    metadata += QLatin1String( "</td></tr>\n" );
   }
 
   metadata += QStringLiteral( "<tr><td class=\"highlight\">" ) + tr( "Cardinality" ) + QStringLiteral( "</td><td>" ) + QgsRelation::cardinalityToDisplayString( relation.cardinality() ) + QStringLiteral( "</td></tr>\n" );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1850,7 +1850,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipBadLayers
 
   connect( QgsApplication::fontManager(), &QgsFontManager::fontDownloaded, this, [ = ]( const QStringList & families, const QString & licenseDetails )
   {
-    const QString shortMessage = tr( "Installed font %1" ).arg( families.join( QStringLiteral( ", " ) ) );
+    const QString shortMessage = tr( "Installed font %1" ).arg( families.join( QLatin1String( ", " ) ) );
     QgsMessageBarItem *messageWidget = QgsMessageBar::createMessage( QString(), shortMessage );
     if ( !licenseDetails.isEmpty() )
     {

diff --git a/src/core/providers/gdal/qgsgdalprovider.cpp b/src/core/providers/gdal/qgsgdalprovider.cpp
@@ -3478,7 +3478,7 @@ bool QgsGdalProvider::setNoDataValue( int bandNo, double noDataValue )
   {
     const QStringList errors = handler.popErrors();
     if ( !errors.empty() )
-      QgsDebugMsg( QStringLiteral( "Cannot set no data value: %1" ).arg( errors.join( QStringLiteral( ", " ) ) ) );
+      QgsDebugMsg( QStringLiteral( "Cannot set no data value: %1" ).arg( errors.join( QLatin1String( ", " ) ) ) );
     else
       QgsDebugMsg( QStringLiteral( "Cannot set no data value" ) );
     return false;

diff --git a/src/providers/arcgisrest/qgsafsprovider.cpp b/src/providers/arcgisrest/qgsafsprovider.cpp
@@ -74,7 +74,7 @@ QgsAfsProvider::QgsAfsProvider( const QString &uri, const ProviderOptions &optio
     // we may want to consider exposing the admin url as an option for users to set
     if ( adminUrl.contains( QStringLiteral( "/rest/services/" ) ) )
     {
-      adminUrl.replace( QStringLiteral( "/rest/services/" ), QStringLiteral( "/rest/admin/services/" ) );
+      adminUrl.replace( QLatin1String( "/rest/services/" ), QLatin1String( "/rest/admin/services/" ) );
       const QVariantMap adminData = QgsArcGisRestQueryUtils::getLayerInfo( adminUrl,
                                     authcfg, errorTitle, errorMessage, mRequestHeaders );
       if ( !adminData.isEmpty() )

diff --git a/src/providers/pdal/qgspdalprovider.cpp b/src/providers/pdal/qgspdalprovider.cpp
@@ -431,7 +431,7 @@ void QgsPdalProviderMetadata::buildSupportedPointCloudFileFilterAndExtensions()
       }
     }
     sExtensions.sort();
-    const QString extensionsString = QStringLiteral( "*." ).append( sExtensions.join( QStringLiteral( " *." ) ) );
+    const QString extensionsString = QStringLiteral( "*." ).append( sExtensions.join( QLatin1String( " *." ) ) );
     sFilterString = tr( "PDAL Point Clouds" ) + QString( " (%1 %2)" ).arg( extensionsString, extensionsString.toUpper() );
   } );
 }

diff --git a/src/server/services/landingpage/qgslandingpageutils.cpp b/src/server/services/landingpage/qgslandingpageutils.cpp
@@ -241,7 +241,7 @@ json QgsLandingPageUtils::projectInfo( const QString &projectUri, const QgsServe
     {
       QgsRectangle extent { viewSettings->defaultViewExtent() };
       // Need conversion?
-      if ( viewSettings->defaultViewExtent().crs().authid() != QStringLiteral( "EPSG:4326" ) )
+      if ( viewSettings->defaultViewExtent().crs().authid() != QLatin1String( "EPSG:4326" ) )
       {
         QgsCoordinateTransform ct { p->crs(), QgsCoordinateReferenceSystem::fromEpsgId( 4326 ), p->transformContext() };
         extent = ct.transform( extent );
@@ -274,7 +274,7 @@ json QgsLandingPageUtils::projectInfo( const QString &projectUri, const QgsServe
               canvasElement.firstChildElement( QStringLiteral( "ymax" ) ).text().toDouble(),
             };
             // Need conversion?
-            if ( temporaryProject.crs().authid() != QStringLiteral( "EPSG:4326" ) )
+            if ( temporaryProject.crs().authid() != QLatin1String( "EPSG:4326" ) )
             {
               QgsCoordinateTransform ct { temporaryProject.crs(), QgsCoordinateReferenceSystem::fromEpsgId( 4326 ), temporaryProject.transformContext() };
               extent = ct.transform( extent );
@@ -355,7 +355,7 @@ json QgsLandingPageUtils::projectInfo( const QString &projectUri, const QgsServe
     }
     info["extent"] = json::array( { extent.xMinimum(), extent.yMinimum(), extent.xMaximum(), extent.yMaximum() } );
     QgsRectangle geographicExtent { extent };
-    if ( targetCrs.authid() != QStringLiteral( "EPSG:4326" ) )
+    if ( targetCrs.authid() != QLatin1String( "EPSG:4326" ) )
     {
       QgsCoordinateTransform ct { targetCrs,  QgsCoordinateReferenceSystem::fromEpsgId( 4326 ), p->transformContext() };
       geographicExtent = ct.transform( geographicExtent );

diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp
@@ -556,7 +556,7 @@ void TestQgisAppClipboard::testVectorTileLayer()
   {
     if ( feature.fields().lookupField( QStringLiteral( "maritime" ) ) > -1 )
       maritimeId = feature.id();
-    else if ( feature.attribute( QStringLiteral( "class" ) ).toString() == QStringLiteral( "ocean" ) )
+    else if ( feature.attribute( QStringLiteral( "class" ) ).toString() == QLatin1String( "ocean" ) )
       oceanId = feature.id();
   }