Merge pull request #4504 from nyalldawson/project_cleanup

nyalldawson · web-flow · commit 27ab5a0eaf0b · 2017-05-06T12:37:26.000+10:00
Cleanup project closing
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4768,8 +4768,6 @@ void QgisApp::fileNew( bool promptToSaveFlag, bool forceBlank )
   closeProject();
 
   QgsProject *prj = QgsProject::instance();
-  prj->clear();
-
   prj->layerTreeRegistryBridge()->setNewLayersVisible( settings.value( QStringLiteral( "qgis/new_layers_visible" ), true ).toBool() );
 
   //set the color for selections
@@ -8737,11 +8735,6 @@ void QgisApp::removingLayers( const QStringList &layers )
   }
 }
 
-void QgisApp::removeAllLayers()
-{
-  QgsProject::instance()->removeAllMapLayers();
-}
-
 void QgisApp::removeLayer()
 {
   if ( !mLayerTreeView )
@@ -10032,7 +10025,7 @@ void QgisApp::closeProject()
   mMapCanvas->clearCache();
   mOverviewCanvas->setLayers( QList<QgsMapLayer *>() );
   mMapCanvas->freeze( false );
-  removeAllLayers();
+  QgsProject::instance()->clear();
 }
 
 
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -206,8 +206,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     //! Set the extents of the map canvas
     void setExtent( const QgsRectangle &rect );
-    //! Remove all layers from the map and legend - reimplements same method from qgisappbase
-    void removeAllLayers();
 
     /** Open a raster or vector file; ignore other files.
       Used to process a commandline argument, FileOpen or Drop event.
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -348,12 +348,11 @@ QgsProject::QgsProject( QObject *parent )
 
 QgsProject::~QgsProject()
 {
+  clear();
   delete mBadLayerHandler;
   delete mRelationManager;
   delete mLayerTreeRegistryBridge;
   delete mRootGroup;
-
-  removeAllMapLayers();
 }
 
 
@@ -487,6 +486,7 @@ void QgsProject::clear()
   writeEntry( QStringLiteral( "Measurement" ), QStringLiteral( "/DistanceUnits" ), s.value( QStringLiteral( "/qgis/measure/displayunits" ) ).toString() );
   writeEntry( QStringLiteral( "Measurement" ), QStringLiteral( "/AreaUnits" ), s.value( QStringLiteral( "/qgis/measure/areaunits" ) ).toString() );
 
+  removeAllMapLayers();
   setDirty( false );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4768,8 +4768,6 @@ void QgisApp::fileNew( bool promptToSaveFlag, bool forceBlank )`
`4768`	`4768`	`closeProject();`
`4769`	`4769`
`4770`	`4770`	`QgsProject *prj = QgsProject::instance();`
`4771`		`- prj->clear();`
`4772`		`-`
`4773`	`4771`	`prj->layerTreeRegistryBridge()->setNewLayersVisible( settings.value( QStringLiteral( "qgis/new_layers_visible" ), true ).toBool() );`
`4774`	`4772`
`4775`	`4773`	`//set the color for selections`
`@@ -8737,11 +8735,6 @@ void QgisApp::removingLayers( const QStringList &layers )`
`8737`	`8735`	`}`
`8738`	`8736`	`}`
`8739`	`8737`
`8740`		`-void QgisApp::removeAllLayers()`
`8741`		`-{`
`8742`		`- QgsProject::instance()->removeAllMapLayers();`
`8743`		`-}`
`8744`		`-`
`8745`	`8738`	`void QgisApp::removeLayer()`
`8746`	`8739`	`{`
`8747`	`8740`	`if ( !mLayerTreeView )`
`@@ -10032,7 +10025,7 @@ void QgisApp::closeProject()`
`10032`	`10025`	`mMapCanvas->clearCache();`
`10033`	`10026`	`mOverviewCanvas->setLayers( QList<QgsMapLayer *>() );`
`10034`	`10027`	`mMapCanvas->freeze( false );`
`10035`		`- removeAllLayers();`
	`10028`	`+ QgsProject::instance()->clear();`
`10036`	`10029`	`}`
`10037`	`10030`
`10038`	`10031`
Original file line number	Diff line number	Diff line change
`@@ -348,12 +348,11 @@ QgsProject::QgsProject( QObject *parent )`
`348`	`348`
`349`	`349`	`QgsProject::~QgsProject()`
`350`	`350`	`{`
	`351`	`+ clear();`
`351`	`352`	`delete mBadLayerHandler;`
`352`	`353`	`delete mRelationManager;`
`353`	`354`	`delete mLayerTreeRegistryBridge;`
`354`	`355`	`delete mRootGroup;`
`355`		`-`
`356`		`- removeAllMapLayers();`
`357`	`356`	`}`
`358`	`357`
`359`	`358`
`@@ -487,6 +486,7 @@ void QgsProject::clear()`
`487`	`486`	`writeEntry( QStringLiteral( "Measurement" ), QStringLiteral( "/DistanceUnits" ), s.value( QStringLiteral( "/qgis/measure/displayunits" ) ).toString() );`
`488`	`487`	`writeEntry( QStringLiteral( "Measurement" ), QStringLiteral( "/AreaUnits" ), s.value( QStringLiteral( "/qgis/measure/areaunits" ) ).toString() );`
`489`	`488`
	`489`	`+ removeAllMapLayers();`
`490`	`490`	`setDirty( false );`
`491`	`491`	`}`
`492`	`492`