Revert "QgsLayoutAtlasWidget: Disconnect signals when layout RIP"

elpaso · elpaso · commit 47f739c70ee2 · 2019-05-28T10:52:32.000+02:00
This reverts commit 1626565. Found a better way to delete the widget when designer dialog is closed.
diff --git a/src/app/layout/qgslayoutatlaswidget.cpp b/src/app/layout/qgslayoutatlaswidget.cpp
@@ -65,14 +65,6 @@ QgsLayoutAtlasWidget::QgsLayoutAtlasWidget( QWidget *parent, QgsPrintLayout *lay
   }
   connect( mAtlasFileFormat, qgis::overload<int>::of( &QComboBox::currentIndexChanged ), this, [ = ]( int ) { changeFileFormat(); } );
 
-  // Disconnect when layout is destroyed
-  connect( layout, &QgsPrintLayout::destroyed, [ = ]
-  {
-    disconnect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, mAtlasSortExpressionWidget, &QgsFieldExpressionWidget::setLayer );
-    disconnect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, mPageNameWidget, &QgsFieldExpressionWidget::setLayer );
-    disconnect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, this, &QgsLayoutAtlasWidget::changeCoverageLayer );
-  } );
-
   updateGuiElements();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,6 @@ QgsLayoutAtlasWidget::QgsLayoutAtlasWidget( QWidget parent, QgsPrintLayout lay`
`65`	`65`	`}`
`66`	`66`	`connect( mAtlasFileFormat, qgis::overload<int>::of( &QComboBox::currentIndexChanged ), this, [ = ]( int ) { changeFileFormat(); } );`
`67`	`67`
`68`		`- // Disconnect when layout is destroyed`
`69`		`- connect( layout, &QgsPrintLayout::destroyed, [ = ]`
`70`		`- {`
`71`		`- disconnect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, mAtlasSortExpressionWidget, &QgsFieldExpressionWidget::setLayer );`
`72`		`- disconnect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, mPageNameWidget, &QgsFieldExpressionWidget::setLayer );`
`73`		`- disconnect( mAtlasCoverageLayerComboBox, &QgsMapLayerComboBox::layerChanged, this, &QgsLayoutAtlasWidget::changeCoverageLayer );`
`74`		`- } );`
`75`		`-`
`76`	`68`	`updateGuiElements();`
`77`	`69`	`}`
`78`	`70`