Rename cancel() to cancelReload() and update doc accordingly

pblottiere · pblottiere · commit e531052b28cd · 2018-03-02T10:41:07.000Z
diff --git a/python/core/qgsvectordataprovider.sip.in b/python/core/qgsvectordataprovider.sip.in
@@ -232,13 +232,15 @@ Providers with the FastTruncate capability will use an optimised method to trunc
 .. seealso:: :py:func:`deleteFeatures`
 %End
 
-    virtual bool cancel();
+    virtual bool cancelReload();
 %Docstring
-Cancels the pending query.
+Cancels the current reloading of data.
 
-:return: true if the pending query has been interrupted, false otherwise
+:return: true if the reloading has been correctly interrupted, false otherwise
 
 .. versionadded:: 3.2
+
+.. seealso:: :py:func:`reloadData`
 %End
 
     virtual bool addAttributes( const QList<QgsField> &attributes );
diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -804,7 +804,7 @@ QTextCodec *QgsVectorDataProvider::textEncoding() const
   return mEncoding;
 }
 
-bool QgsVectorDataProvider::cancel()
+bool QgsVectorDataProvider::cancelReload()
 {
   return false;
 }
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -250,11 +250,12 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
     virtual bool truncate();
 
     /**
-     * Cancels the pending query.
-     * \returns true if the pending query has been interrupted, false otherwise
+     * Cancels the current reloading of data.
+     * \returns true if the reloading has been correctly interrupted, false otherwise
      * \since QGIS 3.2
+     * \see reloadData()
      */
-    virtual bool cancel();
+    virtual bool cancelReload();
 
     /**
      * Adds new \a attributes to the provider. Returns true in case of success and false in case of failure.
diff --git a/src/core/qgsvirtuallayertask.cpp b/src/core/qgsvirtuallayertask.cpp
@@ -59,6 +59,6 @@ QgsVectorLayer *QgsVirtualLayerTask::takeLayer()
 
 void QgsVirtualLayerTask::cancel()
 {
-  mLayer->dataProvider()->cancel();
+  mLayer->dataProvider()->cancelReload();
   QgsTask::cancel();
 }
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp
@@ -455,7 +455,7 @@ bool QgsVirtualLayerProvider::createIt()
   return true;
 }
 
-bool QgsVirtualLayerProvider::cancel()
+bool QgsVirtualLayerProvider::cancelReload()
 {
   return mSqlite.interrupt();
 }
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.h b/src/providers/virtual/qgsvirtuallayerprovider.h
@@ -53,7 +53,7 @@ class QgsVirtualLayerProvider: public QgsVectorDataProvider
     QString description() const override;
     QgsAttributeList pkAttributeIndexes() const override;
     QSet<QgsMapLayerDependency> dependencies() const override;
-    bool cancel() override;
+    bool cancelReload() override;
     void reloadData() override;
 
   private:

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,7 @@ QTextCodec *QgsVectorDataProvider::textEncoding() const`
`804`	`804`	`return mEncoding;`
`805`	`805`	`}`
`806`	`806`
`807`		`-bool QgsVectorDataProvider::cancel()`
	`807`	`+bool QgsVectorDataProvider::cancelReload()`
`808`	`808`	`{`
`809`	`809`	`return false;`
`810`	`810`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ QgsVectorLayer *QgsVirtualLayerTask::takeLayer()`
`59`	`59`
`60`	`60`	`void QgsVirtualLayerTask::cancel()`
`61`	`61`	`{`
`62`		`- mLayer->dataProvider()->cancel();`
	`62`	`+ mLayer->dataProvider()->cancelReload();`
`63`	`63`	`QgsTask::cancel();`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ bool QgsVirtualLayerProvider::createIt()`
`455`	`455`	`return true;`
`456`	`456`	`}`
`457`	`457`
`458`		`-bool QgsVirtualLayerProvider::cancel()`
	`458`	`+bool QgsVirtualLayerProvider::cancelReload()`
`459`	`459`	`{`
`460`	`460`	`return mSqlite.interrupt();`
`461`	`461`	`}`