From 8e7caf4e25dc3f56877a504c45d157860215496b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 10 Jul 2015 01:11:06 +0200 Subject: GH-1053 move launch related things and rename them --- logic/minecraft/LegacyInstance.cpp | 6 +++--- logic/minecraft/LegacyInstance.h | 2 +- logic/minecraft/OneSixInstance.cpp | 6 +++--- logic/minecraft/OneSixInstance.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'logic/minecraft') diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp index 8431c35b..0991b7b5 100644 --- a/logic/minecraft/LegacyInstance.cpp +++ b/logic/minecraft/LegacyInstance.cpp @@ -24,7 +24,7 @@ #include "minecraft/LegacyUpdate.h" #include "icons/IconList.h" -#include "BaseLauncher.h" +#include "launch/LaunchTask.h" #include "minecraft/ModList.h" #include @@ -96,7 +96,7 @@ std::shared_ptr LegacyInstance::createUpdateTask() return std::shared_ptr(new LegacyUpdate(this, this)); } -std::shared_ptr LegacyInstance::createLaunchTask(AuthSessionPtr account) +std::shared_ptr LegacyInstance::createLaunchTask(AuthSessionPtr account) { QString launchScript; QIcon icon = ENV.icons()->getIcon(iconKey()); @@ -123,7 +123,7 @@ std::shared_ptr LegacyInstance::createLaunchTask(AuthSessionPtr ac launchScript += "lwjgl " + lwjgl + "\n"; launchScript += "launcher legacy\n"; } - auto process = BaseLauncher::create(std::dynamic_pointer_cast(getSharedPtr())); + auto process = LaunchTask::create(std::dynamic_pointer_cast(getSharedPtr())); process->setLaunchScript(launchScript); process->setWorkdir(minecraftRoot()); process->setLogin(account); diff --git a/logic/minecraft/LegacyInstance.h b/logic/minecraft/LegacyInstance.h index 51871876..0930c290 100644 --- a/logic/minecraft/LegacyInstance.h +++ b/logic/minecraft/LegacyInstance.h @@ -111,7 +111,7 @@ public: virtual void setShouldUpdate(bool val) override; virtual std::shared_ptr createUpdateTask() override; - virtual std::shared_ptr createLaunchTask(AuthSessionPtr account) override; + virtual std::shared_ptr createLaunchTask(AuthSessionPtr account) override; virtual std::shared_ptr createJarModdingTask() override; diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index 4af56b54..d66236f4 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -22,7 +22,7 @@ #include "minecraft/OneSixUpdate.h" #include "minecraft/MinecraftProfile.h" #include "minecraft/VersionBuildError.h" -#include "BaseLauncher.h" +#include "launch/LaunchTask.h" #include "minecraft/OneSixProfileStrategy.h" #include "MMCZip.h" @@ -123,7 +123,7 @@ QStringList OneSixInstance::processMinecraftArgs(AuthSessionPtr session) return parts; } -std::shared_ptr OneSixInstance::createLaunchTask(AuthSessionPtr session) +std::shared_ptr OneSixInstance::createLaunchTask(AuthSessionPtr session) { QString launchScript; QIcon icon = ENV.icons()->getIcon(iconKey()); @@ -230,7 +230,7 @@ std::shared_ptr OneSixInstance::createLaunchTask(AuthSessionPtr se } launchScript += "launcher onesix\n"; - auto process = BaseLauncher::create(std::dynamic_pointer_cast(getSharedPtr())); + auto process = LaunchTask::create(std::dynamic_pointer_cast(getSharedPtr())); process->setLaunchScript(launchScript); process->setWorkdir(minecraftRoot()); process->setLogin(session); diff --git a/logic/minecraft/OneSixInstance.h b/logic/minecraft/OneSixInstance.h index 46545462..42902366 100644 --- a/logic/minecraft/OneSixInstance.h +++ b/logic/minecraft/OneSixInstance.h @@ -49,7 +49,7 @@ public: virtual QString instanceConfigFolder() const override; virtual std::shared_ptr createUpdateTask() override; - virtual std::shared_ptr createLaunchTask(AuthSessionPtr account) override; + virtual std::shared_ptr createLaunchTask(AuthSessionPtr account) override; virtual std::shared_ptr createJarModdingTask() override; virtual void cleanupAfterRun() override; -- cgit v1.2.3