Skip to content
Permalink
Browse files

Revert "Avoid recursion in feature filter model"

This reverts commit a3eadd3.
  • Loading branch information
m-kuhn committed Oct 30, 2017
1 parent ec27839 commit 59c3b86aec2feec2c3b7c882e63ca1eea0d31157
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/core/qgsfeaturefiltermodel.cpp
@@ -379,8 +379,8 @@ void QgsFeatureFilterModel::setExtraIdentifierValueUnguarded( const QVariant &ex
mEntries.prepend( Entry( QVariant( QVariant::Int ), QStringLiteral( "%1" ).arg( tr( "NULL" ) ) ) );
else
mEntries.prepend( Entry( extraIdentifierValue, QStringLiteral( "(%1)" ).arg( extraIdentifierValue.toString() ) ) );
setExtraIdentifierValueIndex( 0 );
endInsertRows();
setExtraIdentifierValueIndex( 0 );

reloadCurrentFeature();
}
@@ -447,11 +447,11 @@ QVariant QgsFeatureFilterModel::extraIdentifierValue() const

void QgsFeatureFilterModel::setExtraIdentifierValue( const QVariant &extraIdentifierValue )
{
if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() == extraIdentifierValue.isValid() )
if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() )
return;

mExtraIdentifierValue = extraIdentifierValue;
setExtraIdentifierValueUnguarded( extraIdentifierValue );

mExtraIdentifierValue = extraIdentifierValue;
emit extraIdentifierValueChanged();
}

0 comments on commit 59c3b86

Please sign in to comment.
You can’t perform that action at this time.