From 154d19bb74f4c5fc1519aa40cd9dfd20244273a1 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 1 Feb 2015 03:08:25 +0100 Subject: SCRATCH eliminate InstanceFactory --- logic/minecraft/MinecraftInstance.cpp | 6 ++---- logic/minecraft/MinecraftInstance.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'logic/minecraft') diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp index 090c9389..c7edaf82 100644 --- a/logic/minecraft/MinecraftInstance.cpp +++ b/logic/minecraft/MinecraftInstance.cpp @@ -4,11 +4,9 @@ #include #include "logic/minecraft/MinecraftVersionList.h" -MinecraftInstance::MinecraftInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) - : BaseInstance(rootDir, settings, parent) +MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) + : BaseInstance(globalSettings, settings, rootDir) { - auto globalSettings = MMC->settings(); - // Java Settings m_settings->registerSetting("OverrideJava", false); m_settings->registerSetting("OverrideJavaLocation", false); diff --git a/logic/minecraft/MinecraftInstance.h b/logic/minecraft/MinecraftInstance.h index 9097a2da..a6c786fb 100644 --- a/logic/minecraft/MinecraftInstance.h +++ b/logic/minecraft/MinecraftInstance.h @@ -4,7 +4,7 @@ class MinecraftInstance: public BaseInstance { public: - MinecraftInstance(const QString& rootDir, SettingsObject* settings, QObject* parent = 0); + MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir); virtual ~MinecraftInstance() {}; /// Path to the instance's minecraft directory. -- cgit