add the registry to QgsApplication

3nids · 3nids · commit 75a991c09b77 · 2020-05-19T14:21:03.000+02:00
diff --git a/python/core/auto_generated/qgsapplication.sip.in b/python/core/auto_generated/qgsapplication.sip.in
@@ -857,6 +857,13 @@ Gets the registry of available scalebar renderers.
 Returns registry of available project storage implementations.
 
 .. versionadded:: 3.2
+%End
+
+    static QgsBasemapPathRegistry *basemapPathRegistry() /KeepReference/;
+%Docstring
+Returns the registry of basemaps paths
+
+.. versionadded:: 3.14
 %End
 
     static QString nullRepresentation();
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsapplication.h"
 #include "qgsauthmanager.h"
+#include "qgsbasemappathregistry.h"
 #include "qgsdataitemproviderregistry.h"
 #include "qgsexception.h"
 #include "qgsgeometry.h"
@@ -2235,6 +2236,11 @@ QgsProjectStorageRegistry *QgsApplication::projectStorageRegistry()
   return members()->mProjectStorageRegistry;
 }
 
+QgsBasemapPathRegistry *QgsApplication::basemapPathRegistry()
+{
+  return members()->mBasemapPathRegistry;
+}
+
 QgsApplication::ApplicationMembers::ApplicationMembers()
 {
   // don't use initializer lists or scoped pointers - as more objects are added here we
@@ -2369,6 +2375,7 @@ QgsApplication::ApplicationMembers::ApplicationMembers()
     mScaleBarRendererRegistry = new QgsScaleBarRendererRegistry();
     mProfiler->end();
   }
+  mBasemapPathRegistry = new QgsBasemapPathRegistry();
 }
 
 QgsApplication::ApplicationMembers::~ApplicationMembers()
@@ -2402,6 +2409,7 @@ QgsApplication::ApplicationMembers::~ApplicationMembers()
   delete mNumericFormatRegistry;
   delete mBookmarkManager;
   delete mConnectionRegistry;
+  delete mBasemapPathRegistry;
 }
 
 QgsApplication::ApplicationMembers *QgsApplication::members()
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -32,6 +32,7 @@ class QgsFieldFormatterRegistry;
 class QgsColorSchemeRegistry;
 class QgsPaintEffectRegistry;
 class QgsProjectStorageRegistry;
+class QgsBasemapPathRegistry;
 class QgsRendererRegistry;
 class QgsSvgCache;
 class QgsImageCache;
@@ -789,6 +790,12 @@ class CORE_EXPORT QgsApplication : public QApplication
      */
     static QgsProjectStorageRegistry *projectStorageRegistry() SIP_KEEPREFERENCE;
 
+    /**
+     * Returns the registry of basemaps paths
+     * \since QGIS 3.14
+     */
+    static QgsBasemapPathRegistry *basemapPathRegistry() SIP_KEEPREFERENCE;
+
     /**
      * This string is used to represent the value `NULL` throughout QGIS.
      *
@@ -913,6 +920,7 @@ class CORE_EXPORT QgsApplication : public QApplication
       QgsActionScopeRegistry *mActionScopeRegistry = nullptr;
       QgsAnnotationRegistry *mAnnotationRegistry = nullptr;
       QgsColorSchemeRegistry *mColorSchemeRegistry = nullptr;
+      QgsBasemapPathRegistry *mBasemapPathRegistry = nullptr;
       QgsNumericFormatRegistry *mNumericFormatRegistry = nullptr;
       QgsFieldFormatterRegistry *mFieldFormatterRegistry = nullptr;
       QgsGpsConnectionRegistry *mGpsConnectionRegistry = nullptr;

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`#include "qgsapplication.h"`
`17`	`17`	`#include "qgsauthmanager.h"`
	`18`	`+#include "qgsbasemappathregistry.h"`
`18`	`19`	`#include "qgsdataitemproviderregistry.h"`
`19`	`20`	`#include "qgsexception.h"`
`20`	`21`	`#include "qgsgeometry.h"`
`@@ -2235,6 +2236,11 @@ QgsProjectStorageRegistry *QgsApplication::projectStorageRegistry()`
`2235`	`2236`	`return members()->mProjectStorageRegistry;`
`2236`	`2237`	`}`
`2237`	`2238`
	`2239`	`+QgsBasemapPathRegistry *QgsApplication::basemapPathRegistry()`
	`2240`	`+{`
	`2241`	`+ return members()->mBasemapPathRegistry;`
	`2242`	`+}`
	`2243`	`+`
`2238`	`2244`	`QgsApplication::ApplicationMembers::ApplicationMembers()`
`2239`	`2245`	`{`
`2240`	`2246`	`// don't use initializer lists or scoped pointers - as more objects are added here we`
`@@ -2369,6 +2375,7 @@ QgsApplication::ApplicationMembers::ApplicationMembers()`
`2369`	`2375`	`mScaleBarRendererRegistry = new QgsScaleBarRendererRegistry();`
`2370`	`2376`	`mProfiler->end();`
`2371`	`2377`	`}`
	`2378`	`+ mBasemapPathRegistry = new QgsBasemapPathRegistry();`
`2372`	`2379`	`}`
`2373`	`2380`
`2374`	`2381`	`QgsApplication::ApplicationMembers::~ApplicationMembers()`
`@@ -2402,6 +2409,7 @@ QgsApplication::ApplicationMembers::~ApplicationMembers()`
`2402`	`2409`	`delete mNumericFormatRegistry;`
`2403`	`2410`	`delete mBookmarkManager;`
`2404`	`2411`	`delete mConnectionRegistry;`
	`2412`	`+ delete mBasemapPathRegistry;`
`2405`	`2413`	`}`
`2406`	`2414`
`2407`	`2415`	`QgsApplication::ApplicationMembers *QgsApplication::members()`