Add QgsStyle::cleanDefaultStyle() and use it in QgsApplication::exitQgis()

rouault · rouault · commit b21701b5d74c · 2018-06-03T21:15:22.000+02:00
diff --git a/python/core/auto_generated/symbology/qgsstyle.sip.in b/python/core/auto_generated/symbology/qgsstyle.sip.in
@@ -134,6 +134,7 @@ returns 0 if not found
 Returns default application-wide style
 %End
 
+
     bool tagSymbol( StyleEntity type, const QString &symbol, const QStringList &tags );
 %Docstring
 Tags the symbol with the tags in the list
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -47,6 +47,7 @@
 #include "qgs3drendererregistry.h"
 #include "qgslayoutrendercontext.h"
 #include "qgssqliteutils.h"
+#include "qgsstyle.h"
 
 #include "gps/qgsgpsconnectionregistry.h"
 #include "processing/qgsprocessingregistry.h"
@@ -1084,6 +1085,8 @@ void QgsApplication::exitQgis()
 
   delete QgsProviderRegistry::instance();
 
+  QgsStyle::cleanDefaultStyle();
+
   // tear-down GDAL/OGR
   OGRCleanupAll();
   GDALDestroyDriverManager();
diff --git a/src/core/symbology/qgsstyle.cpp b/src/core/symbology/qgsstyle.cpp
@@ -68,6 +68,11 @@ QgsStyle *QgsStyle::defaultStyle() // static
   return sDefaultStyle;
 }
 
+void QgsStyle::cleanDefaultStyle() // static
+{
+  delete sDefaultStyle;
+  sDefaultStyle = nullptr;
+}
 
 void QgsStyle::clear()
 {
diff --git a/src/core/symbology/qgsstyle.h b/src/core/symbology/qgsstyle.h
@@ -167,6 +167,9 @@ class CORE_EXPORT QgsStyle : public QObject
     //! Returns default application-wide style
     static QgsStyle *defaultStyle();
 
+    //! Deletes the default style. Only to be used by QgsApplication::exitQgis()
+    static void cleanDefaultStyle() SIP_SKIP;
+
     /**
      * Tags the symbol with the tags in the list
      *

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,11 @@ QgsStyle *QgsStyle::defaultStyle() // static`
`68`	`68`	`return sDefaultStyle;`
`69`	`69`	`}`
`70`	`70`
	`71`	`+void QgsStyle::cleanDefaultStyle() // static`
	`72`	`+{`
	`73`	`+ delete sDefaultStyle;`
	`74`	`+ sDefaultStyle = nullptr;`
	`75`	`+}`
`71`	`76`
`72`	`77`	`void QgsStyle::clear()`
`73`	`78`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,9 @@ class CORE_EXPORT QgsStyle : public QObject`
`167`	`167`	`//! Returns default application-wide style`
`168`	`168`	`static QgsStyle *defaultStyle();`
`169`	`169`
	`170`	`+ //! Deletes the default style. Only to be used by QgsApplication::exitQgis()`
	`171`	`+ static void cleanDefaultStyle() SIP_SKIP;`
	`172`	`+`
`170`	`173`	`/**`
`171`	`174`	`* Tags the symbol with the tags in the list`
`172`	`175`	`*`