diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-31 22:26:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 22:26:20 -0700 |
| commit | 2d1197f59f824a3093ad71b9ee3466bd5e2825c8 (patch) | |
| tree | 368a2ba5ab9a6ae9f3b3fd0841ea5ee1d0283add /launcher/tasks | |
| parent | b47993b736ba40a75b5b63290f9d7b5911f8150e (diff) | |
| parent | 9137721e8e5b44f2338a36874a393435cbc6daa3 (diff) | |
| download | PrismLauncher-2d1197f59f824a3093ad71b9ee3466bd5e2825c8.tar.gz PrismLauncher-2d1197f59f824a3093ad71b9ee3466bd5e2825c8.tar.bz2 PrismLauncher-2d1197f59f824a3093ad71b9ee3466bd5e2825c8.zip | |
Merge branch 'develop' into refactor/net-split-headers-to-proxy-class
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/tasks')
| -rw-r--r-- | launcher/tasks/Task.cpp | 2 | ||||
| -rw-r--r-- | launcher/tasks/Task.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/tasks/Task.cpp b/launcher/tasks/Task.cpp index 29c55cd4..fd82ec00 100644 --- a/launcher/tasks/Task.cpp +++ b/launcher/tasks/Task.cpp @@ -161,7 +161,7 @@ void Task::emitSucceeded() emit finished(); } -void Task::propogateStepProgress(TaskStepProgress const& task_progress) +void Task::propagateStepProgress(TaskStepProgress const& task_progress) { emit stepProgress(task_progress); } diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h index 6d8bbbb4..57177697 100644 --- a/launcher/tasks/Task.h +++ b/launcher/tasks/Task.h @@ -167,7 +167,7 @@ class Task : public QObject, public QRunnable { virtual void emitAborted(); virtual void emitFailed(QString reason = ""); - virtual void propogateStepProgress(TaskStepProgress const& task_progress); + virtual void propagateStepProgress(TaskStepProgress const& task_progress); public slots: void setStatus(const QString& status); |