Followup f4e356b

nyalldawson · nyalldawson · commit 0ea638cbc09a · 2015-06-27T14:11:44.000+10:00
diff --git a/python/gui/qgsexpressionbuilderwidget.sip b/python/gui/qgsexpressionbuilderwidget.sip
@@ -86,6 +86,7 @@ class QgsExpressionBuilderWidget : QWidget
 
     /** Loads field names and values from the specified map.
      *  @note The field values must be quoted appropriately if they are strings.
+     *  @note added in QGIS 2.12
      */
     void loadFieldsAndValues(const QMap<QString, QStringList>& fieldValues );
 
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -114,16 +114,13 @@ void QgsExpressionBuilderWidget::currentChanged( const QModelIndex &index, const
     const QStringList& values = mFieldValues[item->text()];
     mValueListWidget->setUpdatesEnabled( false );
     mValueListWidget->blockSignals( true );
-    foreach ( const QString& value, values )
-      mValueListWidget->addItem( value );
-
+    mValueListWidget->addItems( values );
     mValueListWidget->setUpdatesEnabled( true );
     mValueListWidget->blockSignals( false );
   }
 
-
   mLoadGroupBox->setVisible( item->getItemType() == QgsExpressionItem::Field && mLayer );
-  mValueGroupBox->setVisible( item->getItemType() == QgsExpressionItem::Field && mLayer || mValueListWidget->count() > 0 );
+  mValueGroupBox->setVisible(( item->getItemType() == QgsExpressionItem::Field && mLayer ) || mValueListWidget->count() > 0 );
 
   // Show the help for the current item.
   QString help = loadFunctionHelp( item );
diff --git a/src/gui/qgsexpressionbuilderwidget.h b/src/gui/qgsexpressionbuilderwidget.h
@@ -128,6 +128,7 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
 
     /** Loads field names and values from the specified map.
      *  @note The field values must be quoted appropriately if they are strings.
+     *  @note added in QGIS 2.12
      */
     void loadFieldsAndValues( const QMap<QString, QStringList>& fieldValues );
 
