Skip to content

Commit

Permalink
Fix apply search filter from attribute table and minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Sep 17, 2015
1 parent 754f2dc commit 5ac5217
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/app/qgsattributetabledialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -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 )
Expand Down Expand Up @@ -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 );
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ QString QgsDefaultSearchWidgetWrapper::expression()
return mExpression;
}

void QgsDefaultSearchWidgetWrapper::setCaseString( int caseSensitiveCheckState )
void QgsDefaultSearchWidgetWrapper::setCaseString( Qt::CheckState caseSensitiveCheckState )
{
if ( caseSensitiveCheckState == Qt::Checked )
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 5ac5217

Please sign in to comment.