Update QgsFields nameToIndex hash on field removed

arnaud-morvan · m-kuhn · commit f31abe4dfe96 · 2015-05-26T09:12:15.000+02:00
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
@@ -259,8 +259,12 @@ void QgsFields::remove( int fieldIdx )
   if ( !exists( fieldIdx ) )
     return;
 
-  d->nameToIndex.remove( d->fields[fieldIdx].field.name() );
   d->fields.remove( fieldIdx );
+  d->nameToIndex.clear();
+  for ( int idx = 0; idx < count(); ++idx )
+  {
+    d->nameToIndex.insert( d->fields[idx].field.name(), idx );
+  }
 }
 
 void QgsFields::extend( const QgsFields& other )
diff --git a/tests/src/core/testqgsfields.cpp b/tests/src/core/testqgsfields.cpp
@@ -230,6 +230,7 @@ void TestQgsFields::remove()
   fields.remove( 0 );
   QCOMPARE( fields.count(), 1 );
   QCOMPARE( fields.at( 0 ).name(), QString( "testfield2" ) );
+  QCOMPARE( fields.indexFromName(QString( "testfield2" )), 0);
 }
 
 void TestQgsFields::extend()

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,7 @@ void TestQgsFields::remove()`
`230`	`230`	`fields.remove( 0 );`
`231`	`231`	`QCOMPARE( fields.count(), 1 );`
`232`	`232`	`QCOMPARE( fields.at( 0 ).name(), QString( "testfield2" ) );`
	`233`	`+ QCOMPARE( fields.indexFromName(QString( "testfield2" )), 0);`
`233`	`234`	`}`
`234`	`235`
`235`	`236`	`void TestQgsFields::extend()`