From 8e44ab2338f4ca63d58de4b3329c384df9d6c053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 19 Mar 2018 02:36:12 +0100 Subject: NOISSUE redo new instance dialog --- api/logic/minecraft/legacy/LegacyUpgradeTask.cpp | 7 ++----- api/logic/minecraft/legacy/LegacyUpgradeTask.h | 12 +++--------- 2 files changed, 5 insertions(+), 14 deletions(-) (limited to 'api/logic/minecraft') diff --git a/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp b/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp index 9fc6d92b..5cc3b5d9 100644 --- a/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp +++ b/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp @@ -10,12 +10,9 @@ #include "minecraft/ComponentList.h" #include "classparser.h" -LegacyUpgradeTask::LegacyUpgradeTask(SettingsObjectPtr settings, const QString & stagingPath, InstancePtr origInstance, const QString & newName) +LegacyUpgradeTask::LegacyUpgradeTask(InstancePtr origInstance) { - m_globalSettings = settings; - m_stagingPath = stagingPath; m_origInstance = origInstance; - m_newName = newName; } void LegacyUpgradeTask::executeTask() @@ -70,7 +67,7 @@ void LegacyUpgradeTask::copyFinished() // NOTE: this scope ensures the instance is fully saved before we emitSucceeded { MinecraftInstance inst(m_globalSettings, instanceSettings, m_stagingPath); - inst.setName(m_newName); + inst.setName(m_instName); inst.init(); QString preferredVersionNumber = decideVersion(legacyInst->currentVersionId(), legacyInst->intendedVersionId()); diff --git a/api/logic/minecraft/legacy/LegacyUpgradeTask.h b/api/logic/minecraft/legacy/LegacyUpgradeTask.h index 56896385..a93dd0d9 100644 --- a/api/logic/minecraft/legacy/LegacyUpgradeTask.h +++ b/api/logic/minecraft/legacy/LegacyUpgradeTask.h @@ -1,6 +1,6 @@ #pragma once -#include "tasks/Task.h" +#include "InstanceTask.h" #include "multimc_logic_export.h" #include "net/NetJob.h" #include @@ -13,11 +13,11 @@ class BaseInstanceProvider; -class MULTIMC_LOGIC_EXPORT LegacyUpgradeTask : public Task +class MULTIMC_LOGIC_EXPORT LegacyUpgradeTask : public InstanceTask { Q_OBJECT public: - explicit LegacyUpgradeTask(SettingsObjectPtr settings, const QString & stagingPath, InstancePtr origInstance, const QString & newName); + explicit LegacyUpgradeTask(InstancePtr origInstance); protected: //! Entry point for tasks. @@ -26,13 +26,7 @@ protected: void copyAborted(); private: /* data */ - SettingsObjectPtr m_globalSettings; InstancePtr m_origInstance; - QString m_stagingPath; - QString m_newName; QFuture m_copyFuture; QFutureWatcher m_copyFutureWatcher; }; - - - -- cgit v1.2.3