@@ -442,43 +442,43 @@ bool QgsFields::operator==( const QgsFields &other ) const
442
442
QgsFields::const_iterator QgsFields::constBegin () const noexcept
443
443
{
444
444
if ( d->fields .isEmpty () )
445
- return const_iterator ();
445
+ return const_iterator ();
446
446
447
447
return const_iterator ( &d->fields .first () );
448
448
}
449
449
450
450
QgsFields::const_iterator QgsFields::constEnd () const noexcept
451
- {
452
- if ( d->fields .isEmpty () )
451
+ {
452
+ if ( d->fields .isEmpty () )
453
453
return const_iterator ();
454
454
455
- return const_iterator ( &d->fields .last () + 1 );
456
- }
455
+ return const_iterator ( &d->fields .last () + 1 );
456
+ }
457
457
458
- QgsFields::const_iterator QgsFields::begin () const noexcept
459
- {
460
- if ( d->fields .isEmpty () )
461
- return const_iterator ();
458
+ QgsFields::const_iterator QgsFields::begin () const noexcept
459
+ {
460
+ if ( d->fields .isEmpty () )
461
+ return const_iterator ();
462
462
463
- return const_iterator ( &d->fields .first () );
464
- }
463
+ return const_iterator ( &d->fields .first () );
464
+ }
465
465
466
- QgsFields::const_iterator QgsFields::end () const noexcept
467
- {
468
- if ( d->fields .isEmpty () )
469
- return const_iterator ();
466
+ QgsFields::const_iterator QgsFields::end () const noexcept
467
+ {
468
+ if ( d->fields .isEmpty () )
469
+ return const_iterator ();
470
470
471
- return const_iterator ( &d->fields .last () + 1 );
472
- }
471
+ return const_iterator ( &d->fields .last () + 1 );
472
+ }
473
473
474
- QgsFields::iterator QgsFields::begin ()
475
- {
476
- if ( d->fields .isEmpty () )
477
- return iterator ();
474
+ QgsFields::iterator QgsFields::begin ()
475
+ {
476
+ if ( d->fields .isEmpty () )
477
+ return iterator ();
478
478
479
- d.detach ();
480
- return iterator ( &d->fields .first () );
481
- }
479
+ d.detach ();
480
+ return iterator ( &d->fields .first () );
481
+ }
482
482
483
483
QgsFields::iterator QgsFields::end ()
484
484
{
@@ -491,53 +491,34 @@ QgsFields::iterator QgsFields::end()
491
491
492
492
QIcon QgsFields::iconForField ( int fieldIdx ) const
493
493
{
494
- static QIcon intIcon;
495
- if ( intIcon.isNull () )
496
- intIcon = QgsApplication::getThemeIcon ( " /mIconFieldInteger.svg" );
497
- static QIcon floatIcon;
498
- if ( floatIcon.isNull () )
499
- floatIcon = QgsApplication::getThemeIcon ( " /mIconFieldFloat.svg" );
500
- static QIcon stringIcon;
501
- if ( stringIcon.isNull () )
502
- stringIcon = QgsApplication::getThemeIcon ( " /mIconFieldText.svg" );
503
- static QIcon dateIcon;
504
- if ( dateIcon.isNull () )
505
- dateIcon = QgsApplication::getThemeIcon ( " /mIconFieldDate.svg" );
506
- static QIcon dateTimeIcon;
507
- if ( dateTimeIcon.isNull () )
508
- dateTimeIcon = QgsApplication::getThemeIcon ( " /mIconFieldDateTime.svg" );
509
- static QIcon timeIcon;
510
- if ( timeIcon.isNull () )
511
- timeIcon = QgsApplication::getThemeIcon ( " /mIconFieldTime.svg" );
512
-
513
494
switch ( d->fields .at ( fieldIdx ).field .type () )
514
495
{
515
496
case QVariant::Int:
516
497
case QVariant::UInt:
517
498
case QVariant::LongLong:
518
499
case QVariant::ULongLong:
519
500
{
520
- return intIcon ;
501
+ return QgsApplication::getThemeIcon ( " /mIconFieldInteger.svg " ) ;
521
502
}
522
503
case QVariant::Double:
523
504
{
524
- return floatIcon ;
505
+ return QgsApplication::getThemeIcon ( " /mIconFieldFloat.svg " ) ;
525
506
}
526
507
case QVariant::String:
527
508
{
528
- return stringIcon ;
509
+ return QgsApplication::getThemeIcon ( " /mIconFieldText.svg " ) ;
529
510
}
530
511
case QVariant::Date:
531
512
{
532
- return dateIcon ;
513
+ return QgsApplication::getThemeIcon ( " /mIconFieldDate.svg " ) ;
533
514
}
534
515
case QVariant::DateTime:
535
516
{
536
- return dateTimeIcon ;
517
+ return QgsApplication::getThemeIcon ( " /mIconFieldDateTime.svg " ) ;
537
518
}
538
519
case QVariant::Time:
539
520
{
540
- return timeIcon ;
521
+ return QgsApplication::getThemeIcon ( " /mIconFieldTime.svg " ) ;
541
522
}
542
523
default :
543
524
return QIcon ();
0 commit comments