s/OnGoing/Running/g

qgis · Jul 30, 2021 · deed238 · deed238
1 parent 56acee9
commit deed238
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/python/core/auto_additions/qgis.py b/python/core/auto_additions/qgis.py
@@ -506,10 +506,10 @@
 # --
 Qgis.GpsFeatureType.baseClass = Qgis
 Qgis.ContentStatus.NotStarted.__doc__ = "Content fetching/storing has not started yet"
-Qgis.ContentStatus.OnGoing.__doc__ = "Content fetching/storing is in progress"
+Qgis.ContentStatus.Running.__doc__ = "Content fetching/storing is in progress"
 Qgis.ContentStatus.Finished.__doc__ = "Content fetching/storing is finished and successful"
 Qgis.ContentStatus.Failed.__doc__ = "Content fetching/storing has failed"
 Qgis.ContentStatus.Canceled.__doc__ = "Content fetching/storing has been canceled"
-Qgis.ContentStatus.__doc__ = 'Status for fetched or stored content\n\n.. versionadded:: 3.22\n\n' + '* ``NotStarted``: ' + Qgis.ContentStatus.NotStarted.__doc__ + '\n' + '* ``OnGoing``: ' + Qgis.ContentStatus.OnGoing.__doc__ + '\n' + '* ``Finished``: ' + Qgis.ContentStatus.Finished.__doc__ + '\n' + '* ``Failed``: ' + Qgis.ContentStatus.Failed.__doc__ + '\n' + '* ``Canceled``: ' + Qgis.ContentStatus.Canceled.__doc__
+Qgis.ContentStatus.__doc__ = 'Status for fetched or stored content\n\n.. versionadded:: 3.22\n\n' + '* ``NotStarted``: ' + Qgis.ContentStatus.NotStarted.__doc__ + '\n' + '* ``Running``: ' + Qgis.ContentStatus.Running.__doc__ + '\n' + '* ``Finished``: ' + Qgis.ContentStatus.Finished.__doc__ + '\n' + '* ``Failed``: ' + Qgis.ContentStatus.Failed.__doc__ + '\n' + '* ``Canceled``: ' + Qgis.ContentStatus.Canceled.__doc__
 # --
 Qgis.ContentStatus.baseClass = Qgis
diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in
@@ -372,7 +372,7 @@ The development version
     enum class ContentStatus
     {
       NotStarted,
-      OnGoing,
+      Running,
       Finished,
       Failed,
       Canceled,

diff --git a/src/core/externalstorage/qgssimplecopyexternalstorage.cpp b/src/core/externalstorage/qgssimplecopyexternalstorage.cpp
@@ -46,7 +46,7 @@ QgsSimpleCopyExternalStorageStoredContent::QgsSimpleCopyExternalStorageStoredCon
 
 void QgsSimpleCopyExternalStorageStoredContent::store()
 {
-  mStatus = Qgis::ContentStatus::OnGoing;
+  mStatus = Qgis::ContentStatus::Running;
   QgsApplication::instance()->taskManager()->addTask( mCopyTask );
 }
 

diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -540,7 +540,7 @@ class CORE_EXPORT Qgis
     enum class ContentStatus : int
     {
       NotStarted, //!< Content fetching/storing has not started yet
-      OnGoing, //!< Content fetching/storing is in progress
+      Running, //!< Content fetching/storing is in progress
       Finished, //!< Content fetching/storing is finished and successful
       Failed, //!< Content fetching/storing has failed
       Canceled, //!< Content fetching/storing has been canceled

diff --git a/tests/src/python/test_qgsexternalstorage_base.py b/tests/src/python/test_qgsexternalstorage_base.py
@@ -190,7 +190,7 @@ def testStoreFetchFileImmediately(self):
         url = self.url + "/" + os.path.basename(f.name)
         storedContent = self.storage.store(f.name, url, self.auth_config.id(), Qgis.ActionStart.Immediate)
         self.assertTrue(storedContent)
-        self.assertEqual(storedContent.status(), Qgis.ContentStatus.OnGoing)
+        self.assertEqual(storedContent.status(), Qgis.ContentStatus.Running)
 
         spyErrorOccurred = QSignalSpy(storedContent.errorOccurred)
         spyProgressChanged = QSignalSpy(storedContent.progressChanged)
@@ -213,9 +213,9 @@ def testStoreFetchFileImmediately(self):
 
         # Some external storage (SimpleCopy) doesn't actually need to retrieve the resource
         self.assertTrue(fetchedContent.status() == Qgis.ContentStatus.Finished or
-                        fetchedContent.status() == Qgis.ContentStatus.OnGoing)
+                        fetchedContent.status() == Qgis.ContentStatus.Running)
 
-        if (fetchedContent.status() == Qgis.ContentStatus.OnGoing):
+        if (fetchedContent.status() == Qgis.ContentStatus.Running):
 
             spyErrorOccurred = QSignalSpy(fetchedContent.errorOccurred)
 
@@ -248,9 +248,9 @@ def testStoreFetchFileImmediately(self):
 
         # Some external storage (SimpleCopy) doesn't actually need to retrieve the resource
         self.assertTrue(fetchedContent.status() == Qgis.ContentStatus.Failed or
-                        fetchedContent.status() == Qgis.ContentStatus.OnGoing)
+                        fetchedContent.status() == Qgis.ContentStatus.Running)
 
-        if (fetchedContent.status() == Qgis.ContentStatus.OnGoing):
+        if (fetchedContent.status() == Qgis.ContentStatus.Running):
             spyErrorOccurred = QSignalSpy(fetchedContent.errorOccurred)
 
             loop = QEventLoop()