fix removal of temporary directories

qgis · Mar 31, 2019 · b141349c90be91f191f612b7e2a349adde3c6349 · b141349 · nyalldawson · Mar 31, 2019
1 parent ca80fb6
commit b141349c90be91f191f612b7e2a349adde3c6349
diff --git a/python/core/auto_generated/qgsarchive.sip.in b/python/core/auto_generated/qgsarchive.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsArchive
 {
 %Docstring

diff --git a/python/core/auto_generated/qgsnetworkcontentfetcherregistry.sip.in b/python/core/auto_generated/qgsnetworkcontentfetcherregistry.sip.in
@@ -11,8 +11,6 @@
 
 
 
-
-
 class QgsFetchedContent : QObject
 {
 %Docstring

diff --git a/src/core/qgsarchive.cpp b/src/core/qgsarchive.cpp
@@ -20,7 +20,6 @@
 #include "qgsziputils.h"
 #include "qgsmessagelog.h"
 #include "qgsauxiliarystorage.h"
-#include <iostream>
 
 #include <QStandardPaths>
 #include <QUuid>
@@ -32,7 +31,7 @@ QgsArchive::QgsArchive()
 
 QgsArchive::QgsArchive( const QgsArchive &other )
   : mFiles( other.mFiles )
-  ,  mDir( new QTemporaryDir() )
+  , mDir( new QTemporaryDir() )
 {
 }
 

diff --git a/src/core/qgsarchive.h b/src/core/qgsarchive.h
@@ -20,6 +20,7 @@
 #define QGSARCHIVE_H
 
 #include "qgis_core.h"
+
 #include <QStringList>
 #include <QTemporaryFile>
 #include <QTemporaryDir>

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -21,7 +21,6 @@
 #include <cmath>
 
 #include <QDir>
-#include <QTemporaryFile>
 #include <QDomNode>
 #include <QDomElement>
 #include <QFileInfo>

diff --git a/src/core/qgsnetworkcontentfetcherregistry.h b/src/core/qgsnetworkcontentfetcherregistry.h
@@ -23,15 +23,12 @@
 #include <QMap>
 #include <QMutex>
 #include <QNetworkReply>
-#include <QTemporaryFile>
 
 #include "qgis_core.h"
-
-class QTemporaryFile;
-
 #include "qgstaskmanager.h"
 #include "qgsnetworkcontentfetchertask.h"
 
+class QTemporaryFile;
 
 /**
  * \class QgsFetchedContent

diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -73,7 +73,7 @@
 #endif
 
 // canonical project instance
-QgsProject *QgsProject::sProject = nullptr;
+std::unique_ptr<QgsProject> QgsProject::sProject;
 
 /**
     Take the given scope and key and convert them to a string list of key
@@ -410,30 +410,33 @@ QgsProject::~QgsProject()
 {
   mIsBeingDeleted = true;
 
-  clear();
+  if ( this != sProject.get() )
+    clear();
+
   delete mBadLayerHandler;
   delete mRelationManager;
   delete mLayerTreeRegistryBridge;
   delete mRootGroup;
-  if ( this == sProject )
+
+  if ( this == sProject.get() )
   {
-    sProject = nullptr;
+    sProject.release();
   }
 }
 
 void QgsProject::setInstance( QgsProject *project )
 {
-  sProject = project;
+  sProject.reset( project );
 }
 
 
 QgsProject *QgsProject::instance()
 {
-  if ( !sProject )
+  if ( !sProject.get() )
   {
-    sProject = new QgsProject;
+    sProject.reset( new QgsProject );
   }
-  return sProject;
+  return sProject.get();
 }
 
 void QgsProject::setTitle( const QString &title )

diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -1385,7 +1385,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
 
   private:
 
-    static QgsProject *sProject;
+    static std::unique_ptr<QgsProject> sProject;
 
     /**
      * Set the current project instance to \a project

diff --git a/src/core/qgssettings.cpp b/src/core/qgssettings.cpp
@@ -15,9 +15,11 @@
 
 
 #include <cstdlib>
+
 #include <QFileInfo>
 #include <QSettings>
 #include <QDir>
+#include <QCoreApplication>
 
 #include "qgssettings.h"
 #include "qgslogger.h"

diff --git a/src/crssync/main.cpp b/src/crssync/main.cpp
@@ -84,5 +84,5 @@ int main( int argc, char **argv )
     std::cout << -res << " CRSs could not be updated." << std::endl;
   }
 
-  exit( 0 );
+  return 0;
 }
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -26,7 +26,6 @@
 #include "qgsguiutils.h"
 
 #include <QPainter>
-#include <QTemporaryFile>
 #include <QMouseEvent>
 #include <QMenu>
 #include <QClipboard>

diff --git a/src/gui/qgscolorbutton.h b/src/gui/qgscolorbutton.h
@@ -17,7 +17,6 @@
 
 #include <QColorDialog>
 #include <QToolButton>
-#include <QTemporaryFile>
 #include "qgis_gui.h"
 #include "qgis_sip.h"
 

diff --git a/src/gui/symbology/qgsstyleexportimportdialog.cpp b/src/gui/symbology/qgsstyleexportimportdialog.cpp
@@ -33,8 +33,11 @@
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QProgressDialog>
 #include <QPushButton>
 #include <QStandardItemModel>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 
 
 QgsStyleExportImportDialog::QgsStyleExportImportDialog( QgsStyle *style, QWidget *parent, Mode mode )

diff --git a/src/gui/symbology/qgsstyleexportimportdialog.h b/src/gui/symbology/qgsstyleexportimportdialog.h
@@ -19,11 +19,6 @@
 
 #include <QDialog>
 #include <QUrl>
-#include <QProgressDialog>
-#include <QTemporaryFile>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QStandardItem>
 
 #include "ui_qgsstyleexportimportdialogbase.h"
 #include "qgis_gui.h"
@@ -36,6 +31,10 @@ class QgsStyle;
 class QgsStyleGroupSelectionDialog;
 class QgsTemporaryCursorOverride;
 class QgsStyleModel;
+class QTemporaryFile;
+class QProgressDialog;
+class QNetworkAccessManager;
+class QNetworkReply;
 
 /**
  * \ingroup gui