Fix some clazy issues (detach/iterating temporary, QString multi arg)

nyalldawson · nyalldawson · commit a30a73515008 · 2016-01-13T16:18:11.000+11:00
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -363,8 +363,8 @@ void QgsFieldsProperties::loadRelations()
     nmCombo->addItem( tr( "Many to one relation" ) );
     Q_FOREACH ( const QgsRelation& nmrel, QgsProject::instance()->relationManager()->referencingRelations( relation.referencingLayer() ) )
     {
-      if ( nmrel.fieldPairs().first().referencingField() != relation.fieldPairs().first().referencingField() )
-        nmCombo->addItem( QString( "%1 (%2)" ).arg( nmrel.referencedLayer()->name() ).arg( nmrel.fieldPairs().first().referencedField() ), nmrel.id() );
+      if ( nmrel.fieldPairs().at( 0 ).referencingField() != relation.fieldPairs().at( 0 ).referencingField() )
+        nmCombo->addItem( QString( "%1 (%2)" ).arg( nmrel.referencedLayer()->name(), nmrel.fieldPairs().at( 0 ).referencedField() ), nmrel.id() );
 
       QgsEditorWidgetConfig cfg = mLayer->editFormConfig()->widgetConfig( relation.id() );
 
diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp
@@ -311,9 +311,9 @@ void QgsFeatureRequest::OrderByClause::setNullsFirst( bool nullsFirst )
 QString QgsFeatureRequest::OrderByClause::dump() const
 {
   return QString( "%1 %2 %3" )
-         .arg( mExpression.expression() )
-         .arg( mAscending ? "ASC" : "DESC" )
-         .arg( mNullsFirst ? "NULLS FIRST" : "NULLS LAST" );
+         .arg( mExpression.expression(),
+               mAscending ? "ASC" : "DESC",
+               mNullsFirst ? "NULLS FIRST" : "NULLS LAST" );
 }
 
 QgsExpression QgsFeatureRequest::OrderByClause::expression() const
diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -285,8 +285,8 @@ void QgsRelationEditorWidget::addFeature()
     {
       QgsFeature flink( mRelation.referencingLayer()->fields() ); // Linking feature
 
-      flink.setAttribute( mRelation.fieldPairs().first().first, mFeature.attribute( mRelation.fieldPairs().first().second ) );
-      flink.setAttribute( mNmRelation.referencingFields().first(), f.attribute( mNmRelation.referencedFields().first() ) );
+      flink.setAttribute( mRelation.fieldPairs().at( 0 ).first, mFeature.attribute( mRelation.fieldPairs().at( 0 ).second ) );
+      flink.setAttribute( mNmRelation.referencingFields().at( 0 ), f.attribute( mNmRelation.referencedFields().at( 0 ) ) );
 
       mRelation.referencingLayer()->addFeature( flink );
 
diff --git a/src/providers/grass/qgsgrassvectormaplayer.cpp b/src/providers/grass/qgsgrassvectormaplayer.cpp
@@ -716,7 +716,7 @@ void QgsGrassVectorMapLayer::addColumn( const QgsField &field, QString &error )
           QVariant value = mAttributes.value( cat ).value( index );
           QString valueString = quotedValue( value );
           QString query = QString( "UPDATE %1 SET %2 = %3 WHERE %4 = %5" )
-                          .arg( mFieldInfo->table ).arg( field.name() ).arg( valueString ).arg( keyColumnName() ).arg( cat );
+                          .arg( mFieldInfo->table, field.name(), valueString, keyColumnName() ).arg( cat );
           QString err;
           executeSql( query, err );
           if ( !err.isEmpty() )
diff --git a/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp b/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp
@@ -50,9 +50,9 @@ QgsVirtualLayerFeatureIterator::QgsVirtualLayerFeatureIterator( QgsVirtualLayerF
       QString mbr = QString( "%1,%2,%3,%4" ).arg( rect.xMinimum() ).arg( rect.yMinimum() ).arg( rect.xMaximum() ).arg( rect.yMaximum() );
       wheres << quotedColumn( mDefinition.geometryField() ) + " is not null";
       wheres <<  QString( "%1Intersects(%2,BuildMbr(%3))" )
-      .arg( do_exact ? "" : "Mbr" )
-      .arg( quotedColumn( mDefinition.geometryField() ) )
-      .arg( mbr );
+      .arg( do_exact ? "" : "Mbr",
+            quotedColumn( mDefinition.geometryField() ),
+            mbr );
     }
     else if ( !mDefinition.uid().isNull() && request.filterType() == QgsFeatureRequest::FilterFid )
     {
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp
@@ -292,7 +292,7 @@ bool QgsVirtualLayerProvider::createIt()
     QString vname = mLayers.at( i ).name;
     if ( vlayer )
     {
-      QString createStr = QString( "DROP TABLE IF EXISTS \"%1\"; CREATE VIRTUAL TABLE \"%1\" USING QgsVLayer(%2);" ).arg( vname ).arg( vlayer->id() );
+      QString createStr = QString( "DROP TABLE IF EXISTS \"%1\"; CREATE VIRTUAL TABLE \"%1\" USING QgsVLayer(%2);" ).arg( vname, vlayer->id() );
       Sqlite::Query::exec( mSqlite.get(), createStr );
     }
     else
@@ -304,10 +304,10 @@ bool QgsVirtualLayerProvider::createIt()
       source.replace( "'", "''" );
       QString encoding = mLayers.at( i ).encoding;
       QString createStr = QString( "DROP TABLE IF EXISTS \"%1\"; CREATE VIRTUAL TABLE \"%1\" USING QgsVLayer('%2','%4',%3)" )
-                          .arg( vname )
-                          .arg( provider )
-                          .arg( encoding )
-                          .arg( source ); // source must be the last argument here, since it can contains '%x' strings that would be replaced
+                          .arg( vname,
+                                provider,
+                                encoding,
+                                source ); // source must be the last argument here, since it can contains '%x' strings that would be replaced
       Sqlite::Query::exec( mSqlite.get(), createStr );
     }
   }
@@ -410,8 +410,8 @@ bool QgsVirtualLayerProvider::createIt()
 
     // create a view
     QString viewStr = QString( "DROP VIEW IF EXISTS %1; CREATE VIEW %1 AS %2" )
-                      .arg( VIRTUAL_LAYER_QUERY_VIEW )
-                      .arg( mDefinition.query() );
+                      .arg( VIRTUAL_LAYER_QUERY_VIEW,
+                            mDefinition.query() );
     Sqlite::Query::exec( mSqlite.get(), viewStr );
   }
   else
