Use QString multi-arg overload (clazy warning)

nyalldawson · nyalldawson · commit fd9bcd682642 · 2017-09-25T17:11:46.000+10:00
diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp
@@ -832,9 +832,9 @@ void QgsDwgImporter::addLType( const DRW_LType &data )
   if ( OGR_L_CreateFeature( layer, f ) != OGRERR_NONE )
   {
     LOG( QObject::tr( "Could not add %3 %1 [%2]" )
-         .arg( data.name.c_str() )
-         .arg( QString::fromUtf8( CPLGetLastErrorMsg() ) )
-         .arg( QObject::tr( "line type" ) )
+         .arg( data.name.c_str(),
+               QString::fromUtf8( CPLGetLastErrorMsg() ),
+               QObject::tr( "line type" ) )
        );
   }
 
diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -229,7 +229,7 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData *data, const QString &toSc
     QgsVectorLayer *srcLayer = u.vectorLayer( owner, error );
     if ( !srcLayer )
     {
-      importResults.append( tr( "%1: %2" ).arg( u.name ).arg( error ) );
+      importResults.append( tr( "%1: %2" ).arg( u.name, error ) );
       hasError = true;
       continue;
     }
diff --git a/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp b/src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
@@ -96,7 +96,7 @@ namespace Sqlite
     int r = sqlite3_prepare_v2( db, ba.constData(), ba.size(), &stmt_, nullptr );
     if ( r )
     {
-      QString err = QStringLiteral( "Query preparation error on %1: %2" ).arg( q ).arg( sqlite3_errmsg( db ) );
+      QString err = QStringLiteral( "Query preparation error on %1: %2" ).arg( q, sqlite3_errmsg( db ) );
       throw std::runtime_error( err.toUtf8().constData() );
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -832,9 +832,9 @@ void QgsDwgImporter::addLType( const DRW_LType &data )`
`832`	`832`	`if ( OGR_L_CreateFeature( layer, f ) != OGRERR_NONE )`
`833`	`833`	`{`
`834`	`834`	`LOG( QObject::tr( "Could not add %3 %1 [%2]" )`
`835`		`- .arg( data.name.c_str() )`
`836`		`- .arg( QString::fromUtf8( CPLGetLastErrorMsg() ) )`
`837`		`- .arg( QObject::tr( "line type" ) )`
	`835`	`+ .arg( data.name.c_str(),`
	`836`	`+ QString::fromUtf8( CPLGetLastErrorMsg() ),`
	`837`	`+ QObject::tr( "line type" ) )`
`838`	`838`	`);`
`839`	`839`	`}`
`840`	`840`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ bool QgsPGConnectionItem::handleDrop( const QMimeData *data, const QString &toSc`
`229`	`229`	`QgsVectorLayer *srcLayer = u.vectorLayer( owner, error );`
`230`	`230`	`if ( !srcLayer )`
`231`	`231`	`{`
`232`		`- importResults.append( tr( "%1: %2" ).arg( u.name ).arg( error ) );`
	`232`	`+ importResults.append( tr( "%1: %2" ).arg( u.name, error ) );`
`233`	`233`	`hasError = true;`
`234`	`234`	`continue;`
`235`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ namespace Sqlite`
`96`	`96`	`int r = sqlite3_prepare_v2( db, ba.constData(), ba.size(), &stmt_, nullptr );`
`97`	`97`	`if ( r )`
`98`	`98`	`{`
`99`		`- QString err = QStringLiteral( "Query preparation error on %1: %2" ).arg( q ).arg( sqlite3_errmsg( db ) );`
	`99`	`+ QString err = QStringLiteral( "Query preparation error on %1: %2" ).arg( q, sqlite3_errmsg( db ) );`
`100`	`100`	`throw std::runtime_error( err.toUtf8().constData() );`
`101`	`101`	`}`
`102`	`102`	`}`