Merge pull request #33989 from obrix/fix_33488

Memory layer (and more): Delete field and re-use its name. Fixes #33488
qgis · Jan 25, 2020 · f82932e · f82932e
2 parents d453f74 + 2540f0f
commit f82932e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/src/analysis/processing/qgsalgorithmjoinbyattribute.cpp b/src/analysis/processing/qgsalgorithmjoinbyattribute.cpp
@@ -154,7 +154,7 @@ QVariantMap QgsJoinByAttributeAlgorithm::processAlgorithm( const QVariantMap &pa
   {
     for ( int i = 0; i < outFields2.count(); ++i )
     {
-      outFields2[ i ].setName( prefix + outFields2[ i ].name() );
+      outFields2.rename( i, prefix + outFields2[ i ].name() );
     }
   }
 

diff --git a/src/analysis/processing/qgsalgorithmjoinbylocation.cpp b/src/analysis/processing/qgsalgorithmjoinbylocation.cpp
@@ -159,7 +159,7 @@ QVariantMap QgsJoinByLocationAlgorithm::processAlgorithm( const QVariantMap &par
   {
     for ( int i = 0; i < joinFields.count(); ++i )
     {
-      joinFields[ i ].setName( prefix + joinFields[ i ].name() );
+      joinFields.rename( i, prefix + joinFields[ i ].name() );
     }
   }
 

diff --git a/src/analysis/processing/qgsalgorithmjoinbynearest.cpp b/src/analysis/processing/qgsalgorithmjoinbynearest.cpp
@@ -160,7 +160,7 @@ QVariantMap QgsJoinByNearestAlgorithm::processAlgorithm( const QVariantMap &para
   {
     for ( int i = 0; i < outFields2.count(); ++i )
     {
-      outFields2[ i ].setName( prefix + outFields2[ i ].name() );
+      outFields2.rename( i, prefix + outFields2[ i ].name() );
     }
   }
 

diff --git a/src/analysis/processing/qgsalgorithmrenametablefield.cpp b/src/analysis/processing/qgsalgorithmrenametablefield.cpp
@@ -90,7 +90,7 @@ QgsFields QgsRenameTableFieldAlgorithm::outputFields( const QgsFields &inputFiel
   if ( outFields.lookupField( mNewName ) >= 0 )
     throw QgsProcessingException( QObject::tr( "A field already exists with the name %1" ).arg( mNewName ) );
 
-  outFields[ index ].setName( mNewName );
+  outFields.rename( index, mNewName );
   return outFields;
 }
 

diff --git a/src/core/providers/memory/qgsmemoryprovider.cpp b/src/core/providers/memory/qgsmemoryprovider.cpp
@@ -512,7 +512,7 @@ bool QgsMemoryProvider::renameAttributes( const QgsFieldNameMap &renamedAttribut
       continue;
     }
 
-    mFields[ fieldIndex ].setName( renameIt.value() );
+    mFields.rename( fieldIndex, renameIt.value() );
   }
   return result;
 }

diff --git a/src/core/qgsvectorlayerexporter.cpp b/src/core/qgsvectorlayerexporter.cpp
@@ -276,7 +276,7 @@ QgsVectorLayerExporter::exportLayer( QgsVectorLayer *layer,
     // convert field names to lowercase
     for ( int fldIdx = 0; fldIdx < fields.count(); ++fldIdx )
     {
-      fields[fldIdx].setName( fields.at( fldIdx ).name().toLower() );
+      fields.rename( fldIdx, fields.at( fldIdx ).name().toLower() );
     }
   }