Fix apply search filter from attribute table and minor fixes

m-kuhn · m-kuhn · commit 5ac52173f92d · 2015-09-17T09:25:40.000+02:00
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -309,7 +309,7 @@ void QgsAttributeTableDialog::keyPressEvent( QKeyEvent* event )
 
 void QgsAttributeTableDialog::columnBoxInit()
 {
-  Q_FOREACH( QAction* a, mFilterColumnsMenu->actions() )
+  Q_FOREACH ( QAction* a, mFilterColumnsMenu->actions() )
   {
     mFilterColumnsMenu->removeAction( a );
     mFilterActionMapper->removeMappings( a );
@@ -329,7 +329,7 @@ void QgsAttributeTableDialog::columnBoxInit()
 
   QList<QgsField> fields = mLayer->fields().toList();
 
-  Q_FOREACH( const QgsField field, fields )
+  Q_FOREACH ( const QgsField field, fields )
   {
     int idx = mLayer->fieldNameIndex( field.name() );
     if ( idx < 0 )
@@ -469,7 +469,7 @@ void QgsAttributeTableDialog::filterColumnChanged( QObject* filterAction )
   }
   else
   {
-    connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged() ), SLOT( filterQueryAccepted() ) );
+    connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged( QString ) ), SLOT( filterQueryAccepted() ) );
     mApplyFilterButton->setVisible( true );
   }
 
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( int caseSensitiveCheckState )
+void QgsDefaultSearchWidgetWrapper::setCaseString( Qt::CheckState caseSensitiveCheckState )
 {
   if ( caseSensitiveCheckState == Qt::Checked )
   {
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( int );
+    void setCaseString( Qt::CheckState );
     void filterChanged();
 
   protected:

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ void QgsAttributeTableDialog::keyPressEvent( QKeyEvent* event )`
`309`	`309`
`310`	`310`	`void QgsAttributeTableDialog::columnBoxInit()`
`311`	`311`	`{`
`312`		`- Q_FOREACH( QAction* a, mFilterColumnsMenu->actions() )`
	`312`	`+ Q_FOREACH ( QAction* a, mFilterColumnsMenu->actions() )`
`313`	`313`	`{`
`314`	`314`	`mFilterColumnsMenu->removeAction( a );`
`315`	`315`	`mFilterActionMapper->removeMappings( a );`
`@@ -329,7 +329,7 @@ void QgsAttributeTableDialog::columnBoxInit()`
`329`	`329`
`330`	`330`	`QList<QgsField> fields = mLayer->fields().toList();`
`331`	`331`
`332`		`- Q_FOREACH( const QgsField field, fields )`
	`332`	`+ Q_FOREACH ( const QgsField field, fields )`
`333`	`333`	`{`
`334`	`334`	`int idx = mLayer->fieldNameIndex( field.name() );`
`335`	`335`	`if ( idx < 0 )`
`@@ -469,7 +469,7 @@ void QgsAttributeTableDialog::filterColumnChanged( QObject* filterAction )`
`469`	`469`	`}`
`470`	`470`	`else`
`471`	`471`	`{`
`472`		`- connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged() ), SLOT( filterQueryAccepted() ) );`
	`472`	`+ connect( mCurrentSearchWidgetWrapper, SIGNAL( expressionChanged( QString ) ), SLOT( filterQueryAccepted() ) );`
`473`	`473`	`mApplyFilterButton->setVisible( true );`
`474`	`474`	`}`
`475`	`475`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ QString QgsDefaultSearchWidgetWrapper::expression()`
`36`	`36`	`return mExpression;`
`37`	`37`	`}`
`38`	`38`
`39`		`-void QgsDefaultSearchWidgetWrapper::setCaseString( int caseSensitiveCheckState )`
	`39`	`+void QgsDefaultSearchWidgetWrapper::setCaseString( Qt::CheckState caseSensitiveCheckState )`
`40`	`40`	`{`
`41`	`41`	`if ( caseSensitiveCheckState == Qt::Checked )`
`42`	`42`	`{`