handle EnableChange event in QgsFilterLineEdit

qgis · Oct 25, 2018 · 9768fdd · 9768fdd
1 parent a4bb905
commit 9768fdd
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/python/gui/auto_generated/qgsfeaturelistcombobox.sip.in b/python/gui/auto_generated/qgsfeaturelistcombobox.sip.in
@@ -125,9 +125,6 @@ The index of the currently selected item.
     virtual void keyPressEvent( QKeyEvent *event );
 
 
-    virtual bool event( QEvent *event );
-
-
   signals:
 
     void modelUpdated();

diff --git a/src/gui/qgsfeaturelistcombobox.cpp b/src/gui/qgsfeaturelistcombobox.cpp
@@ -203,14 +203,6 @@ void QgsFeatureListComboBox::keyPressEvent( QKeyEvent *event )
   QComboBox::keyReleaseEvent( event );
 }
 
-bool QgsFeatureListComboBox::event( QEvent *event )
-{
-  if ( event->type() == QEvent::EnabledChange )
-    mLineEdit->setShowClearButton( true );
-
-  return QComboBox::event( event );
-}
-
 bool QgsFeatureListComboBox::allowNull() const
 {
   return mModel->allowNull();

diff --git a/src/gui/qgsfeaturelistcombobox.h b/src/gui/qgsfeaturelistcombobox.h
@@ -147,8 +147,6 @@ class GUI_EXPORT QgsFeatureListComboBox : public QComboBox
 
     void keyPressEvent( QKeyEvent *event ) override;
 
-    bool event( QEvent *event ) override;
-
   signals:
 
     /**

diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
@@ -208,7 +208,7 @@ bool QgsFilterLineEdit::shouldShowClear() const
 
 bool QgsFilterLineEdit::event( QEvent *event )
 {
-  if ( event->type() == QEvent::ReadOnlyChange )
+  if ( event->type() == QEvent::ReadOnlyChange || event->type() == QEvent::EnabledChange )
     updateClearIcon();
 
   return QLineEdit::event( event );;