Add deleteAllTasks to manager

qgis · Dec 5, 2016 · 95dbb3a · 95dbb3a
1 parent b64025d
commit 95dbb3a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/python/core/qgstaskmanager.sip b/python/core/qgstaskmanager.sip
@@ -187,6 +187,11 @@ class QgsTaskManager : QObject
      */
     bool deleteTask( QgsTask* task );
 
+    /** Deletes all tasks in the manager, first terminating them if they are currently
+     * running.
+     */
+    void deleteAllTasks();
+
     /** Returns the task with matching ID.
      * @param id task ID
      * @returns task if found, or nullptr

diff --git a/src/core/qgstaskmanager.cpp b/src/core/qgstaskmanager.cpp
@@ -184,7 +184,20 @@ bool QgsTaskManager::deleteTask( QgsTask *task )
   return result;
 }
 
-QgsTask*QgsTaskManager::task( long id ) const
+void QgsTaskManager::deleteAllTasks()
+{
+  //first tell all tasks to cancel
+  cancelAll();
+
+  QMutexLocker ml( mTaskMutex );
+  Q_FOREACH ( QgsTask* task, tasks() )
+  {
+    deleteTask( task );
+  }
+  emit allTasksFinished();
+}
+
+QgsTask* QgsTaskManager::task( long id ) const
 {
   QMutexLocker ml( mTaskMutex );
   return mTasks.value( id ).task;

diff --git a/src/core/qgstaskmanager.h b/src/core/qgstaskmanager.h
@@ -218,6 +218,11 @@ class CORE_EXPORT QgsTaskManager : public QObject
      */
     bool deleteTask( QgsTask* task );
 
+    /** Deletes all tasks in the manager, first terminating them if they are currently
+     * running.
+     */
+    void deleteAllTasks();
+
     /** Returns the task with matching ID.
      * @param id task ID
      * @returns task if found, or nullptr