field expression widget: silence connect/disconnect noise

jef-n · jef-n · commit bc8a2e4863fb · 2016-02-04T22:20:19.000+01:00
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp
@@ -150,7 +150,8 @@ void QgsFieldExpressionWidget::setLayer( QgsMapLayer *layer )
 
 void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )
 {
-  disconnect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );
+  if ( mFieldProxyModel->sourceFieldModel()->layer() )
+    disconnect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );
 
   mExpressionContext.reset( new QgsExpressionContext() );
   mExpressionContext->appendScope( QgsExpressionContextUtils::globalScope() );
@@ -160,7 +161,8 @@ void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )
 
   mFieldProxyModel->sourceFieldModel()->setLayer( layer );
 
-  connect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), SLOT( reloadLayer() ), Qt::UniqueConnection );
+  if ( mFieldProxyModel->sourceFieldModel()->layer() )
+    connect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), SLOT( reloadLayer() ), Qt::UniqueConnection );
 }
 
 void QgsFieldExpressionWidget::setField( const QString &fieldName )

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,8 @@ void QgsFieldExpressionWidget::setLayer( QgsMapLayer *layer )`
`150`	`150`
`151`	`151`	`void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )`
`152`	`152`	`{`
`153`		`- disconnect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );`
	`153`	`+ if ( mFieldProxyModel->sourceFieldModel()->layer() )`
	`154`	`+ disconnect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), this, SLOT( reloadLayer() ) );`
`154`	`155`
`155`	`156`	`mExpressionContext.reset( new QgsExpressionContext() );`
`156`	`157`	`mExpressionContext->appendScope( QgsExpressionContextUtils::globalScope() );`
`@@ -160,7 +161,8 @@ void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )`
`160`	`161`
`161`	`162`	`mFieldProxyModel->sourceFieldModel()->setLayer( layer );`
`162`	`163`
`163`		`- connect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), SLOT( reloadLayer() ), Qt::UniqueConnection );`
	`164`	`+ if ( mFieldProxyModel->sourceFieldModel()->layer() )`
	`165`	`+ connect( mFieldProxyModel->sourceFieldModel()->layer(), SIGNAL( updatedFields() ), SLOT( reloadLayer() ), Qt::UniqueConnection );`
`164`	`166`	`}`
`165`	`167`
`166`	`168`	`void QgsFieldExpressionWidget::setField( const QString &fieldName )`