fix vector tile connection migration

qgis · Jan 16, 2023 · 8444a9b · 8444a9b
1 parent 57414d9
commit 8444a9b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 24 deletions.
diff --git a/src/core/settings/qgssettingsregistrycore.cpp b/src/core/settings/qgssettingsregistrycore.cpp
@@ -187,14 +187,14 @@ void QgsSettingsRegistryCore::migrateOldSettings()
     const QStringList services = settings.childGroups();
     for ( const QString &service : services )
     {
-      QgsVectorTileProviderConnection::settingsUrl->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/url" ), {service} );
-      QgsVectorTileProviderConnection::settingsZzmin->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/zmin" ), {service} );
-      QgsVectorTileProviderConnection::settingsZmax->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/zmax" ), {service} );
-      QgsVectorTileProviderConnection::settingsAuthcfg->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/authcfg" ), {service} );
-      QgsVectorTileProviderConnection::settingsUsername->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/username" ), {service} );
-      QgsVectorTileProviderConnection::settingsPassword->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/password" ), {service} );
-      QgsVectorTileProviderConnection::settingsStyleUrl->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/styleUrl" ), {service} );
-      QgsVectorTileProviderConnection::settingsServiceType->copyValueFromKey( QStringLiteral( "connections-vector-tile/%1/serviceType" ), {service} );
+      QgsVectorTileProviderConnection::settingsUrl->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/url" ), {service} );
+      QgsVectorTileProviderConnection::settingsZzmin->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/zmin" ), {service} );
+      QgsVectorTileProviderConnection::settingsZmax->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/zmax" ), {service} );
+      QgsVectorTileProviderConnection::settingsAuthcfg->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/authcfg" ), {service} );
+      QgsVectorTileProviderConnection::settingsUsername->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/username" ), {service} );
+      QgsVectorTileProviderConnection::settingsPassword->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/password" ), {service} );
+      QgsVectorTileProviderConnection::settingsStyleUrl->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/styleUrl" ), {service} );
+      QgsVectorTileProviderConnection::settingsServiceType->copyValueFromKey( QStringLiteral( "qgis/connections-vector-tile/%1/serviceType" ), {service} );
       Q_NOWARN_DEPRECATED_PUSH
       settings.beginGroup( service );
       QgsVectorTileProviderConnection::settingsHeaders->setValue( QgsHttpHeaders( settings ).headers(), service );
@@ -203,7 +203,6 @@ void QgsSettingsRegistryCore::migrateOldSettings()
     }
   }
 
-
   // babel devices settings - added in 3.30
   {
     if ( QgsBabelFormatRegistry::sTreeBabelDevices->items().count() == 0 )
@@ -279,14 +278,14 @@ void QgsSettingsRegistryCore::backwardCompatibility()
       // do not overwrite already set setting
       if ( QgsVectorTileProviderConnection::settingsUrl->exists( service ) )
         continue;
-      QgsVectorTileProviderConnection::settingsUrl->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/url" ), {service} );
-      QgsVectorTileProviderConnection::settingsZzmin->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/zmin" ), {service} );
-      QgsVectorTileProviderConnection::settingsZmax->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/zmax" ), {service} );
-      QgsVectorTileProviderConnection::settingsAuthcfg->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/authcfg" ), {service} );
-      QgsVectorTileProviderConnection::settingsUsername->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/username" ), {service} );
-      QgsVectorTileProviderConnection::settingsPassword->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/password" ), {service} );
-      QgsVectorTileProviderConnection::settingsStyleUrl->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/styleUrl" ), {service} );
-      QgsVectorTileProviderConnection::settingsServiceType->copyValueToKey( QStringLiteral( "connections-vector-tile/%1/serviceType" ), {service} );
+      QgsVectorTileProviderConnection::settingsUrl->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/url" ), {service} );
+      QgsVectorTileProviderConnection::settingsZzmin->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/zmin" ), {service} );
+      QgsVectorTileProviderConnection::settingsZmax->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/zmax" ), {service} );
+      QgsVectorTileProviderConnection::settingsAuthcfg->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/authcfg" ), {service} );
+      QgsVectorTileProviderConnection::settingsUsername->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/username" ), {service} );
+      QgsVectorTileProviderConnection::settingsPassword->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/password" ), {service} );
+      QgsVectorTileProviderConnection::settingsStyleUrl->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/styleUrl" ), {service} );
+      QgsVectorTileProviderConnection::settingsServiceType->copyValueToKey( QStringLiteral( "qgis/connections-vector-tile/%1/serviceType" ), {service} );
       Q_NOWARN_DEPRECATED_PUSH
       settings.beginGroup( service );
       QgsHttpHeaders( QgsVectorTileProviderConnection::settingsHeaders->value( service ) ).updateSettings( settings );

diff --git a/src/core/vectortile/qgsvectortileconnection.cpp b/src/core/vectortile/qgsvectortileconnection.cpp
@@ -195,13 +195,6 @@ void QgsVectorTileProviderConnection::addConnection( const QString &name, QgsVec
 
   settingsHeaders->setValue( conn.httpHeaders.headers(), name );
 
-
-  // TODO QGIS 4 (or before) remove compatibility import
-  QgsSettings settings;
-  settings.beginGroup( "qgis/connections-vector-tile/" + name );
-  Q_NOWARN_DEPRECATED_PUSH
-  conn.httpHeaders.updateSettings( settings );
-  Q_NOWARN_DEPRECATED_POP
   switch ( conn.serviceType )
   {
     case Generic: