sip deprecated of forceReload and some doc improvements

qgis · Dec 13, 2019 · d788d0f · d788d0f
1 parent 625d601
commit d788d0f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/python/core/auto_generated/qgsvectordataprovider.sip.in b/python/core/auto_generated/qgsvectordataprovider.sip.in
@@ -546,7 +546,7 @@ providers will return ``None``.
 Returns the transaction this data provider is included in, if any.
 %End
 
- virtual void forceReload();
+ virtual void forceReload() /Deprecated/;
 %Docstring
 Forces a reload of the underlying datasource if the provider implements this
 method.
@@ -555,7 +555,7 @@ This forces QGIS to reopen a file or connection.
 This can be required if the underlying file is replaced.
 
 .. deprecated::
-   Will be removed in QGIS 4.0
+   QGIS 3.12 - will be removed in QGIS 4.0 - use reloadData instead
 %End
 
     virtual QSet<QgsMapLayerDependency> dependencies() const;

diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h
@@ -359,7 +359,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
      * Reloads the data from the source by calling reloadProviderData() implemented
      * by providers with data caches to synchronize, changes in the data source, feature
      * counts and other specific actions and it calls the dataChanged signal
-     * \see reloadProviderData
+     * \see reloadProviderData()
      */
     virtual void reloadData();
 

diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -554,9 +554,9 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
      * In particular on the OGR provider, a pooled connection will be invalidated.
      * This forces QGIS to reopen a file or connection.
      * This can be required if the underlying file is replaced.
-     * \deprecated Will be removed in QGIS 4.0
+     * \deprecated QGIS 3.12 - will be removed in QGIS 4.0 - use reloadData instead
     */
-    Q_DECL_DEPRECATED virtual void forceReload() { reloadData(); }
+    Q_DECL_DEPRECATED virtual void forceReload() SIP_DEPRECATED { reloadData(); }
 
     /**
      * Gets the list of layer ids on which this layer depends. This in particular determines the order of layer loading.