Skip to content
Permalink
Browse files

Rename QgsTaskManager::triggered to taskTriggered

  • Loading branch information
nyalldawson committed Jan 16, 2018
1 parent b8defc1 commit 971aec8056bc9ac17160bd42ecc36188890f8bba
@@ -423,11 +423,11 @@ Returns the number of active (queued or running) tasks.

public slots:

void trigger( QgsTask *task );
void triggerTask( QgsTask *task );
%Docstring
Triggers a task, e.g. as a result of a GUI interaction.

.. seealso:: :py:func:`triggered()`
.. seealso:: :py:func:`taskTriggered`
%End

signals:
@@ -484,13 +484,13 @@ Emitted when the number of active tasks changes
.. seealso:: :py:func:`countActiveTasks`
%End

void triggered( QgsTask *task );
void taskTriggered( QgsTask *task );
%Docstring
Emitted when a ``task`` is triggered. This occurs when a user clicks on
the task from the QGIS GUI, and can be used to show detailed progress
reports or re-open a related dialog.

.. seealso:: :py:func:`trigger()`
.. seealso:: :py:func:`triggerTask`
%End

};
@@ -72,7 +72,7 @@ def __init__(self, alg):
self.runAsBatchButton = QPushButton(QCoreApplication.translate("AlgorithmDialog", "Run as Batch Process…"))
self.runAsBatchButton.clicked.connect(self.runAsBatch)
self.buttonBox().addButton(self.runAsBatchButton, QDialogButtonBox.ResetRole) # reset role to ensure left alignment
QgsApplication.taskManager().triggered.connect(self.taskTriggered)
QgsApplication.taskManager().taskTriggered.connect(self.taskTriggered)

def getParametersPanel(self, alg, parent):
return ParametersPanel(parent, alg)
@@ -607,10 +607,10 @@ int QgsTaskManager::countActiveTasks() const
return tasks.intersect( mParentTasks ).count();
}

void QgsTaskManager::trigger( QgsTask *task )
void QgsTaskManager::triggerTask( QgsTask *task )
{
if ( task )
emit triggered( task );
emit taskTriggered( task );
}

void QgsTaskManager::taskProgressChanged( double progress )
@@ -489,9 +489,9 @@ class CORE_EXPORT QgsTaskManager : public QObject

/**
* Triggers a task, e.g. as a result of a GUI interaction.
* \see triggered()
* \see taskTriggered()
*/
void trigger( QgsTask *task );
void triggerTask( QgsTask *task );

signals:

@@ -544,9 +544,9 @@ class CORE_EXPORT QgsTaskManager : public QObject
* Emitted when a \a task is triggered. This occurs when a user clicks on
* the task from the QGIS GUI, and can be used to show detailed progress
* reports or re-open a related dialog.
* \see trigger()
* \see triggerTask()
*/
void triggered( QgsTask *task );
void taskTriggered( QgsTask *task );

private slots:

@@ -106,7 +106,7 @@ void QgsTaskManagerWidget::clicked( const QModelIndex &index )
if ( !task )
return;

mManager->trigger( task );
mManager->triggerTask( task );
}

///@cond PRIVATE

0 comments on commit 971aec8

Please sign in to comment.
You can’t perform that action at this time.