avoid detach when looping on fields and convert some Q_FOREACH (#7905)

3nids · web-flow · commit 73528cd152d3 · 2018-09-14T08:25:00.000-08:00
* avoid detach when looping on fields and convert some Q_FOREACH

* fields already exist
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -108,7 +108,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QgsAttr
   connect( mActionExpressionSelect, &QAction::triggered, this, &QgsAttributeTableDialog::mActionExpressionSelect_triggered );
   connect( mMainView, &QgsDualView::showContextMenuExternally, this, &QgsAttributeTableDialog::showContextMenu );
 
-  Q_FOREACH ( const QgsField &field, mLayer->fields() )
+  const QgsFields fields = mLayer->fields();
+  for ( const QgsField &field : fields )
   {
     mVisibleFields.append( field.name() );
   }
diff --git a/src/core/qgsjsonutils.cpp b/src/core/qgsjsonutils.cpp
@@ -175,7 +175,8 @@ QString QgsJsonExporter::exportFeature( const QgsFeature &feature, const QVarian
           QgsFeatureIterator it = childLayer->getFeatures( req );
           QVector<QVariant> attributeWidgetCaches;
           int fieldIndex = 0;
-          for ( const auto &field : childLayer->fields() )
+          const QgsFields fields = childLayer->fields();
+          for ( const QgsField &field : fields )
           {
             QgsEditorWidgetSetup setup = field.editorWidgetSetup();
             QgsFieldFormatter *fieldFormatter = QgsApplication::fieldFormatterRegistry()->fieldFormatter( setup.type() );
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -256,7 +256,8 @@ bool QgsVectorLayerEditBuffer::addAttribute( const QgsField &field )
   if ( field.name().isEmpty() )
     return false;
 
-  Q_FOREACH ( const QgsField &updatedField, L->fields() )
+  const QgsFields fields = L->fields();
+  for ( const QgsField &updatedField : fields )
   {
     if ( updatedField.name() == field.name() )
       return false;
@@ -303,7 +304,8 @@ bool QgsVectorLayerEditBuffer::renameAttribute( int index, const QString &newNam
   if ( index < 0 || index >= L->fields().count() )
     return false;
 
-  Q_FOREACH ( const QgsField &updatedField, L->fields() )
+  const QgsFields fields = L->fields();
+  for ( const QgsField &updatedField : fields )
   {
     if ( updatedField.name() == newName )
       return false;
diff --git a/src/gui/qgsnewauxiliarylayerdialog.cpp b/src/gui/qgsnewauxiliarylayerdialog.cpp
@@ -27,7 +27,8 @@ QgsNewAuxiliaryLayerDialog::QgsNewAuxiliaryLayerDialog( QgsVectorLayer *layer, Q
 {
   setupUi( this );
 
-  for ( const QgsField &field : mLayer->fields() )
+  const QgsFields fields = mLayer->fields();
+  for ( const QgsField &field : fields )
     comboBox->addItem( field.name() );
 }
 
diff --git a/src/gui/qgspropertyoverridebutton.cpp b/src/gui/qgspropertyoverridebutton.cpp
@@ -155,7 +155,8 @@ void QgsPropertyOverrideButton::updateFieldLists()
   if ( mVectorLayer )
   {
     // store just a list of fields of unknown type or those that match the expected type
-    Q_FOREACH ( const QgsField &f, mVectorLayer->fields() )
+    const QgsFields fields = mVectorLayer->fields();
+    for ( const QgsField &f : fields )
     {
       bool fieldMatch = false;
       QString fieldType;
diff --git a/src/gui/symbology/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology/qgsvectorfieldsymbollayerwidget.cpp
@@ -39,7 +39,8 @@ QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( QgsVectorLayer
     mXAttributeComboBox->addItem( QString() );
     mYAttributeComboBox->addItem( QString() );
     int i = 0;
-    Q_FOREACH ( const QgsField &f, vectorLayer()->fields() )
+    const QgsFields fields = vectorLayer()->fields();
+    for ( const QgsField &f : fields )
     {
       QString fieldName = f.name();
       mXAttributeComboBox->addItem( vectorLayer()->fields().iconForField( i ), fieldName );
diff --git a/src/providers/virtual/qgsvirtuallayersourceselect.cpp b/src/providers/virtual/qgsvirtuallayersourceselect.cpp
@@ -300,7 +300,8 @@ void QgsVirtualLayerSourceSelect::updateLayersList()
     {
       apis->add( l->name() );
       QgsVectorLayer *vl = static_cast<QgsVectorLayer *>( l );
-      Q_FOREACH ( const QgsField &f, vl->fields().toList() )
+      const QgsFields fields = vl->fields();
+      for ( const QgsField &f : fields )
       {
         apis->add( f.name() );
       }
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -1459,7 +1459,7 @@ namespace QgsWms
     mAccessControl->filterFeatures( layer, fReq );
 
     QStringList attributes;
-    for ( const QgsField &field : layer->fields().toList() )
+    for ( const QgsField &field : fields )
     {
       attributes.append( field.name() );
     }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QgsAttr`
`108`	`108`	`connect( mActionExpressionSelect, &QAction::triggered, this, &QgsAttributeTableDialog::mActionExpressionSelect_triggered );`
`109`	`109`	`connect( mMainView, &QgsDualView::showContextMenuExternally, this, &QgsAttributeTableDialog::showContextMenu );`
`110`	`110`
`111`		`- Q_FOREACH ( const QgsField &field, mLayer->fields() )`
	`111`	`+ const QgsFields fields = mLayer->fields();`
	`112`	`+ for ( const QgsField &field : fields )`
`112`	`113`	`{`
`113`	`114`	`mVisibleFields.append( field.name() );`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ QgsNewAuxiliaryLayerDialog::QgsNewAuxiliaryLayerDialog( QgsVectorLayer *layer, Q`
`27`	`27`	`{`
`28`	`28`	`setupUi( this );`
`29`	`29`
`30`		`- for ( const QgsField &field : mLayer->fields() )`
	`30`	`+ const QgsFields fields = mLayer->fields();`
	`31`	`+ for ( const QgsField &field : fields )`
`31`	`32`	`comboBox->addItem( field.name() );`
`32`	`33`	`}`
`33`	`34`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,8 @@ void QgsPropertyOverrideButton::updateFieldLists()`
`155`	`155`	`if ( mVectorLayer )`
`156`	`156`	`{`
`157`	`157`	`// store just a list of fields of unknown type or those that match the expected type`
`158`		`- Q_FOREACH ( const QgsField &f, mVectorLayer->fields() )`
	`158`	`+ const QgsFields fields = mVectorLayer->fields();`
	`159`	`+ for ( const QgsField &f : fields )`
`159`	`160`	`{`
`160`	`161`	`bool fieldMatch = false;`
`161`	`162`	`QString fieldType;`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,8 @@ void QgsVirtualLayerSourceSelect::updateLayersList()`
`300`	`300`	`{`
`301`	`301`	`apis->add( l->name() );`
`302`	`302`	`QgsVectorLayer vl = static_cast<QgsVectorLayer >( l );`
`303`		`- Q_FOREACH ( const QgsField &f, vl->fields().toList() )`
	`303`	`+ const QgsFields fields = vl->fields();`
	`304`	`+ for ( const QgsField &f : fields )`
`304`	`305`	`{`
`305`	`306`	`apis->add( f.name() );`
`306`	`307`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1459,7 +1459,7 @@ namespace QgsWms`
`1459`	`1459`	`mAccessControl->filterFeatures( layer, fReq );`
`1460`	`1460`
`1461`	`1461`	`QStringList attributes;`
`1462`		`- for ( const QgsField &field : layer->fields().toList() )`
	`1462`	`+ for ( const QgsField &field : fields )`
`1463`	`1463`	`{`
`1464`	`1464`	`attributes.append( field.name() );`
`1465`	`1465`	`}`