File tree Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Expand file tree Collapse file tree 2 files changed +8
-1
lines changed Original file line number Diff line number Diff line change @@ -290,6 +290,9 @@ QIcon QgsFields::iconForField( int fieldIdx ) const
290
290
291
291
int QgsFields::lookupField ( const QString& fieldName ) const
292
292
{
293
+ if ( fieldName.isEmpty () ) // shortcut
294
+ return -1 ;
295
+
293
296
for ( int idx = 0 ; idx < count (); ++idx )
294
297
{
295
298
if ( d->fields [idx].field .name () == fieldName )
@@ -305,7 +308,7 @@ int QgsFields::lookupField( const QString& fieldName ) const
305
308
for ( int idx = 0 ; idx < count (); ++idx )
306
309
{
307
310
QString alias = d->fields [idx].field .alias ();
308
- if ( !alias.isNull () && QString::compare ( alias, fieldName, Qt::CaseInsensitive ) == 0 )
311
+ if ( !alias.isEmpty () && QString::compare ( alias, fieldName, Qt::CaseInsensitive ) == 0 )
309
312
return idx;
310
313
}
311
314
Original file line number Diff line number Diff line change @@ -335,8 +335,12 @@ void TestQgsFields::indexFromName()
335
335
QgsField field2 ( QStringLiteral ( " testfield2" ) );
336
336
fields.append ( field2 );
337
337
QgsField field3 ( QStringLiteral ( " testfield3" ) );
338
+ field3.setAlias ( QStringLiteral ( " " ) );
338
339
fields.append ( field3 );
339
340
341
+ QCOMPARE ( fields.lookupField ( QString ( " " ) ), -1 );
342
+ QCOMPARE ( fields.lookupField ( QString () ), -1 );
343
+
340
344
QCOMPARE ( fields.indexFromName ( QString ( " bad" ) ), -1 );
341
345
QCOMPARE ( fields.lookupField ( QString ( " bad" ) ), -1 );
342
346
QCOMPARE ( fields.indexFromName ( QString ( " testfield" ) ), 0 );
You can’t perform that action at this time.
0 commit comments