diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-02-01 03:08:25 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:16 +0200 |
| commit | 154d19bb74f4c5fc1519aa40cd9dfd20244273a1 (patch) | |
| tree | 1074077466171fa02ebc50e19ee0fc2257710401 /logic/minecraft | |
| parent | c088d3bef0e18c6cd90db15720841705d53c754d (diff) | |
| download | MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar.gz MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar.lz MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.tar.xz MultiMC-154d19bb74f4c5fc1519aa40cd9dfd20244273a1.zip | |
SCRATCH eliminate InstanceFactory
Diffstat (limited to 'logic/minecraft')
| -rw-r--r-- | logic/minecraft/MinecraftInstance.cpp | 6 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftInstance.h | 2 |
2 files changed, 3 insertions, 5 deletions
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 <pathutils.h> #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. |