use lambda to set value to null

cherry-picked from fbbb320
qgis · Oct 30, 2018 · a5981f3 · a5981f3
1 parent 11ebdee
commit a5981f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/gui/qgsfeaturelistcombobox.cpp b/src/gui/qgsfeaturelistcombobox.cpp
@@ -53,7 +53,9 @@ QgsFeatureListComboBox::QgsFeatureListComboBox( QWidget *parent )
 
   mLineEdit = new QgsFilterLineEdit();
   mLineEdit->setSelectOnFocus( true );
-  connect( mLineEdit, &QgsFilterLineEdit::cleared, this, &QgsFeatureListComboBox::setValueToNull );
+  //set value of combo to null if delete button is pressed
+  connect( mLineEdit, &QgsFilterLineEdit::cleared, this, [ = ] { if ( allowNull() ) setCurrentIndex( nullIndex() ); } );
+
   setEditable( true );
   setLineEdit( mLineEdit );
   setModel( mModel );
@@ -256,9 +258,3 @@ void QgsFeatureListComboBox::LineEditState::restore( QLineEdit *lineEdit ) const
   if ( selectionStart > -1 )
     lineEdit->setSelection( selectionStart, selectionLength );
 }
-
-void QgsFeatureListComboBox::setValueToNull()
-{
-  if ( allowNull() )
-    setCurrentIndex( nullIndex() );
-}
diff --git a/src/gui/qgsfeaturelistcombobox.h b/src/gui/qgsfeaturelistcombobox.h
@@ -200,7 +200,6 @@ class GUI_EXPORT QgsFeatureListComboBox : public QComboBox
     void storeLineEditState();
     void restoreLineEditState();
     void onDataChanged( const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles = QVector<int>() );
-    void setValueToNull();
 
   private:
     struct LineEditState