diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-02-02 01:09:28 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:17 +0200 |
| commit | d313e9ab09639346526b75c92498188753cb5b87 (patch) | |
| tree | 1df78fb6150b77a705b48aa3af0a845131000309 /logic/ftb/OneSixFTBInstance.cpp | |
| parent | 382ae78a0bf75892827321b052c6afbd195476bc (diff) | |
| download | MultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar MultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar.gz MultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar.lz MultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar.xz MultiMC-d313e9ab09639346526b75c92498188753cb5b87.zip | |
SCRATCH remove remaining references to MultiMC.h and fix legacy LWJGL
Diffstat (limited to 'logic/ftb/OneSixFTBInstance.cpp')
| -rw-r--r-- | logic/ftb/OneSixFTBInstance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp index 8d290a94..4de2ce78 100644 --- a/logic/ftb/OneSixFTBInstance.cpp +++ b/logic/ftb/OneSixFTBInstance.cpp @@ -8,12 +8,12 @@ #include "logic/forge/ForgeInstaller.h" #include "logic/forge/ForgeVersionList.h" #include <logic/settings/INISettingsObject.h> -#include "MultiMC.h" #include "pathutils.h" OneSixFTBInstance::OneSixFTBInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) : OneSixInstance(globalSettings, settings, rootDir) { + m_globalSettings = globalSettings; } void OneSixFTBInstance::copy(const QDir &newDir) @@ -108,12 +108,12 @@ QString OneSixFTBInstance::id() const QDir OneSixFTBInstance::librariesPath() const { - return QDir(MMC->settings()->get("FTBRoot").toString() + "/libraries"); + return QDir(m_globalSettings->get("FTBRoot").toString() + "/libraries"); } QDir OneSixFTBInstance::versionsPath() const { - return QDir(MMC->settings()->get("FTBRoot").toString() + "/versions"); + return QDir(m_globalSettings->get("FTBRoot").toString() + "/versions"); } bool OneSixFTBInstance::providesVersionFile() const |