Revert "Avoid recursion in feature filter model"

m-kuhn · m-kuhn · commit 59c3b86aec2f · 2017-10-30T11:45:54.000+01:00
This reverts commit a3eadd3.
diff --git a/src/core/qgsfeaturefiltermodel.cpp b/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();
 }

Original file line number	Diff line number	Diff line change
`@@ -379,8 +379,8 @@ void QgsFeatureFilterModel::setExtraIdentifierValueUnguarded( const QVariant &ex`
`379`	`379`	`mEntries.prepend( Entry( QVariant( QVariant::Int ), QStringLiteral( "%1" ).arg( tr( "NULL" ) ) ) );`
`380`	`380`	`else`
`381`	`381`	`mEntries.prepend( Entry( extraIdentifierValue, QStringLiteral( "(%1)" ).arg( extraIdentifierValue.toString() ) ) );`
`382`		`- setExtraIdentifierValueIndex( 0 );`
`383`	`382`	`endInsertRows();`
	`383`	`+ setExtraIdentifierValueIndex( 0 );`
`384`	`384`
`385`	`385`	`reloadCurrentFeature();`
`386`	`386`	`}`
`@@ -447,11 +447,11 @@ QVariant QgsFeatureFilterModel::extraIdentifierValue() const`
`447`	`447`
`448`	`448`	`void QgsFeatureFilterModel::setExtraIdentifierValue( const QVariant &extraIdentifierValue )`
`449`	`449`	`{`
`450`		`- if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() == extraIdentifierValue.isValid() )`
	`450`	`+ if ( extraIdentifierValue == mExtraIdentifierValue && extraIdentifierValue.isNull() == mExtraIdentifierValue.isNull() && mExtraIdentifierValue.isValid() )`
`451`	`451`	`return;`
`452`	`452`
`453`		`- mExtraIdentifierValue = extraIdentifierValue;`
`454`	`453`	`setExtraIdentifierValueUnguarded( extraIdentifierValue );`
`455`	`454`
	`455`	`+ mExtraIdentifierValue = extraIdentifierValue;`
`456`	`456`	`emit extraIdentifierValueChanged();`
`457`	`457`	`}`