@@ -309,7 +309,7 @@ void QgsAttributeTableDialog::keyPressEvent( QKeyEvent* event )
309309
310310void QgsAttributeTableDialog::columnBoxInit ()
311311{
312- Q_FOREACH ( QAction* a, mFilterColumnsMenu ->actions () )
312+ Q_FOREACH ( QAction* a, mFilterColumnsMenu ->actions () )
313313 {
314314 mFilterColumnsMenu ->removeAction ( a );
315315 mFilterActionMapper ->removeMappings ( a );
@@ -329,7 +329,7 @@ void QgsAttributeTableDialog::columnBoxInit()
329329
330330 QList<QgsField> fields = mLayer ->fields ().toList ();
331331
332- Q_FOREACH ( const QgsField field, fields )
332+ Q_FOREACH ( const QgsField field, fields )
333333 {
334334 int idx = mLayer ->fieldNameIndex ( field.name () );
335335 if ( idx < 0 )
@@ -506,7 +506,6 @@ void QgsAttributeTableDialog::filterShowAll()
506506 mFilterQuery ->setVisible ( false );
507507 mApplyFilterButton ->setVisible ( false );
508508 mMainView ->setFilterMode ( QgsAttributeTableFilterModel::ShowAll );
509- updateTitle ();
510509}
511510
512511void QgsAttributeTableDialog::filterSelected ()
@@ -746,7 +745,6 @@ void QgsAttributeTableDialog::filterQueryChanged( const QString& query )
746745 }
747746
748747 setFilterExpression ( str );
749- updateTitle ();
750748}
751749
752750void QgsAttributeTableDialog::filterQueryAccepted ()
@@ -782,8 +780,6 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )
782780 }
783781 }
784782
785- mMainView ->setFilterMode ( QgsAttributeTableFilterModel::ShowFilteredList );
786-
787783 QgsFeatureIds filteredFeatures;
788784 QgsDistanceArea myDa;
789785
@@ -804,7 +800,7 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )
804800 << QgsExpressionContextUtils::projectScope ()
805801 << QgsExpressionContextUtils::layerScope ( mLayer );
806802
807- if ( ! filterExpression.prepare ( &context ) )
803+ if ( !filterExpression.prepare ( &context ) )
808804 {
809805 QgisApp::instance ()->messageBar ()->pushMessage ( tr ( " Evaluation error" ), filterExpression.evalErrorString (), QgsMessageBar::WARNING, QgisApp::instance ()->messageTimeout () );
810806 }
@@ -846,4 +842,5 @@ void QgsAttributeTableDialog::setFilterExpression( QString filterString )
846842 QgisApp::instance ()->messageBar ()->pushMessage ( tr ( " Error filtering" ), filterExpression.evalErrorString (), QgsMessageBar::WARNING, QgisApp::instance ()->messageTimeout () );
847843 return ;
848844 }
845+ mMainView ->setFilterMode ( QgsAttributeTableFilterModel::ShowFilteredList );
849846}
0 commit comments