Merge pull request #35345 from m-kuhn/wrong_arg_count_in_server_error…

…_messages Fix argument count in server error messages
qgis · Mar 25, 2020 · 9b0db6e · 9b0db6e
2 parents 30c9086 + 7d59470
commit 9b0db6e
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 );
     }