@@ -528,9 +528,9 @@ void QgsVirtualLayerProvider::updateStatistics() const
   bool hasGeometry = mDefinition.geometryWkbType() != QgsWKBTypes::NoGeometry;
   QString subset = mSubset.isEmpty() ? "" : " WHERE " + mSubset;
   QString sql = QString( "SELECT Count(*)%1 FROM %2%3" )
-                .arg( hasGeometry ? QString( ",Min(MbrMinX(%1)),Min(MbrMinY(%1)),Max(MbrMaxX(%1)),Max(MbrMaxY(%1))" ).arg( quotedColumn( mDefinition.geometryField() ) ) : "" )
-                .arg( mTableName )
-                .arg( subset );
+                .arg( hasGeometry ? QString( ",Min(MbrMinX(%1)),Min(MbrMinY(%1)),Max(MbrMaxX(%1)),Max(MbrMaxY(%1))" ).arg( quotedColumn( mDefinition.geometryField() ) ) : "",
+                      mTableName,
+                      subset );
   Sqlite::Query q( mSqlite.get(), sql );
   if ( q.step() == SQLITE_ROW )
   {
diff --git a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
@@ -234,9 +234,10 @@ struct VTable
       sql_fields << QString( "geometry geometry(%1,%2)" ).arg( provider->geometryType() ).arg( provider->crs().postgisSrid() );
     }
 
-    if ( provider->pkAttributeIndexes().size() == 1 )
+    QgsAttributeList pkAttributeIndexes = provider->pkAttributeIndexes();
+    if ( pkAttributeIndexes.size() == 1 )
     {
-      mPkColumn = provider->pkAttributeIndexes()[0] + 1;
+      mPkColumn = pkAttributeIndexes.at( 0 ) + 1;
     }
 
     mCreationStr = "CREATE TABLE vtable (" + sql_fields.join( "," ) + ")";
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
@@ -479,7 +479,8 @@ QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryStri
   mServerInterface->setRequestHandler( theRequestHandler.data() );
   // Iterate filters and call their requestReady() method
   QgsServerFiltersMap::const_iterator filtersIterator;
