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/BaseInstance.cpp | |
| 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/BaseInstance.cpp')
| -rw-r--r-- | logic/BaseInstance.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index a073a921..ce81b90e 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -29,11 +29,10 @@ #include "logic/minecraft/MinecraftVersionList.h" #include "logic/icons/IconList.h" -BaseInstance::BaseInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) - : QObject(parent) +BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) + : QObject() { - - m_settings = std::shared_ptr<SettingsObject>(settings); + m_settings = settings; m_rootDir = rootDir; m_settings->registerSetting("name", "Unnamed Instance"); @@ -42,8 +41,6 @@ BaseInstance::BaseInstance(const QString &rootDir, SettingsObject *settings, QOb m_settings->registerSetting("notes", ""); m_settings->registerSetting("lastLaunchTime", 0); - auto globalSettings = MMC->settings(); - // Java Settings m_settings->registerSetting("OverrideJava", false); m_settings->registerSetting("OverrideJavaLocation", false); |