Revert "[API] Remove specific deprecated QgsVectorLayer::setDataSource"

This reverts commit 88c0d3f.
qgis · Apr 28, 2021 · 2524f96 · 2524f96
1 parent 4afa66a
commit 2524f96
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 5 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -22,7 +22,6 @@ QGIS 3.20        {#qgis_api_break_3_20}
 setDataSource       {#qgis_api_break_3_20_setdatasource}
 -------------
 
-- QgsVectorLayer::setDataSource deprecated and specific method without ProviderOptions has been removed
 - QgsMapLayer::setDataSource is no longer virtual. If has been replaced with QgsMapLayer::setDataSourcePrivate. This is only relevant for subclassing QgsMapLayer, for code that only uses the subclasses (QgsVectorLayer, QgsRasterLayer, ...) this has no effect.
 
 QGIS 3.4        {#qgis_api_break_3_4}

diff --git a/python/core/auto_generated/vector/qgsvectorlayer.sip.in b/python/core/auto_generated/vector/qgsvectorlayer.sip.in
@@ -1082,6 +1082,22 @@ Determines if this vector layer has features.
 .. versionadded:: 3.4
 %End
 
+ void setDataSource( const QString &dataSource, const QString &baseName, const QString &provider, bool loadDefaultStyleFlag = false ) /Deprecated/;
+%Docstring
+Update the data source of the layer. The layer's renderer and legend will be preserved only
+if the geometry type of the new data source matches the current geometry type of the layer.
+
+:param dataSource: new layer data source
+:param baseName: base name of the layer
+:param provider: provider string
+:param loadDefaultStyleFlag: set to ``True`` to reset the layer's style to the default for the
+                             data source
+
+.. versionadded:: 2.10
+
+.. deprecated::
+   Use version with ProviderOptions argument instead
+%End
 
     virtual QString loadDefaultStyle( bool &resultFlag /Out/ ) ${SIP_FINAL};
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8251,7 +8251,8 @@ void QgisApp::changeDataSource( QgsMapLayer *layer )
           subsetString = vlayer->subsetString();
         }
 
-        layer->setDataSource( uri.uri, layer->name(), uri.providerKey, QgsDataProvider::ProviderOptions() );
+        layer->setDataSource( uri.uri, layer->name(), uri.providerKey,
+                              QgsDataProvider::ProviderOptions(), QgsDataProvider::ReadFlags() );
         // Re-apply original style and subset string  when fixing bad layers
         if ( !( layerWasValid || layer->originalXmlProperties().isEmpty() ) )
         {
@@ -8820,7 +8821,7 @@ void QgisApp::makeMemoryLayerPermanent( QgsVectorLayer *layer )
       QString source = newFilename;
       if ( ! newLayerName.isEmpty() )
         source += QStringLiteral( "|layername=%1" ).arg( newLayerName );
-      vl->setDataSource( source, vl->name(), QStringLiteral( "ogr" ), options );
+      vl->QgsMapLayer::setDataSource( source, vl->name(), QStringLiteral( "ogr" ), options );
       vl->triggerRepaint();
       this->visibleMessageBar()->pushMessage( tr( "Layer Saved" ),
                                               tr( "Successfully saved scratch layer to <a href=\"%1\">%2</a>" ).arg( QUrl::fromLocalFile( newFilename ).toString(), QDir::toNativeSeparators( newFilename ) ),

diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
@@ -1634,6 +1634,23 @@ bool QgsVectorLayer::readXml( const QDomNode &layer_node, QgsReadWriteContext &c
 
 } // void QgsVectorLayer::readXml
 
+void QgsVectorLayer::setDataSource( const QString &dataSource, const QString &baseName, const QString &provider, bool loadDefaultStyleFlag )
+{
+  QgsDataProvider::ProviderOptions options;
+
+  QgsDataProvider::ReadFlags flags = QgsDataProvider::ReadFlags();
+  if ( loadDefaultStyleFlag )
+  {
+    flags |= QgsDataProvider::FlagLoadDefaultStyle;
+  }
+
+  if ( mReadFlags & QgsMapLayer::FlagTrustLayerMetadata )
+  {
+    flags |= QgsDataProvider::FlagTrustDataSource;
+  }
+  setDataSourcePrivate( dataSource, baseName, provider, options, flags );
+}
+
 void QgsVectorLayer::setDataSourcePrivate( const QString &dataSource, const QString &baseName, const QString &provider,
     const QgsDataProvider::ProviderOptions &options, QgsDataProvider::ReadFlags flags )
 {

diff --git a/src/core/vector/qgsvectorlayer.h b/src/core/vector/qgsvectorlayer.h
@@ -1131,6 +1131,18 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      */
     FeatureAvailability hasFeatures() const FINAL;
 
+    /**
+     * Update the data source of the layer. The layer's renderer and legend will be preserved only
+     * if the geometry type of the new data source matches the current geometry type of the layer.
+     * \param dataSource new layer data source
+     * \param baseName base name of the layer
+     * \param provider provider string
+     * \param loadDefaultStyleFlag set to TRUE to reset the layer's style to the default for the
+     * data source
+     * \since QGIS 2.10
+     * \deprecated Use version with ProviderOptions argument instead
+     */
+    Q_DECL_DEPRECATED void setDataSource( const QString &dataSource, const QString &baseName, const QString &provider, bool loadDefaultStyleFlag = false ) SIP_DEPRECATED;
 
     QString loadDefaultStyle( bool &resultFlag SIP_OUT ) FINAL;
 

diff --git a/src/gui/vector/qgsvectorlayerproperties.cpp b/src/gui/vector/qgsvectorlayerproperties.cpp
@@ -635,8 +635,8 @@ void QgsVectorLayerProperties::apply()
     const QString newSource = mSourceWidget->sourceUri();
     if ( newSource != mLayer->source() )
     {
-      mLayer->setDataSource( newSource, mLayer->name(), mLayer->providerType(),
-                             QgsDataProvider::ProviderOptions(), QgsDataProvider::ReadFlags() );
+      mLayer->QgsMapLayer::setDataSource( newSource, mLayer->name(), mLayer->providerType(),
+                                          QgsDataProvider::ProviderOptions(), QgsDataProvider::ReadFlags() );
     }
   }