Merge pull request #2374 from slarosa/editor_widget_take_2

Attribute table filter: follow up #2316 and 5ac5217 Fix #13486 Don't hide search widget in attribute table when typing Properly connect the signals for the search case checkbox on the attribute table filter
qgis · Oct 18, 2015 · 63cea76 · 63cea76
2 parents cc9c789 + c7e732b
commit 63cea76
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp
@@ -36,7 +36,7 @@ QString QgsDefaultSearchWidgetWrapper::expression()
   return mExpression;
 }
 
-void QgsDefaultSearchWidgetWrapper::setCaseString( Qt::CheckState caseSensitiveCheckState )
+void QgsDefaultSearchWidgetWrapper::setCaseString( int caseSensitiveCheckState )
 {
   if ( caseSensitiveCheckState == Qt::Checked )
   {
@@ -74,7 +74,6 @@ void QgsDefaultSearchWidgetWrapper::setExpression( QString exp )
                 "%" + exp.replace( "'", "''" ) + "%" ); // escape quotes
   }
   mExpression = str;
-  emit expressionChanged( mExpression );
 }
 
 QWidget* QgsDefaultSearchWidgetWrapper::createWidget( QWidget* parent )

diff --git a/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h b/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h
@@ -41,7 +41,7 @@ class GUI_EXPORT QgsDefaultSearchWidgetWrapper : public QgsSearchWidgetWrapper
     void setExpression( QString exp ) override;
 
   private slots:
-    void setCaseString( Qt::CheckState );
+    void setCaseString( int caseSensitiveCheckState );
     void filterChanged();
 
   protected: