Smaller header updates, switch connect style

nyalldawson · nyalldawson · commit bc37b40179ae · 2016-12-05T14:08:11.000+10:00
diff --git a/src/core/qgstaskmanager.cpp b/src/core/qgstaskmanager.cpp
@@ -138,8 +138,8 @@ long QgsTaskManager::addTask( QgsTask* task, const QgsTaskList& dependencies )
   QMutexLocker ml( mTaskMutex );
   mTasks.insert( mNextTaskId, task );
 
-  connect( task, SIGNAL( progressChanged( double ) ), this, SLOT( taskProgressChanged( double ) ) );
-  connect( task, SIGNAL( statusChanged( int ) ), this, SLOT( taskStatusChanged( int ) ) );
+  connect( task, &QgsTask::progressChanged, this, &QgsTaskManager::taskProgressChanged );
+  connect( task, &QgsTask::statusChanged, this, &QgsTaskManager::taskStatusChanged );
 
   if ( !dependencies.isEmpty() )
   {
@@ -397,8 +397,8 @@ bool QgsTaskManager::cleanupAndDeleteTask( QgsTask *task )
   {
     task->cancel();
     // delete task when it's terminated
-    connect( task, SIGNAL( taskCompleted() ), task, SLOT( deleteLater() ) );
-    connect( task, SIGNAL( taskStopped() ), task, SLOT( deleteLater() ) );
+    connect( task, &QgsTask::taskCompleted, task, &QgsTask::deleteLater );
+    connect( task, &QgsTask::taskStopped, task, &QgsTask::deleteLater );
   }
   else
   {
diff --git a/src/core/qgstaskmanager.h b/src/core/qgstaskmanager.h
@@ -23,11 +23,12 @@
 #include <QAbstractItemModel>
 #include <QFuture>
 
-/** \ingroup core
+/**
+ * \ingroup core
  * \class QgsTask
  * \brief Interface class for long running background tasks. Tasks can be controlled directly,
  * or added to a QgsTaskManager for automatic management.
- * \note Added in version 2.16
+ * \note Added in version 3.0
  */
 class CORE_EXPORT QgsTask : public QObject
 {
@@ -38,11 +39,11 @@ class CORE_EXPORT QgsTask : public QObject
     //! Status of tasks
     enum TaskStatus
     {
-      Queued, /*!< Task is queued and has not begun */
-      OnHold, /*!< Task is queued but on hold and will not be started */
-      Running, /*!< Task is currently running */
-      Complete, /*!< Task successfully completed */
-      Terminated, /*!< Task was terminated or errored */
+      Queued, //!< Task is queued and has not begun
+      OnHold, //!< Task is queued but on hold and will not be started
+      Running, //!< Task is currently running
+      Complete, //!< Task successfully completed
+      Terminated, //!< Task was terminated or errored
     };
 
     //! Task flags
@@ -173,7 +174,7 @@ typedef QList< QgsTask* > QgsTaskList;
  * \class QgsTaskManager
  * \brief Task manager for managing a set of long-running QgsTask tasks. This class can be created directly,
  * or accessed via a global instance.
- * \note Added in version 2.16
+ * \note Added in version 3.0
  */
 class CORE_EXPORT QgsTaskManager : public QObject
 {

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,8 @@ long QgsTaskManager::addTask( QgsTask* task, const QgsTaskList& dependencies )`
`138`	`138`	`QMutexLocker ml( mTaskMutex );`
`139`	`139`	`mTasks.insert( mNextTaskId, task );`
`140`	`140`
`141`		`- connect( task, SIGNAL( progressChanged( double ) ), this, SLOT( taskProgressChanged( double ) ) );`
`142`		`- connect( task, SIGNAL( statusChanged( int ) ), this, SLOT( taskStatusChanged( int ) ) );`
	`141`	`+ connect( task, &QgsTask::progressChanged, this, &QgsTaskManager::taskProgressChanged );`
	`142`	`+ connect( task, &QgsTask::statusChanged, this, &QgsTaskManager::taskStatusChanged );`
`143`	`143`
`144`	`144`	`if ( !dependencies.isEmpty() )`
`145`	`145`	`{`
`@@ -397,8 +397,8 @@ bool QgsTaskManager::cleanupAndDeleteTask( QgsTask *task )`
`397`	`397`	`{`
`398`	`398`	`task->cancel();`
`399`	`399`	`// delete task when it's terminated`
`400`		`- connect( task, SIGNAL( taskCompleted() ), task, SLOT( deleteLater() ) );`
`401`		`- connect( task, SIGNAL( taskStopped() ), task, SLOT( deleteLater() ) );`
	`400`	`+ connect( task, &QgsTask::taskCompleted, task, &QgsTask::deleteLater );`
	`401`	`+ connect( task, &QgsTask::taskStopped, task, &QgsTask::deleteLater );`
`402`	`402`	`}`
`403`	`403`	`else`
`404`	`404`	`{`