-  for ( filtersIterator = mServerInterface->filters().constBegin(); filtersIterator != mServerInterface->filters().constEnd(); ++filtersIterator )
+  QgsServerFiltersMap filters = mServerInterface->filters();
+  for ( filtersIterator = filters.constBegin(); filtersIterator != filters.constEnd(); ++filtersIterator )
   {
     filtersIterator.value()->requestReady();
   }
@@ -616,7 +617,8 @@ QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryStri
 
 #ifdef HAVE_SERVER_PYTHON_PLUGINS
   // Iterate filters and call their responseComplete() method
-  for ( filtersIterator = mServerInterface->filters().constBegin(); filtersIterator != mServerInterface->filters().constEnd(); ++filtersIterator )
+  filters = mServerInterface->filters();
+  for ( filtersIterator = filters.constBegin(); filtersIterator != filters.constEnd(); ++filtersIterator )
   {
     filtersIterator.value()->responseComplete();
   }
diff --git a/src/server/qgsserverplugins.cpp b/src/server/qgsserverplugins.cpp
@@ -47,7 +47,7 @@ bool QgsServerPlugins::initPlugins( QgsServerInterface *interface )
   pythonlibName.prepend( "lib" );
 #endif
   QString version = QString( "%1.%2.%3" ).arg( QGis::QGIS_VERSION_INT / 10000 ).arg( QGis::QGIS_VERSION_INT / 100 % 100 ).arg( QGis::QGIS_VERSION_INT % 100 );
-  QgsMessageLog::logMessage( QString( "load library %1 (%2)" ).arg( pythonlibName ).arg( version ), __FILE__, QgsMessageLog::INFO );
+  QgsMessageLog::logMessage( QString( "load library %1 (%2)" ).arg( pythonlibName, version ), __FILE__, QgsMessageLog::INFO );
   QLibrary pythonlib( pythonlibName, version );
   // It's necessary to set these two load hints, otherwise Python library won't work correctly
   // see http://lists.kde.org/?l=pykde&m=117190116820758&w=2
