use data provider to get provider name as providerType() not available

alexbruy · nyalldawson · commit d8df19b8084a · 2019-05-28T06:14:59.000+10:00
in the LTR branch
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -803,10 +803,11 @@ QString QgsMapLayer::baseURI( PropertyType type ) const
   // as in these cases URI may contain layer name and/or additional
   // information. This also strips prefix in case if VSIFILE mechanism
   // is used
-  if ( providerType() == QLatin1String( "ogr" ) || providerType() == QLatin1String( "delimitedtext" ) ||
-       providerType() == QLatin1String( "spatialite" ) )
+  QString providerType = dataProvider()->name();
+  if ( providerType == QLatin1String( "ogr" ) || providerType == QLatin1String( "delimitedtext" ) ||
+       providerType == QLatin1String( "spatialite" ) )
   {
-    QVariantMap components = QgsProviderRegistry::instance()->decodeUri( providerType(), myURI );
+    QVariantMap components = QgsProviderRegistry::instance()->decodeUri( providerType, myURI );
     myURI = components["path"].toString();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -803,10 +803,11 @@ QString QgsMapLayer::baseURI( PropertyType type ) const`
`803`	`803`	`// as in these cases URI may contain layer name and/or additional`
`804`	`804`	`// information. This also strips prefix in case if VSIFILE mechanism`
`805`	`805`	`// is used`
`806`		`- if ( providerType() == QLatin1String( "ogr" ) \|\| providerType() == QLatin1String( "delimitedtext" ) \|\|`
`807`		`- providerType() == QLatin1String( "spatialite" ) )`
	`806`	`+ QString providerType = dataProvider()->name();`
	`807`	`+ if ( providerType == QLatin1String( "ogr" ) \|\| providerType == QLatin1String( "delimitedtext" ) \|\|`
	`808`	`+ providerType == QLatin1String( "spatialite" ) )`
`808`	`809`	`{`
`809`		`- QVariantMap components = QgsProviderRegistry::instance()->decodeUri( providerType(), myURI );`
	`810`	`+ QVariantMap components = QgsProviderRegistry::instance()->decodeUri( providerType, myURI );`
`810`	`811`	`myURI = components["path"].toString();`
`811`	`812`	`}`
`812`	`813`