Revert "fix removal of temporary directories"

nyalldawson · nyalldawson · commit 9820e6b2224e · 2019-04-01T09:30:50.000+10:00
This reverts commit b141349, which causes crashes in almost every unit test.
diff --git a/python/core/auto_generated/qgsarchive.sip.in b/python/core/auto_generated/qgsarchive.sip.in
@@ -9,7 +9,6 @@
 
 
 
-
 class QgsArchive
 {
 %Docstring
diff --git a/python/core/auto_generated/qgsnetworkcontentfetcherregistry.sip.in b/python/core/auto_generated/qgsnetworkcontentfetcherregistry.sip.in
@@ -11,6 +11,8 @@
 
 
 
+
+
 class QgsFetchedContent : QObject
 {
 %Docstring
diff --git a/src/core/qgsarchive.cpp b/src/core/qgsarchive.cpp
@@ -20,6 +20,7 @@
 #include "qgsziputils.h"
 #include "qgsmessagelog.h"
 #include "qgsauxiliarystorage.h"
+#include <iostream>
 
 #include <QStandardPaths>
 #include <QUuid>
@@ -31,7 +32,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,7 +20,6 @@
 #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,6 +21,7 @@
 #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,12 +23,15 @@
 #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
-std::unique_ptr<QgsProject> QgsProject::sProject;
+QgsProject *QgsProject::sProject = nullptr;
 
 /**
     Take the given scope and key and convert them to a string list of key
@@ -410,33 +410,30 @@ QgsProject::~QgsProject()
 {
   mIsBeingDeleted = true;
 
-  if ( this != sProject.get() )
-    clear();
-
+  clear();
   delete mBadLayerHandler;
   delete mRelationManager;
   delete mLayerTreeRegistryBridge;
   delete mRootGroup;
-
-  if ( this == sProject.get() )
+  if ( this == sProject )
   {
-    sProject.release();
+    sProject = nullptr;
   }
 }
 
 void QgsProject::setInstance( QgsProject *project )
 {
-  sProject.reset( project );
+  sProject = project;
 }
 
 
 QgsProject *QgsProject::instance()
 {
-  if ( !sProject.get() )
+  if ( !sProject )
   {
-    sProject.reset( new QgsProject );
+    sProject = new QgsProject;
   }
-  return sProject.get();
+  return sProject;
 }
 
 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 std::unique_ptr<QgsProject> sProject;
+    static QgsProject *sProject;
 
     /**
      * Set the current project instance to \a project
diff --git a/src/core/qgssettings.cpp b/src/core/qgssettings.cpp
@@ -15,11 +15,9 @@
 
 
 #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;
   }
 
-  return 0;
+  exit( 0 );
 }
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -26,6 +26,7 @@
 #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,6 +17,7 @@
 
 #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,11 +33,8 @@
 #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,6 +19,11 @@
 
 #include <QDialog>
 #include <QUrl>
+#include <QProgressDialog>
+#include <QTemporaryFile>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QStandardItem>
 
 #include "ui_qgsstyleexportimportdialogbase.h"
 #include "qgis_gui.h"
@@ -31,10 +36,6 @@ class QgsStyle;
 class QgsStyleGroupSelectionDialog;
 class QgsTemporaryCursorOverride;
 class QgsStyleModel;
-class QTemporaryFile;
-class QProgressDialog;
-class QNetworkAccessManager;
-class QNetworkReply;
 
 /**
  * \ingroup gui

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`
`10`	`10`
`11`	`11`
`12`		`-`
`13`	`12`	`class QgsArchive`
`14`	`13`	`{`
`15`	`14`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`
`13`	`13`
	`14`	`+`
	`15`	`+`
`14`	`16`	`class QgsFetchedContent : QObject`
`15`	`17`	`{`
`16`	`18`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`#include "qgsziputils.h"`
`21`	`21`	`#include "qgsmessagelog.h"`
`22`	`22`	`#include "qgsauxiliarystorage.h"`
	`23`	`+#include <iostream>`
`23`	`24`
`24`	`25`	`#include <QStandardPaths>`
`25`	`26`	`#include <QUuid>`
`@@ -31,7 +32,7 @@ QgsArchive::QgsArchive()`
`31`	`32`
`32`	`33`	`QgsArchive::QgsArchive( const QgsArchive &other )`
`33`	`34`	`: mFiles( other.mFiles )`
`34`		`- , mDir( new QTemporaryDir() )`
	`35`	`+ , mDir( new QTemporaryDir() )`
`35`	`36`	`{`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`#endif`
`74`	`74`
`75`	`75`	`// canonical project instance`
`76`		`-std::unique_ptr<QgsProject> QgsProject::sProject;`
	`76`	`+QgsProject *QgsProject::sProject = nullptr;`
`77`	`77`
`78`	`78`	`/**`
`79`	`79`	`Take the given scope and key and convert them to a string list of key`
`@@ -410,33 +410,30 @@ QgsProject::~QgsProject()`
`410`	`410`	`{`
`411`	`411`	`mIsBeingDeleted = true;`
`412`	`412`
`413`		`- if ( this != sProject.get() )`
`414`		`- clear();`
`415`		`-`
	`413`	`+ clear();`
`416`	`414`	`delete mBadLayerHandler;`
`417`	`415`	`delete mRelationManager;`
`418`	`416`	`delete mLayerTreeRegistryBridge;`
`419`	`417`	`delete mRootGroup;`
`420`		`-`
`421`		`- if ( this == sProject.get() )`
	`418`	`+ if ( this == sProject )`
`422`	`419`	`{`
`423`		`- sProject.release();`
	`420`	`+ sProject = nullptr;`
`424`	`421`	`}`
`425`	`422`	`}`
`426`	`423`
`427`	`424`	`void QgsProject::setInstance( QgsProject *project )`
`428`	`425`	`{`
`429`		`- sProject.reset( project );`
	`426`	`+ sProject = project;`
`430`	`427`	`}`
`431`	`428`
`432`	`429`
`433`	`430`	`QgsProject *QgsProject::instance()`
`434`	`431`	`{`
`435`		`- if ( !sProject.get() )`
	`432`	`+ if ( !sProject )`
`436`	`433`	`{`
`437`		`- sProject.reset( new QgsProject );`
	`434`	`+ sProject = new QgsProject;`
`438`	`435`	`}`
`439`		`- return sProject.get();`
	`436`	`+ return sProject;`
`440`	`437`	`}`
`441`	`438`
`442`	`439`	`void QgsProject::setTitle( const QString &title )`
Original file line number	Diff line number	Diff line change
`@@ -84,5 +84,5 @@ int main( int argc, char **argv )`
`84`	`84`	`std::cout << -res << " CRSs could not be updated." << std::endl;`
`85`	`85`	`}`
`86`	`86`
`87`		`- return 0;`
	`87`	`+ exit( 0 );`
`88`	`88`	`}`