leaner imitation of .arg

jef-n · jef-n · commit 45faef9c9497 · 2013-01-25T17:21:01.000+01:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -572,15 +572,9 @@ static QVariant fcnLPad( const QVariantList& values, QgsFeature* , QgsExpression
 static QVariant fcnFormatString( const QVariantList& values, QgsFeature* , QgsExpression *parent )
 {
   QString string = getStringValue( values.at( 0 ), parent );
-  for ( int n = 1; n <= values.length() - 1; n++ )
+  for ( int n = 1; n < values.length(); n++ )
   {
-    QString arg = getStringValue( values.at( n ), parent );
-    QString place = '%' + QString::number( n );
-    if ( string.indexOf( place ) == -1 )
-    {
-      continue;
-    }
-    string.replace( place, arg );
+    string = string.arg( getStringValue( values.at( n ), parent ) );
   }
   return string;
 }

Original file line number	Diff line number	Diff line change
`@@ -572,15 +572,9 @@ static QVariant fcnLPad( const QVariantList& values, QgsFeature* , QgsExpression`
`572`	`572`	`static QVariant fcnFormatString( const QVariantList& values, QgsFeature* , QgsExpression *parent )`
`573`	`573`	`{`
`574`	`574`	`QString string = getStringValue( values.at( 0 ), parent );`
`575`		`- for ( int n = 1; n <= values.length() - 1; n++ )`
	`575`	`+ for ( int n = 1; n < values.length(); n++ )`
`576`	`576`	`{`
`577`		`- QString arg = getStringValue( values.at( n ), parent );`
`578`		`- QString place = '%' + QString::number( n );`
`579`		`- if ( string.indexOf( place ) == -1 )`
`580`		`- {`
`581`		`- continue;`
`582`		`- }`
`583`		`- string.replace( place, arg );`
	`577`	`+ string = string.arg( getStringValue( values.at( n ), parent ) );`
`584`	`578`	`}`
`585`	`579`	`return string;`
`586`	`580`	`}`