Merge pull request #35368 from qgis-bot/backport-35345-to-release-3_12

[Backport release-3_12] Fix argument count in server error messages
qgis · Mar 26, 2020 · 7bb4ffd · 7bb4ffd
2 parents d1390e7 + 8d72862
commit 7bb4ffd
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/server/services/wms/qgswmsparameters.cpp b/src/server/services/wms/qgswmsparameters.cpp
@@ -59,7 +59,7 @@ namespace QgsWms
 
     if ( !ok )
     {
-      const QString msg = QString( "%1 ('%2') cannot be converted into a list of geometries" ).arg( name( mName ), toString(), typeName() );
+      const QString msg = QString( "%1 ('%2') cannot be converted into a list of geometries" ).arg( name( mName ), toString() );
       QgsServerParameterDefinition::raiseError( msg );
     }
 
@@ -73,7 +73,7 @@ namespace QgsWms
 
     if ( !ok )
     {
-      const QString msg = QString( "%1 ('%2') cannot be converted into a rectangle" ).arg( name( mName ), toString(), typeName() );
+      const QString msg = QString( "%1 ('%2') cannot be converted into a rectangle" ).arg( name( mName ), toString() );
       QgsServerParameterDefinition::raiseError( msg );
     }
 
@@ -143,7 +143,7 @@ namespace QgsWms
 
     if ( !ok )
     {
-      const QString msg = QString( "%1 ('%2') cannot be converted into a list of colors" ).arg( name( mName ), toString(), typeName() );
+      const QString msg = QString( "%1 ('%2') cannot be converted into a list of colors" ).arg( name( mName ), toString() );
       QgsServerParameterDefinition::raiseError( msg );
     }
 
@@ -157,7 +157,7 @@ namespace QgsWms
 
     if ( !ok )
     {
-      const QString msg = QString( "%1 ('%2') cannot be converted into a list of int" ).arg( name( mName ), toString(), typeName() );
+      const QString msg = QString( "%1 ('%2') cannot be converted into a list of int" ).arg( name( mName ), toString() );
       QgsServerParameterDefinition::raiseError( msg );
     }
 
@@ -171,7 +171,7 @@ namespace QgsWms
 
     if ( !ok )
     {
-      const QString msg = QString( "%1 ('%2') cannot be converted into a list of float" ).arg( name( mName ), toString(), typeName() );
+      const QString msg = QString( "%1 ('%2') cannot be converted into a list of float" ).arg( name( mName ), toString() );
       QgsServerParameterDefinition::raiseError( msg );
     }