diff --git a/src/server/qgssldconfigparser.cpp b/src/server/qgssldconfigparser.cpp
@@ -1696,8 +1696,8 @@ void QgsSLDConfigParser::setCrsForLayer( const QDomElement& layerElem, QgsMapLay
       if ( srs.srsid() == 0 )
       {
         QString myName = QString( " * %1 (%2)" )
-                         .arg( QObject::tr( "Generated CRS", "A CRS automatically generated from layer info get this prefix for description" ) )
-                         .arg( srs.toProj4() );
+                         .arg( QObject::tr( "Generated CRS", "A CRS automatically generated from layer info get this prefix for description" ),
+                               srs.toProj4() );
         srs.saveAsUserCRS( myName );
       }
 
diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp
@@ -764,7 +764,7 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
       QString errorMsg;
       if ( !filter.setContent( filterIt.value(), true, &errorMsg ) )
       {
-        throw QgsMapServiceException( "RequestNotWellFormed", QString( "error message: %1. The XML string was: %2" ).arg( errorMsg ).arg( filterIt.value() ) );
+        throw QgsMapServiceException( "RequestNotWellFormed", QString( "error message: %1. The XML string was: %2" ).arg( errorMsg, filterIt.value() ) );
       }
       else
       {
diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp
@@ -162,7 +162,7 @@ QList<QgsMapLayer*> QgsWMSProjectParser::mapLayerFromStyle( const QString& lName
     {
       // try to apply the specified style
       if ( !ml->styleManager()->setCurrentStyle( styleName != EMPTY_STYLE_NAME ? styleName : QString() ) )
-        throw QgsMapServiceException( "StyleNotDefined", QString( "Style \"%1\" does not exist for layer \"%2\"" ).arg( styleName ).arg( lName ) );
+        throw QgsMapServiceException( "StyleNotDefined", QString( "Style \"%1\" does not exist for layer \"%2\"" ).arg( styleName, lName ) );
     }
     return QList<QgsMapLayer*>() << ml;
   }
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1517,7 +1517,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, const QString& version )
 
   for ( QMap<QString, QString>::const_iterator it = mParameters.constBegin(); it != mParameters.constEnd(); ++it )
   {
-    QgsMessageLog::logMessage( QString( "%1 // %2" ).arg( it.key() ).arg( it.value() ) );
+    QgsMessageLog::logMessage( QString( "%1 // %2" ).arg( it.key(), it.value() ) );
   }
 
   if ( readLayersAndStyles( layersList, stylesList ) != 0 )
@@ -2178,7 +2178,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     if ( fReq.filterExpression() )
     {
       fReq.setFilterExpression( QString( "intersects( $geometry , geomFromWKT( '%1' ) ) AND ( %2 )" ).
-                                arg( searchRect.asWktPolygon() ).arg( fReq.filterExpression()->expression() ) );
+                                arg( searchRect.asWktPolygon(), fReq.filterExpression()->expression() ) );
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -363,8 +363,8 @@ void QgsFieldsProperties::loadRelations()`
`363`	`363`	`nmCombo->addItem( tr( "Many to one relation" ) );`
`364`	`364`	`Q_FOREACH ( const QgsRelation& nmrel, QgsProject::instance()->relationManager()->referencingRelations( relation.referencingLayer() ) )`
`365`	`365`	`{`
`366`		`- if ( nmrel.fieldPairs().first().referencingField() != relation.fieldPairs().first().referencingField() )`
`367`		`- nmCombo->addItem( QString( "%1 (%2)" ).arg( nmrel.referencedLayer()->name() ).arg( nmrel.fieldPairs().first().referencedField() ), nmrel.id() );`
	`366`	`+ if ( nmrel.fieldPairs().at( 0 ).referencingField() != relation.fieldPairs().at( 0 ).referencingField() )`
	`367`	`+ nmCombo->addItem( QString( "%1 (%2)" ).arg( nmrel.referencedLayer()->name(), nmrel.fieldPairs().at( 0 ).referencedField() ), nmrel.id() );`
`368`	`368`
`369`	`369`	`QgsEditorWidgetConfig cfg = mLayer->editFormConfig()->widgetConfig( relation.id() );`
`370`	`370`
Original file line number	Diff line number	Diff line change
`@@ -311,9 +311,9 @@ void QgsFeatureRequest::OrderByClause::setNullsFirst( bool nullsFirst )`
`311`	`311`	`QString QgsFeatureRequest::OrderByClause::dump() const`
`312`	`312`	`{`
`313`	`313`	`return QString( "%1 %2 %3" )`
`314`		`- .arg( mExpression.expression() )`
`315`		`- .arg( mAscending ? "ASC" : "DESC" )`
`316`		`- .arg( mNullsFirst ? "NULLS FIRST" : "NULLS LAST" );`
	`314`	`+ .arg( mExpression.expression(),`
	`315`	`+ mAscending ? "ASC" : "DESC",`
	`316`	`+ mNullsFirst ? "NULLS FIRST" : "NULLS LAST" );`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`QgsExpression QgsFeatureRequest::OrderByClause::expression() const`
Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,8 @@ void QgsRelationEditorWidget::addFeature()`
`285`	`285`	`{`
`286`	`286`	`QgsFeature flink( mRelation.referencingLayer()->fields() ); // Linking feature`
`287`	`287`
`288`		`- flink.setAttribute( mRelation.fieldPairs().first().first, mFeature.attribute( mRelation.fieldPairs().first().second ) );`
`289`		`- flink.setAttribute( mNmRelation.referencingFields().first(), f.attribute( mNmRelation.referencedFields().first() ) );`
	`288`	`+ flink.setAttribute( mRelation.fieldPairs().at( 0 ).first, mFeature.attribute( mRelation.fieldPairs().at( 0 ).second ) );`
	`289`	`+ flink.setAttribute( mNmRelation.referencingFields().at( 0 ), f.attribute( mNmRelation.referencedFields().at( 0 ) ) );`
`290`	`290`
`291`	`291`	`mRelation.referencingLayer()->addFeature( flink );`
`292`	`292`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ QgsVirtualLayerFeatureIterator::QgsVirtualLayerFeatureIterator( QgsVirtualLayerF`
`50`	`50`	`QString mbr = QString( "%1,%2,%3,%4" ).arg( rect.xMinimum() ).arg( rect.yMinimum() ).arg( rect.xMaximum() ).arg( rect.yMaximum() );`
`51`	`51`	`wheres << quotedColumn( mDefinition.geometryField() ) + " is not null";`
`52`	`52`	`wheres << QString( "%1Intersects(%2,BuildMbr(%3))" )`
`53`		`- .arg( do_exact ? "" : "Mbr" )`
`54`		`- .arg( quotedColumn( mDefinition.geometryField() ) )`
`55`		`- .arg( mbr );`
	`53`	`+ .arg( do_exact ? "" : "Mbr",`
	`54`	`+ quotedColumn( mDefinition.geometryField() ),`
	`55`	`+ mbr );`
`56`	`56`	`}`
`57`	`57`	`else if ( !mDefinition.uid().isNull() && request.filterType() == QgsFeatureRequest::FilterFid )`
`58`	`58`	`{`
Original file line number	Diff line number	Diff line change
`@@ -234,9 +234,10 @@ struct VTable`
`234`	`234`	`sql_fields << QString( "geometry geometry(%1,%2)" ).arg( provider->geometryType() ).arg( provider->crs().postgisSrid() );`
`235`	`235`	`}`
`236`	`236`
`237`		`- if ( provider->pkAttributeIndexes().size() == 1 )`
	`237`	`+ QgsAttributeList pkAttributeIndexes = provider->pkAttributeIndexes();`
	`238`	`+ if ( pkAttributeIndexes.size() == 1 )`
`238`	`239`	`{`
`239`		`- mPkColumn = provider->pkAttributeIndexes()[0] + 1;`
	`240`	`+ mPkColumn = pkAttributeIndexes.at( 0 ) + 1;`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`mCreationStr = "CREATE TABLE vtable (" + sql_fields.join( "," ) + ")";`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,8 @@ QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryStri`
`479`	`479`	`mServerInterface->setRequestHandler( theRequestHandler.data() );`
`480`	`480`	`// Iterate filters and call their requestReady() method`
`481`	`481`	`QgsServerFiltersMap::const_iterator filtersIterator;`
`482`		`- for ( filtersIterator = mServerInterface->filters().constBegin(); filtersIterator != mServerInterface->filters().constEnd(); ++filtersIterator )`
	`482`	`+ QgsServerFiltersMap filters = mServerInterface->filters();`
	`483`	`+ for ( filtersIterator = filters.constBegin(); filtersIterator != filters.constEnd(); ++filtersIterator )`
`483`	`484`	`{`
`484`	`485`	`filtersIterator.value()->requestReady();`
`485`	`486`	`}`
`@@ -616,7 +617,8 @@ QPair<QByteArray, QByteArray> QgsServer::handleRequest( const QString& queryStri`
`616`	`617`
`617`	`618`	`#ifdef HAVE_SERVER_PYTHON_PLUGINS`
`618`	`619`	`// Iterate filters and call their responseComplete() method`
`619`		`- for ( filtersIterator = mServerInterface->filters().constBegin(); filtersIterator != mServerInterface->filters().constEnd(); ++filtersIterator )`
	`620`	`+ filters = mServerInterface->filters();`
	`621`	`+ for ( filtersIterator = filters.constBegin(); filtersIterator != filters.constEnd(); ++filtersIterator )`
`620`	`622`	`{`
`621`	`623`	`filtersIterator.value()->responseComplete();`
`622`	`624`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1696,8 +1696,8 @@ void QgsSLDConfigParser::setCrsForLayer( const QDomElement& layerElem, QgsMapLay`
`1696`	`1696`	`if ( srs.srsid() == 0 )`
`1697`	`1697`	`{`
`1698`	`1698`	`QString myName = QString( " * %1 (%2)" )`
`1699`		`- .arg( QObject::tr( "Generated CRS", "A CRS automatically generated from layer info get this prefix for description" ) )`
`1700`		`- .arg( srs.toProj4() );`
	`1699`	`+ .arg( QObject::tr( "Generated CRS", "A CRS automatically generated from layer info get this prefix for description" ),`
	`1700`	`+ srs.toProj4() );`
`1701`	`1701`	`srs.saveAsUserCRS( myName );`
`1702`	`1702`	`}`
`1703`	`1703`