Merge pull request #34052 from obrix/backport-33989-to-release-3_10

luipir · web-flow · commit caa6a1fc628a · 2020-01-27T12:59:40.000+01:00
Memory layer (and more): Delete field and re-use its name. Fixes #33488
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/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/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() );
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ QVariantMap QgsJoinByAttributeAlgorithm::processAlgorithm( const QVariantMap &pa`
`154`	`154`	`{`
`155`	`155`	`for ( int i = 0; i < outFields2.count(); ++i )`
`156`	`156`	`{`
`157`		`- outFields2[ i ].setName( prefix + outFields2[ i ].name() );`
	`157`	`+ outFields2.rename( i, prefix + outFields2[ i ].name() );`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ QVariantMap QgsJoinByNearestAlgorithm::processAlgorithm( const QVariantMap &para`
`160`	`160`	`{`
`161`	`161`	`for ( int i = 0; i < outFields2.count(); ++i )`
`162`	`162`	`{`
`163`		`- outFields2[ i ].setName( prefix + outFields2[ i ].name() );`
	`163`	`+ outFields2.rename( i, prefix + outFields2[ i ].name() );`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ bool QgsMemoryProvider::renameAttributes( const QgsFieldNameMap &renamedAttribut`
`512`	`512`	`continue;`
`513`	`513`	`}`
`514`	`514`
`515`		`- mFields[ fieldIndex ].setName( renameIt.value() );`
	`515`	`+ mFields.rename( fieldIndex, renameIt.value() );`
`516`	`516`	`}`
`517`	`517`	`return result;`
`518`	`518`	`}`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ QgsVectorLayerExporter::exportLayer( QgsVectorLayer *layer,`
`276`	`276`	`// convert field names to lowercase`
`277`	`277`	`for ( int fldIdx = 0; fldIdx < fields.count(); ++fldIdx )`
`278`	`278`	`{`
`279`		`- fields[fldIdx].setName( fields.at( fldIdx ).name().toLower() );`
	`279`	`+ fields.rename( fldIdx, fields.at( fldIdx ).name().toLower() );`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`