From 34c9daab4803e8e657538468407746eb2b5fadff Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 30 Dec 2015 21:35:57 +1100
Subject: [PATCH] Fix slow icon rendering in field combo box (refs #14041)

---
 src/gui/qgsfieldmodel.cpp | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp
index f0d62bb71b7f..85a8e863adc5 100644
--- a/src/gui/qgsfieldmodel.cpp
+++ b/src/gui/qgsfieldmodel.cpp
@@ -240,6 +240,25 @@ int QgsFieldModel::columnCount( const QModelIndex &parent ) const
 
 QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
 {
+  static QIcon intIcon;
+  if ( intIcon.isNull() )
+    intIcon = QgsApplication::getThemeIcon( "/mIconFieldInteger.svg" );
+  static QIcon floatIcon;
+  if ( floatIcon.isNull() )
+    floatIcon = QgsApplication::getThemeIcon( "/mIconFieldFloat.svg" );
+  static QIcon stringIcon;
+  if ( stringIcon.isNull() )
+    stringIcon = QgsApplication::getThemeIcon( "/mIconFieldText.svg" );
+  static QIcon dateIcon;
+  if ( dateIcon.isNull() )
+    dateIcon = QgsApplication::getThemeIcon( "/mIconFieldDate.svg" );
+  static QIcon dateTimeIcon;
+  if ( dateTimeIcon.isNull() )
+    dateTimeIcon = QgsApplication::getThemeIcon( "/mIconFieldDateTime.svg" );
+  static QIcon timeIcon;
+  if ( timeIcon.isNull() )
+    timeIcon = QgsApplication::getThemeIcon( "/mIconFieldTime.svg" );
+
   if ( !index.isValid() )
     return QVariant();
 
@@ -304,7 +323,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
       if ( exprIdx < 0 )
       {
         QgsField field = mFields[index.row()];
-        return ( int )field.type();
+        return static_cast< int >( field.type() );
       }
       return QVariant();
     }
@@ -364,7 +383,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
       if ( exprIdx < 0 )
       {
         QgsField field = mFields[index.row()];
-        int fieldType = ( int )field.type();
+        int fieldType = static_cast< int >( field.type() );
 
         switch ( fieldType )
         {
@@ -373,27 +392,27 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
           case QVariant::LongLong:
           case QVariant::ULongLong:
           {
-            return QgsApplication::getThemeIcon( "/mIconFieldInteger.svg" );
+            return intIcon;
           }
           case QVariant::Double:
           {
-            return QgsApplication::getThemeIcon( "/mIconFieldFloat.svg" );
+            return floatIcon;
           }
           case QVariant::String:
           {
-            return QgsApplication::getThemeIcon( "/mIconFieldText.svg" );
+            return stringIcon;
           }
           case QVariant::Date:
           {
-            return QgsApplication::getThemeIcon( "/mIconFieldDate.svg" );
+            return dateIcon;
           }
           case QVariant::DateTime:
           {
-            return QgsApplication::getThemeIcon( "/mIconFieldDateTime.svg" );
+            return dateTimeIcon;
           }
           case QVariant::Time:
           {
-            return QgsApplication::getThemeIcon( "/mIconFieldTime.svg" );
+            return timeIcon;
           }
           default:
             return QIcon();