doxy

qgis · Apr 17, 2019 · 7f52e2938a3211222f4286becabb28ff1565dd3e · 7f52e29
1 parent 7b6f9c0
commit 7f52e2938a3211222f4286becabb28ff1565dd3e
Showing with 2 additions and 5 deletions.

+0 −2 python/core/auto_generated/qgsvectorlayer.sip.in

+2 −2 src/core/processing/qgsprocessingutils.h

+0 −1 src/core/qgsvectorlayer.h
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -365,8 +365,6 @@ data.
 :param baseName: The name used to represent the layer in the legend
 :param providerLib: The name of the data provider, e.g., "memory", "postgres"
 :param options: layer load options
-
-.. deprecated:: Use version with options as mandatory argument instead
 %End
 
     ~QgsVectorLayer();

diff --git a/src/core/processing/qgsprocessingutils.h b/src/core/processing/qgsprocessingutils.h
@@ -330,7 +330,7 @@ class CORE_EXPORT QgsProcessingUtils
      *
      * \since QGIS 3.8
      */
-    static QgsMapLayer *loadMapLayerFromString( const QString &string, const QgsCoordinateTransformContext &transformContext, LayerHint typeHint = UnknownType );
+    static QgsMapLayer *loadMapLayerFromString( const QString &string, const QgsCoordinateTransformContext &transformContext, LayerHint typeHint = LayerHint::UnknownType );
 
     /**
      * Interprets a string as a map layer. The method will attempt to
@@ -340,7 +340,7 @@ class CORE_EXPORT QgsProcessingUtils
      *
      * \deprecated use mapLayerFromString() that takes QgsCoordinateTransformContext as an argument instead
      */
-    Q_DECL_DEPRECATED static QgsMapLayer *loadMapLayerFromString( const QString &string, LayerHint typeHint = UnknownType ) SIP_DEPRECATED ;
+    Q_DECL_DEPRECATED static QgsMapLayer *loadMapLayerFromString( const QString &string, LayerHint typeHint = LayerHint::UnknownType ) SIP_DEPRECATED ;
 
     static void parseDestinationString( QString &destination, QString &providerKey, QString &uri, QString &layerName, QString &format, QMap<QString, QVariant> &options, bool &useWriter, QString &extension );
 

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -450,7 +450,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      * \param baseName The name used to represent the layer in the legend
      * \param providerLib  The name of the data provider, e.g., "memory", "postgres"
      * \param options layer load options
-     * \deprecated Use version with options as mandatory argument instead
      */
     explicit QgsVectorLayer( const QString &path = QString(), const QString &baseName = QString(),
                              const QString &providerLib = "ogr", const QgsVectorLayer::LayerOptions &options = QgsVectorLayer::LayerOptions() );