aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-08-21 09:26:27 -0300
committerflow <flowlnlnln@gmail.com>2022-09-20 18:36:10 -0300
commitbe8c6f218cfe3acc31335305bb40284f8f6cb582 (patch)
treea1a723390371a190b248ca558058f0d5f6f4ab34
parent9eb35ea7c8b30c4bfa02e2ba218671902d92ff21 (diff)
downloadPrismLauncher-be8c6f218cfe3acc31335305bb40284f8f6cb582.tar.gz
PrismLauncher-be8c6f218cfe3acc31335305bb40284f8f6cb582.tar.bz2
PrismLauncher-be8c6f218cfe3acc31335305bb40284f8f6cb582.zip
refactor: setAbortStatus -> setAbortable
Signed-off-by: flow <flowlnlnln@gmail.com>
-rw-r--r--launcher/InstanceCreationTask.cpp4
-rw-r--r--launcher/InstanceImportTask.cpp6
-rw-r--r--launcher/InstanceList.cpp2
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.cpp2
-rw-r--r--launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp2
-rw-r--r--launcher/tasks/Task.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/launcher/InstanceCreationTask.cpp b/launcher/InstanceCreationTask.cpp
index 1b1a8c15..3971effa 100644
--- a/launcher/InstanceCreationTask.cpp
+++ b/launcher/InstanceCreationTask.cpp
@@ -7,7 +7,7 @@ InstanceCreationTask::InstanceCreationTask() = default;
void InstanceCreationTask::executeTask()
{
- setAbortStatus(true);
+ setAbortable(true);
if (updateInstance()) {
emitSucceeded();
@@ -35,7 +35,7 @@ void InstanceCreationTask::executeTask()
// files scheduled to, and we'd better not let the user abort in the middle of it, since it'd
// put the instance in an invalid state.
if (shouldOverride()) {
- setAbortStatus(false);
+ setAbortable(false);
setStatus(tr("Removing old conflicting files..."));
qDebug() << "Removing old files";
diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp
index e35913da..b490620d 100644
--- a/launcher/InstanceImportTask.cpp
+++ b/launcher/InstanceImportTask.cpp
@@ -75,7 +75,7 @@ bool InstanceImportTask::abort()
void InstanceImportTask::executeTask()
{
- setAbortStatus(true);
+ setAbortable(true);
if (m_sourceUrl.isLocalFile()) {
m_archivePath = m_sourceUrl.toLocalFile();
@@ -280,7 +280,7 @@ void InstanceImportTask::processFlame()
connect(this, &Task::aborted, inst_creation_task, &InstanceCreationTask::abort);
connect(inst_creation_task, &Task::aborted, this, &Task::abort);
- connect(inst_creation_task, &Task::abortStatusChanged, this, &Task::setAbortStatus);
+ connect(inst_creation_task, &Task::abortStatusChanged, this, &Task::setAbortable);
inst_creation_task->start();
}
@@ -344,7 +344,7 @@ void InstanceImportTask::processModrinth()
connect(this, &Task::aborted, inst_creation_task, &InstanceCreationTask::abort);
connect(inst_creation_task, &Task::aborted, this, &Task::abort);
- connect(inst_creation_task, &Task::abortStatusChanged, this, &Task::setAbortStatus);
+ connect(inst_creation_task, &Task::abortStatusChanged, this, &Task::setAbortable);
inst_creation_task->start();
}
diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp
index a4b8d8aa..a414e0d5 100644
--- a/launcher/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
@@ -785,7 +785,7 @@ class InstanceStaging : public Task {
connect(child, &Task::succeeded, this, &InstanceStaging::childSucceded);
connect(child, &Task::failed, this, &InstanceStaging::childFailed);
connect(child, &Task::aborted, this, &InstanceStaging::childAborted);
- connect(child, &Task::abortStatusChanged, this, &InstanceStaging::setAbortStatus);
+ connect(child, &Task::abortStatusChanged, this, &InstanceStaging::setAbortable);
connect(child, &Task::status, this, &InstanceStaging::setStatus);
connect(child, &Task::progress, this, &InstanceStaging::setProgress);
connect(&m_backoffTimer, &QTimer::timeout, this, &InstanceStaging::childSucceded);
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index e3521a38..a0eda1b0 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -338,7 +338,7 @@ bool FlameCreationTask::createInstance()
bool did_succeed = getError().isEmpty();
if (m_instance && did_succeed) {
- setAbortStatus(false);
+ setAbortable(false);
auto inst = m_instance.value();
inst->copyManagedPack(instance);
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
index 7d19639c..d4c37cb9 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
@@ -252,7 +252,7 @@ bool ModrinthCreationTask::createInstance()
loop.exec();
if (m_instance && ended_well) {
- setAbortStatus(false);
+ setAbortable(false);
auto inst = m_instance.value();
inst->copyManagedPack(instance);
diff --git a/launcher/tasks/Task.h b/launcher/tasks/Task.h
index f2872643..3d607dca 100644
--- a/launcher/tasks/Task.h
+++ b/launcher/tasks/Task.h
@@ -107,7 +107,7 @@ class Task : public QObject, public QRunnable {
virtual void start();
virtual bool abort() { if(canAbort()) emitAborted(); return canAbort(); };
- void setAbortStatus(bool can_abort) { m_can_abort = can_abort; emit abortStatusChanged(can_abort); }
+ void setAbortable(bool can_abort) { m_can_abort = can_abort; emit abortStatusChanged(can_abort); }
protected:
virtual void executeTask() = 0;