Don't create a provider registry instance only to delete it

nyalldawson · nyalldawson · commit 296bfde4d00b · 2019-06-12T07:02:56.000+10:00
Clears up more debugging noise in crssync
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -1229,7 +1229,9 @@ void QgsApplication::exitQgis()
 
   delete QgsProject::instance();
 
-  delete QgsProviderRegistry::instance();
+  // avoid creating instance just to delete it!
+  if ( QgsProviderRegistry::exists() )
+    delete QgsProviderRegistry::instance();
 
   // invalidate coordinate cache while the PROJ context held by the thread-locale
   // QgsProjContextStore object is still alive. Otherwise if this later object
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -2901,8 +2901,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()
     return -1;
   }
 
-  Q_UNUSED( deleted )
-  QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 0 );
+  QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 4 );
 
   if ( errors > 0 )
     return -errors;
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -291,6 +291,11 @@ void QgsProviderRegistry::clean()
   mProviders.clear();
 }
 
+bool QgsProviderRegistry::exists()
+{
+  return static_cast< bool >( sInstance );
+}
+
 QgsProviderRegistry::~QgsProviderRegistry()
 {
   clean();
diff --git a/src/core/qgsproviderregistry.h b/src/core/qgsproviderregistry.h
@@ -296,6 +296,13 @@ class CORE_EXPORT QgsProviderRegistry
      */
     QString mProtocolDrivers;
 
+    /**
+     * Returns TRUE if registry instance exists.
+     */
+    static bool exists();
+
+    friend class QgsApplication;
+
 }; // class QgsProviderRegistry
 
 #endif //QGSPROVIDERREGISTRY_H

Original file line number	Diff line number	Diff line change
`@@ -2901,8 +2901,7 @@ int QgsCoordinateReferenceSystem::syncDatabase()`
`2901`	`2901`	`return -1;`
`2902`	`2902`	`}`
`2903`	`2903`
`2904`		`- Q_UNUSED( deleted )`
`2905`		`- QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 0 );`
	`2904`	`+ QgsDebugMsgLevel( QStringLiteral( "CRS update (inserted:%1 updated:%2 deleted:%3 errors:%4)" ).arg( QString::number( inserted ), QString::number( updated ), QString::number( deleted ), QString::number( errors ) ), 4 );`
`2906`	`2905`
`2907`	`2906`	`if ( errors > 0 )`
`2908`	`2907`	`return -errors;`
Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,11 @@ void QgsProviderRegistry::clean()`
`291`	`291`	`mProviders.clear();`
`292`	`292`	`}`
`293`	`293`
	`294`	`+bool QgsProviderRegistry::exists()`
	`295`	`+{`
	`296`	`+ return static_cast< bool >( sInstance );`
	`297`	`+}`
	`298`	`+`
`294`	`299`	`QgsProviderRegistry::~QgsProviderRegistry()`
`295`	`300`	`{`
`296`	`301`	`clean();`